diff --git a/CHANGELOG.md b/CHANGELOG.md index 66d82db1..fad48774 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,16 @@ +# 74.0.3729.80 +* increase minimum SDK version to 17 (Jelly Bean 4.2) +* dropped obsolete patch for hyperlink auditing disable + # 73.0.3683.107 -* removed patch to disable smooth scrolling +* dropped patch to disable smooth scrolling * fixed custom tab intents issue (fixes https://github.com/bromite/bromite/issues/279) # 73.0.3683.105 * removed Fanboy's Annoyance List and Peter Lowe's adservers list from filters # 73.0.3683.97 -* remove patch to hide NTP tiles +* dropped redundant patch to hide NTP tiles (use home page + about:blank) # 73.0.3683.88 * add option to use home page as NTP diff --git a/build/filters/adblock_entries.h b/build/filters/adblock_entries.h index a323a562..7880e47f 100644 --- a/build/filters/adblock_entries.h +++ b/build/filters/adblock_entries.h @@ -28,7 +28,7 @@ struct adblock_entry { const char **domains, **domains_skip; }; -#define ADBLOCK_ENTRY_COUNT 56879 +#define ADBLOCK_ENTRY_COUNT 57005 const char *m10030a28[] = { "/InsightTrk/", NULL }; const char *m10043be [] = { "pro6e.com^", NULL }; const char *m10045299[] = { "award.sitekeuring.net^", NULL }; @@ -999,6 +999,7 @@ const char *m142b47bf[] = { "mochiads.com/srv/", ".swf?cachebust=", NULL }; const char *m142c93b3[] = { "wxgfqdxoserkr.bid^", NULL }; const char *m142cda2b[] = { "ilinan.xyz^", NULL }; const char *m142fdd76[] = { "/topad.", NULL }; +const char *m1430399 [] = { "scripts.agilone.com^", NULL }; const char *m14307c02[] = { "tyuawmgqsbz.com^", NULL }; const char *m14318332[] = { "wemfbox.ch^", NULL }; const char *m1432cac7[] = { "bkscqpflg.com^", NULL }; @@ -1232,6 +1233,7 @@ const char *m153841 [] = { "porn8x.net/js/popup.js", NULL }; const char *m15392b5b[] = { "amazon.com^", "^vap-metrics^", NULL }; const char *m15393a27[] = { "_impressions.gif?", NULL }; const char *m153a3184[] = { "ajtoxed.info^", NULL }; +const char *m153ba2af[] = { "mcprofits.com^", NULL }; const char *m153c3331[] = { "highdefjunkies.com^", "^sponsor.jpg", NULL }; const char *m153ca97d[] = { "smoothjazznetwork.com/images/buyicon.jpg", NULL }; const char *m153fabca[] = { "compendiumblog.com/js/stats.js", NULL }; @@ -1969,6 +1971,7 @@ const char *m185f0d8b[] = { "/sp-analytics-", NULL }; const char *m185f980a[] = { "/afrpt.gif?", NULL }; const char *m1860e43a[] = { "oribi.io^", NULL }; const char *m1862b664[] = { "adtraxx.de^", NULL }; +const char *m186487d1[] = { "dtuhvgjyrp.com^", NULL }; const char *m1864cb5c[] = { "thebeat99.com/cmsadmin/banner/", NULL }; const char *m1865066f[] = { "virtualjerusalem.com^", NULL }; const char *m1866326b[] = { "toksnn.com/ads/", NULL }; @@ -2207,6 +2210,7 @@ const char *m196b397d[] = { "metaffiliation.com^", "^taff^", NULL }; const char *m196cff55[] = { "/eventlog.js", NULL }; const char *m196f06db[] = { "z-defense.com^", NULL }; const char *m19700ed2[] = { "firedrive.com/appresources/", NULL }; +const char *m19701e7a[] = { "iddpop.com^", NULL }; const char *m19705129[] = { "imgbox.com/?src=", NULL }; const char *m1972c6b0[] = { "_760x100.", NULL }; const char *m1972dc51[] = { "dmd53.com^", NULL }; @@ -3536,6 +3540,7 @@ const char *m1ef7cc78[] = { "trzi30ic.com^", NULL }; const char *m1ef88f73[] = { "mns.com/ad/", NULL }; const char *m1ef8e98d[] = { "qcxhpohiwawnmo.bid^", NULL }; const char *m1ef94d49[] = { "longtailvideo.com^", "^gapro.js", NULL }; +const char *m1efab32f[] = { "sdtqotoe.com^", NULL }; const char *m1efd4229[] = { "early-birds.fr/tracker/", NULL }; const char *m1eff01df[] = { "/elex.track.", NULL }; const char *m1f00f6c6[] = { ".com/advs-", NULL }; @@ -3887,6 +3892,7 @@ const char *m206e216c[] = { "youporngay.com/elements/", NULL }; const char *m206e8bd8[] = { "phncdn.com/assets/pc/js/userachievements.js", NULL }; const char *m206fc89 [] = { "friesmeasureretain.info^", NULL }; const char *m206fd1f6[] = { "/?r=", "&zoneid=", NULL }; +const char *m2070a024[] = { "smrtgs.com^", NULL }; const char *m2071e20b[] = { "/ads/adx/", NULL }; const char *m2072bd87[] = { "/stats_clicks.", NULL }; const char *m2073c9b0[] = { "cdn.complexmedianetwork.com/cdn/agenda.complex.com/js/jquery.writecapture.js", NULL }; @@ -4325,6 +4331,7 @@ const char *m223d4205[] = { "trahic.ru^", NULL }; const char *m223d7061[] = { "jractwjn.com^", NULL }; const char *m223e4802[] = { "/thetracker.js", NULL }; const char *m223f6d0e[] = { "bobparsons.com/image.aspx?", NULL }; +const char *m223fbd8d[] = { "ukrzsrrydyysim.com^", NULL }; const char *m2241ced6[] = { "/images/livejasmin/", NULL }; const char *m22436fb5[] = { "akamaihd.net^", "^videoAd.js", NULL }; const char *m2243fbd9[] = { "emszbghugzw.bid^", NULL }; @@ -4427,6 +4434,7 @@ const char *m22af38a3[] = { "revfusion.net^", NULL }; const char *m22b0357a[] = { "/reclame/", NULL }; const char *m22b14713[] = { "crypto-coins-now.com^", NULL }; const char *m22b2410f[] = { "vdyqcdxqvebl.com^", NULL }; +const char *m22b53142[] = { "display.ad.daum.net/sdk/native?", NULL }; const char *m22b66d99[] = { "exovueplatform.com^", NULL }; const char *m22b9977 [] = { "countstat.ru^", NULL }; const char *m22bd2046[] = { "followistic.com/widget/stat/", NULL }; @@ -4581,6 +4589,7 @@ const char *m235b92e5[] = { ".lazyad-", NULL }; const char *m235bb6b2[] = { "lebeiivzmm.com^", NULL }; const char *m235bd106[] = { "bmmqsdyud.com^", NULL }; const char *m235d6460[] = { "/adb.policy.js", NULL }; +const char *m235ed92d[] = { "tkn.pornerbros.com^", NULL }; const char *m235f51be[] = { "an.yandex.ru^", NULL }; const char *m236012f [] = { "adwords.google.com^", NULL }; const char *m23617c72[] = { "glcgytymbp.bid^", NULL }; @@ -4913,6 +4922,7 @@ const char *m24cde76f[] = { "wwwstats.info^", NULL }; const char *m24ce8c5d[] = { "chip.de/js/omniture_somtr_code_vH.25.js", NULL }; const char *m24cef07e[] = { "stripchat.com^", "^widget^", NULL }; const char *m24d13bc4[] = { "aeros06.tk^", NULL }; +const char *m24d1bd53[] = { "lwtduavwbep.com^", NULL }; const char *m24d1e1dd[] = { "touchclarity.com^", NULL }; const char *m24d2b84e[] = { "/750-100.", NULL }; const char *m24d2c41e[] = { "seesaa.jp/ot_square.pl?", NULL }; @@ -4953,6 +4963,7 @@ const char *m24ee9cdb[] = { "/redirect?tid=", NULL }; const char *m24eeb506[] = { "fprnt.com^", NULL }; const char *m24ef6cde[] = { "/ad-feedback/", NULL }; const char *m24f00ac7[] = { "", "?proxy=", NULL }; +const char *m24f0d601[] = { "tonsterandhantan.info^", NULL }; const char *m24f0eff2[] = { "aifoosty.net^", NULL }; const char *m24f2cbc7[] = { "imgadult.com/ea/", NULL }; const char *m24f494f5[] = { "kaotic.com/assets/toplists/footer.html", NULL }; @@ -5565,6 +5576,7 @@ const char *m279e0470[] = { "tags.transportdirect.info^", NULL }; const char *m279eca61[] = { "beeseggjfru.bid^", NULL }; const char *m279f35a7[] = { "/affiliate/displayWidget?", NULL }; const char *m279f8e28[] = { "qenprsuoashu.com^", NULL }; +const char *m27a032cd[] = { "viwsqbbvfknp.com^", NULL }; const char *m27a04fb [] = { "statcounter.com/msline.swf", NULL }; const char *m27a0ec4 [] = { "reelcentric.com^", NULL }; const char *m27a2f5e4[] = { "pb.s3wfg.com^", NULL }; @@ -5712,6 +5724,7 @@ const char *m2839409e[] = { ".ro/ads/", NULL }; const char *m28394cfe[] = { "/track-event.", NULL }; const char *m283cf0a7[] = { "/abdetect.js", NULL }; const char *m283d4787[] = { "xpgcrmxejlgig.com^", NULL }; +const char *m283db5aa[] = { "rt.com^", "^pixel.gif", NULL }; const char *m283e58f4[] = { "uaprom.net/image/blank.gif?", NULL }; const char *m28406eb3[] = { "oranges88.com^", NULL }; const char *m2840cf70[] = { "nuggad.net^", NULL }; @@ -6264,6 +6277,7 @@ const char *m2a72f21f[] = { "tube8.com/penthouse/", NULL }; const char *m2a72f4be[] = { "fpqippsowc.bid^", NULL }; const char *m2a731ae5[] = { "wcabsbogwfxv.com^", NULL }; const char *m2a753a3d[] = { ".popupvideoad.", NULL }; +const char *m2a754618[] = { ".wxAdTargeting.", NULL }; const char *m2a757c95[] = { "lightad.co.kr^", NULL }; const char *m2a768650[] = { "theads.me/www/delivery/", NULL }; const char *m2a7bfb57[] = { "hzxtamstwecry.bid^", NULL }; @@ -8470,7 +8484,6 @@ const char *m33e8ef31[] = { "meanjin.com.au/static/images/sponsors.jpg", NULL }; const char *m33ea1989[] = { "/col1/", "&ss=", NULL }; const char *m33ea2a19[] = { "backstage.funnelenvy.com^", NULL }; const char *m33ea8d4f[] = { "nplrzxvyrhiq.com^", NULL }; -const char *m33eb6dfd[] = { "builder-assets.unbounce.com/", NULL }; const char *m33ec3ce3[] = { "mwgjoofxf.bid^", NULL }; const char *m33ee61a4[] = { "magwfymjhils.com^", NULL }; const char *m33f07219[] = { "4f6c963f07f67bd.com^", NULL }; @@ -9884,6 +9897,7 @@ const char *m39da16d5[] = { "seitentipp.com^", NULL }; const char *m39da7b11[] = { "klxteeltivy.com^", NULL }; const char *m39dbe05f[] = { "/driveragentad1.", NULL }; const char *m39dc0bef[] = { "/gomez/", NULL }; +const char *m39dc55e5[] = { "/analytics.", "/ping/?", NULL }; const char *m39dc6e28[] = { "aeros11.tk^", NULL }; const char *m39dca859[] = { "mtlblog.com/wp-content/", "/fab.js", NULL }; const char *m39df0012[] = { "pzaasocba.com^", NULL }; @@ -10428,6 +10442,7 @@ const char *m3c5b3daf[] = { "autogespot.", "/JavaScript/ads.js?", NULL }; const char *m3c5c0802[] = { "jiiyddosyv.com^", NULL }; const char *m3c5c1a8b[] = { "videostat.index.hu^", NULL }; const char *m3c5d0ee7[] = { "soko.ai^", NULL }; +const char *m3c5e18b6[] = { "lsooyivois.com^", NULL }; const char *m3c5eff2 [] = { "/ga-socialtracker.", NULL }; const char *m3c608cd9[] = { "p0.com/1x1", NULL }; const char *m3c636fe2[] = { "/delivery/al.php", NULL }; @@ -10454,6 +10469,7 @@ const char *m3c8385ab[] = { "ksbklucaxgbf.com^", NULL }; const char *m3c83f6e2[] = { "qyrzcsoaey.com^", NULL }; const char *m3c8436db[] = { "qnrzmapdcc.com^", NULL }; const char *m3c845bb3[] = { "kau.li/yad.js", NULL }; +const char *m3c870d6d[] = { "evvpibrfqzjn.com^", NULL }; const char *m3c8734c6[] = { "trck.dlpo.jp^", NULL }; const char *m3c875e57[] = { "photographpan.com^", NULL }; const char *m3c88298c[] = { "_widget_ad.", NULL }; @@ -10625,6 +10641,7 @@ const char *m3d4181d0[] = { "parding.info^", NULL }; const char *m3d420314[] = { "tracker.bestshopping.com^", NULL }; const char *m3d4264e5[] = { "/adsx728.", NULL }; const char *m3d434592[] = { "amxdt.com^", NULL }; +const char *m3d435c59[] = { "jlkqurysdsw.com^", NULL }; const char *m3d4408c9[] = { "stats.twistage.com^", NULL }; const char *m3d465e57[] = { "meineserver.com^", NULL }; const char *m3d473959[] = { "/hit.png?", NULL }; @@ -10771,7 +10788,6 @@ const char *m3dd539e0[] = { "nbc.com/collarity/", NULL }; const char *m3dd7955b[] = { "?adunitid=", NULL }; const char *m3dd996c4[] = { "streamplay.to^", ".m4s", NULL }; const char *m3dd9cc6d[] = { "usanetwork.com/_js/ad.js", NULL }; -const char *m3ddad6ce[] = { "widget-cdn.rpxnow.com^", NULL }; const char *m3ddaf510[] = { "gecxceztcnhkmh.com^", NULL }; const char *m3ddb8d59[] = { "/BehaviourCaptureHandler.", NULL }; const char *m3ddc6a19[] = { "ixeq490u20.com^", NULL }; @@ -10897,6 +10913,7 @@ const char *m3e57e96d[] = { "imwx.com/js/adstwo/adcontroller.js", NULL }; const char *m3e58643b[] = { "/ad/402_", NULL }; const char *m3e5a38e3[] = { "jjyysfxhn.com^", NULL }; const char *m3e5b5e53[] = { "flashx.tv/banner/", NULL }; +const char *m3e604ee9[] = { "tcovxxenhjke.com^", NULL }; const char *m3e616517[] = { "srcip.com^", NULL }; const char *m3e618238[] = { "counter2.blog.livedoor.com^", NULL }; const char *m3e64eaf5[] = { "pixel.digitalspy.co.uk^", NULL }; @@ -11890,6 +11907,7 @@ const char *m42ac9463[] = { "/cdn-monitoring-pixel.", NULL }; const char *m42aca21c[] = { "ydoksieuml.com^", NULL }; const char *m42accd5e[] = { "btsimocheozy.bid^", NULL }; const char *m42ae3967[] = { "/imp/a.gif?", NULL }; +const char *m42aea3e8[] = { "zlahmbwm.com^", NULL }; const char *m42af0039[] = { "lhedywrtanrgz.bid^", NULL }; const char *m42afbf6b[] = { "/us.gif?", NULL }; const char *m42b162a9[] = { "rffjopgiuhsx.com^", NULL }; @@ -12331,6 +12349,7 @@ const char *m447b40c0[] = { "713d79e3192eb21c.com^", NULL }; const char *m447d6c56[] = { "ubxtoqsqusyx.com^", NULL }; const char *m447ddf98[] = { "request.issuu.com^", NULL }; const char *m447ec3bf[] = { "&adgroupid=", NULL }; +const char *m44801b53[] = { "amrfscxvdvfvpa.com^", NULL }; const char *m4482feae[] = { ".org/gads/", NULL }; const char *m4483acab[] = { "loopr.co^", NULL }; const char *m44842eb7[] = { "/ancAdTrack.js", NULL }; @@ -13040,6 +13059,7 @@ const char *m4785a951[] = { "watchsomuch.info^", NULL }; const char *m4786f3bb[] = { "lhuetsviudr.com^", NULL }; const char *m4787535 [] = { "analytics.ladmedia.fr/parismatch/xtcore_mod2.js", NULL }; const char *m4788b24e[] = { "dbstalk.com/sponsors/", NULL }; +const char *m478a18e7[] = { "xjdriaiyy.com^", NULL }; const char *m478bbd50[] = { "gbfnuqois.com^", NULL }; const char *m478bc52 [] = { "bt-chat.com/images/affiliates/", NULL }; const char *m478bcf46[] = { "psarips.com^", ".js^tid^", NULL }; @@ -13538,6 +13558,7 @@ const char *m4990b15d[] = { "kayophjgzqdq.com^", NULL }; const char *m49930160[] = { "id.google.", "/verify/", ".gif", NULL }; const char *m49949174[] = { "photosupload.net/photosupload.js", NULL }; const char *m49961c47[] = { "statedesign.com/advertisers/", NULL }; +const char *m4997abeb[] = { "ippwkczttno.com^", NULL }; const char *m499ac02e[] = { "gxeoadmo.com^", NULL }; const char *m499ae550[] = { "gxklbrtpqqyvy.com^", NULL }; const char *m499b02d3[] = { "8c9cc6d2b0e13.com^", NULL }; @@ -13617,6 +13638,7 @@ const char *m49eda032[] = { "ad.smartclip.net^", NULL }; const char *m49ef5c23[] = { "tracker2.apollo-mail.net^", NULL }; const char *m49f01ee6[] = { "rfgldefouazmj.com^", NULL }; const char *m49f064f6[] = { "/pix.fcg?", NULL }; +const char *m49f0ec79[] = { "tgugqkjvinvgv.com^", NULL }; const char *m49f19590[] = { "trackcustomer.laredoute.com^", NULL }; const char *m49f1c328[] = { "qyiiudex.com^", NULL }; const char *m49f41bf2[] = { "ketads.com^", NULL }; @@ -13907,6 +13929,7 @@ const char *m4b37dcf0[] = { "sfpkwhncpllt.com^", NULL }; const char *m4b3872fd[] = { "mstrlytcs.com^", NULL }; const char *m4b394c51[] = { "/simple_reach.js", NULL }; const char *m4b3a3165[] = { "/adsbycurse.", NULL }; +const char *m4b3b3c2 [] = { "/omniture-app-measurement.", NULL }; const char *m4b3b6c19[] = { "guim.co.uk/guardian/thirdparty/tv-site/side.html", NULL }; const char *m4b3bae27[] = { "forexpeacearmy.com/images/banners/", NULL }; const char *m4b3dd4b9[] = { "lunio.net^", NULL }; @@ -14354,9 +14377,11 @@ const char *m4d29cd7e[] = { "la7.it/js-live/nielsen1.js", NULL }; const char *m4d2a23f9[] = { "trafficfuel.com^", NULL }; const char *m4d2b2ef9[] = { "lupoot.com^", NULL }; const char *m4d2ba61e[] = { "ebbhjxspf.com^", NULL }; +const char *m4d2c826 [] = { "jwwyuxjv.com^", NULL }; const char *m4d2ccd76[] = { "dnjxoflvkvec.com^", NULL }; const char *m4d2dc848[] = { "b1img.com^", NULL }; const char *m4d2ff300[] = { "tigzuaivmtgo.com^", NULL }; +const char *m4d3095f7[] = { "bdnfszdqwaduv.com^", NULL }; const char *m4d33a118[] = { "/adcomp.", NULL }; const char *m4d366edd[] = { "avastats.com^", NULL }; const char *m4d373195[] = { "/microads/", NULL }; @@ -14455,7 +14480,6 @@ const char *m4d93f3e [] = { "mykocam.com/js/feeds.js", NULL }; const char *m4d95048c[] = { "goodcounter.org^", NULL }; const char *m4d961e92[] = { "qeembhyfvjtq.com^", NULL }; const char *m4d971cab[] = { "/utils/analytics.js", NULL }; -const char *m4d98c1d0[] = { "cdn-static.liverail.com^", NULL }; const char *m4d99016 [] = { "assinclusive.com/linkstxt2.html", NULL }; const char *m4d996971[] = { "netcounter.de^", NULL }; const char *m4d99b049[] = { "cjbaeegayainxl.bid^", NULL }; @@ -14567,6 +14591,7 @@ const char *m4e22913e[] = { "stats.inergizedigitalmedia.com^", NULL }; const char *m4e239405[] = { "vdxfpuikz.bid^", NULL }; const char *m4e24bdc7[] = { "partypoker.com^", "^tracking-", NULL }; const char *m4e255ede[] = { "qhrdwjummidz.bid^", NULL }; +const char *m4e2595d1[] = { "px.boundhub.com^", NULL }; const char *m4e259f1c[] = { "/britetrack/", NULL }; const char *m4e25aadd[] = { "miniclip.com/scripts/js.php?", NULL }; const char *m4e26e62c[] = { "/clickctrl.js", NULL }; @@ -14993,6 +15018,7 @@ const char *m4feeec01[] = { "ak.sail-horizon.com^", NULL }; const char *m4ff1f1e1[] = { "/GoogleAnalyticsBC3.", NULL }; const char *m4ff24782[] = { "kbxkcmpd.bid^", NULL }; const char *m4ff30ce6[] = { "frlvfzybstsa.com^", NULL }; +const char *m4ff41c7a[] = { "vvcashpop.com^", NULL }; const char *m4ff737c9[] = { "trtl.ws^", NULL }; const char *m4ff88a15[] = { ".pl/ads/", NULL }; const char *m4ff917d6[] = { "microsoft.com/click/", NULL }; @@ -15436,7 +15462,6 @@ const char *m51eb41cb[] = { "log.sz-online.de^", NULL }; const char *m51ec1214[] = { "/visci-interface.", NULL }; const char *m51ed0aec[] = { "adbuyer.com^", NULL }; const char *m51ed16af[] = { "d1rnw04e6mc22h.cloudfront.net^", NULL }; -const char *m51ef090d[] = { "4tube.com/assets/abExperiments-", NULL }; const char *m51ef0f8b[] = { "/pagepeel.", NULL }; const char *m51f03a3b[] = { "/stickyads.", NULL }; const char *m51f03a74[] = { "sp.tallahassee.com^", NULL }; @@ -15555,6 +15580,7 @@ const char *m5267bc54[] = { "advanseads.com^", NULL }; const char *m5268ed21[] = { "azhdgruuvllzxg.com^", NULL }; const char *m5269aa8f[] = { "tsuitufixxlf.com^", NULL }; const char *m526bad1b[] = { "neobux.com/v/?a=l&l=", NULL }; +const char *m526c4cb2[] = { "peep1alea.com^", NULL }; const char *m526dc6d5[] = { "yfum.com^", NULL }; const char *m526f60b9[] = { "hxwxxhfydbifuq.com^", NULL }; const char *m52708635[] = { "/framead_", NULL }; @@ -15857,6 +15883,7 @@ const char *m53a5c58b[] = { "sextubebox.com/ab2.shtml", NULL }; const char *m53a671be[] = { "dawanda.com/widget/", NULL }; const char *m53a67b25[] = { "fastcontentdelivery.com^", "^ad", ".js", NULL }; const char *m53a76e17[] = { "cdnmedia.xyz^", NULL }; +const char *m53a8e948[] = { "clcknpop.com^", NULL }; const char *m53a9b5bf[] = { "/banner/ad_", NULL }; const char *m53aad171[] = { "upload.tube8.com^", NULL }; const char *m53ab56dc[] = { "/imfloat.", NULL }; @@ -16179,6 +16206,7 @@ const char *m54efd432[] = { "6e2f1d2ae033.com^", NULL }; const char *m54f09bd0[] = { "insnw.net/assets/dsc/dsc.fingerprint-", NULL }; const char *m54f0a0ad[] = { "_125x600_", NULL }; const char *m54f1119b[] = { "/beacon.js", NULL }; +const char *m54f27922[] = { "yntwcepykkts.com^", NULL }; const char *m54f28884[] = { "/generate_204", NULL }; const char *m54f32ae2[] = { "okwgjbqwiibku.bid^", NULL }; const char *m54f4b9f4[] = { "hsmclick.com^", NULL }; @@ -16318,6 +16346,7 @@ const char *m5569ce40[] = { "trbas.com^", NULL }; const char *m556ac250[] = { "s.360.cn^", NULL }; const char *m556c3040[] = { "dnqejgrbtlxe.com^", NULL }; const char *m556d8363[] = { "/ad_support.", NULL }; +const char *m556dfe0f[] = { "qxykytqzwagqj.com^", NULL }; const char *m556f4297[] = { "cgicounter.onlinehome.de^", NULL }; const char *m556f776a[] = { "/affiliate.1800flowers.", NULL }; const char *m5570f72b[] = { "zbsqhxyjlh.com^", NULL }; @@ -16648,6 +16677,7 @@ const char *m56fcf927[] = { "click.eyk.net^", NULL }; const char *m56fe13e5[] = { "/mpu-dm.htm", NULL }; const char *m5701ad31[] = { "hseyrxoi.com^", NULL }; const char *m57030b03[] = { "banners.passiondollars.com^", NULL }; +const char *m5704370d[] = { "tkn.4tube.com^", NULL }; const char *m570559f2[] = { "sexier.com^", "_popunder^", NULL }; const char *m57073a38[] = { "/simtracker.min.js", NULL }; const char *m57079b34[] = { "mootermedia.com^", NULL }; @@ -16709,6 +16739,7 @@ const char *m574bd647[] = { "lmejuamdbtwc.com^", NULL }; const char *m574ce5aa[] = { "/adv.html", NULL }; const char *m574e3cc8[] = { "porntube.com^", "^track", NULL }; const char *m5753ce70[] = { "/adscale_", NULL }; +const char *m5755a3 [] = { "myporn.club^", "^hit", NULL }; const char *m5757d3a4[] = { "noretia.com^", NULL }; const char *m575a9add[] = { "pferetgf.com^", NULL }; const char *m575b1eb3[] = { "optimost.com^", "^FT_live.js", NULL }; @@ -17502,6 +17533,7 @@ const char *m5aea1e74[] = { "playtem.com^", NULL }; const char *m5aeaaaf0[] = { "yjmpzvoe.bid^", NULL }; const char *m5aeaab80[] = { "thisgengaming.com/Scripts/widget2.aspx?id=", NULL }; const char *m5aebb174[] = { "updatetube.com/iframes/", NULL }; +const char *m5aee7033[] = { "ljjaiargqfwtzu.com^", NULL }; const char *m5af0110a[] = { "/adreload.", NULL }; const char *m5af05698[] = { "/ad-methods.", NULL }; const char *m5af10e4a[] = { "/whoson_", "_trackingonly.js", NULL }; @@ -17602,6 +17634,7 @@ const char *m5b6c06c4[] = { "krxd.net/controltag?", NULL }; const char *m5b6ce4e7[] = { "/adfarm.", NULL }; const char *m5b6eb97a[] = { "phncdn.com/html5player/", NULL }; const char *m5b6edd4d[] = { "countino.de^", NULL }; +const char *m5b6f57ad[] = { "lstkchbeoey.com^", NULL }; const char *m5b77048f[] = { "priceline.com^", "^beaconHandler^", NULL }; const char *m5b79f32 [] = { "/www/ad/", NULL }; const char *m5b7ac9e3[] = { "analytics.islamicfinder.org^", NULL }; @@ -17958,6 +17991,7 @@ const char *m5d027840[] = { "picturedip.com/windowfiles/dhtmlwindow.css", NULL } const char *m5d028a18[] = { "_mid_ad.", NULL }; const char *m5d02cad7[] = { "theoplayer.com/t?", NULL }; const char *m5d03b382[] = { "vidoza.net/app.js", NULL }; +const char *m5d057d66[] = { "ppcashpop.com^", NULL }; const char *m5d0645a0[] = { "kvvvdfimdxnu.com^", NULL }; const char *m5d06a19e[] = { "kiks.yandex.", NULL }; const char *m5d06baef[] = { "/trackingapi.", NULL }; @@ -18181,6 +18215,7 @@ const char *m5df32efd[] = { "rylkihtmnvsh.com^", NULL }; const char *m5df4358c[] = { "connect.facebook.", "/", "/AudienceNetworkPrebid.js", NULL }; const char *m5df4eeff[] = { "/satnetads.", NULL }; const char *m5df72122[] = { "cpmstar.com^", NULL }; +const char *m5df88df1[] = { "linetv.tw/public/scripts/ads.js", NULL }; const char *m5df96a33[] = { "ad.23blogs.com^", NULL }; const char *m5dfa4af [] = { "toyhxqjgqcjo.com^", NULL }; const char *m5dfa6831[] = { "deals.nextag.com^", "^ClickTracker.jsp", NULL }; @@ -18292,6 +18327,7 @@ const char *m5e6adfc3[] = { "partner.alloy.com^", NULL }; const char *m5e6b43f [] = { "chobani.com/js/tracking.js", NULL }; const char *m5e6b7b89[] = { "/house_ad-", NULL }; const char *m5e6c0928[] = { "hornygamer.com/images/promo/", NULL }; +const char *m5e6ca2cd[] = { "camsoda1.com^", NULL }; const char *m5e6d74ed[] = { "wvetuwwcojfgw.com^", NULL }; const char *m5e6e1210[] = { "zedo.com^", NULL }; const char *m5e6f3177[] = { ".adserve2.", NULL }; @@ -19329,6 +19365,7 @@ const char *m62803ad1[] = { "ssl4stats.de^", NULL }; const char *m628332b7[] = { "abc.net.au/counters/", NULL }; const char *m6283b139[] = { "performancingads.com^", NULL }; const char *m628403d8[] = { "wiki-stars.com/trade/", NULL }; +const char *m628587c5[] = { "/visit/?", "&ref=", NULL }; const char *m62859322[] = { "/radopenx?", NULL }; const char *m6285ca8b[] = { "ad.directmirror.com^", NULL }; const char *m628637d1[] = { "widgetserver.com/t/", NULL }; @@ -19383,6 +19420,7 @@ const char *m62c40c13[] = { "thaez4sh.com^", NULL }; const char *m62c50103[] = { "rqjgepzyowyr.com^", NULL }; const char *m62c50eb6[] = { "github.com/notifications/beacon/", NULL }; const char *m62c67283[] = { "/all_ads/", NULL }; +const char *m62c70976[] = { "sfgkhgfdsochwd.com^", NULL }; const char *m62c84830[] = { "teefpagayhb.com^", NULL }; const char *m62ca0 [] = { "gameads.com^", NULL }; const char *m62cb786f[] = { "collection.theaa.com^", NULL }; @@ -19480,6 +19518,7 @@ const char *m63384fb4[] = { "eventlog.inspsearchapi.com^", NULL }; const char *m6339c4ea[] = { "algnnojsdr.com^", NULL }; const char *m633a9a5b[] = { "/cdn-cgi/pe/bag2?r", "content.ad", NULL }; const char *m633aa2d8[] = { "el-mundo.net/js/fm", ".js", NULL }; +const char *m633c93e9[] = { "qtxihhkvln.com^", NULL }; const char *m633d596c[] = { "retargeting.biz^", NULL }; const char *m633e17e4[] = { "71dfd978db603cea92a.com^", NULL }; const char *m6340a88e[] = { "jeetyetmedia.com^", NULL }; @@ -20034,6 +20073,7 @@ const char *m6561b123[] = { "hype-ads.com^", NULL }; const char *m65624417[] = { "synapsys.us^", ".gif^", NULL }; const char *m6562a00a[] = { "vs.target.com^", NULL }; const char *m6562f722[] = { "/analyticReportingAS3.", NULL }; +const char *m6564ec4d[] = { "moomoopop.com^", NULL }; const char *m6565d8dc[] = { "d15565yqt7pv7r.cloudfront.net^", NULL }; const char *m6568459f[] = { "widget.cheki.com.ng^", NULL }; const char *m65685c34[] = { "boersennews.de/js/lib/BnPageTracker.js", NULL }; @@ -20125,6 +20165,7 @@ const char *m65c7b996[] = { "/log?type=", NULL }; const char *m65c97c2c[] = { "sportsmole.co.uk/track", ".gif?", NULL }; const char *m65caa27b[] = { "oofte.com^", NULL }; const char *m65cb11ae[] = { "basesclick.ru^", NULL }; +const char *m65ccb21e[] = { "tkn.porntube.com^", NULL }; const char *m65ccc48c[] = { "/buyclicks/", NULL }; const char *m65cd3836[] = { "/ads/web/", NULL }; const char *m65cd5fb9[] = { "cpxl.golem.de^", NULL }; @@ -20939,6 +20980,7 @@ const char *m6930cae0[] = { "xenfrastucter.com^", NULL }; const char *m6930ea6a[] = { "track.leadin.com^", NULL }; const char *m6931298d[] = { "nationalreview.com/images/display_300x600-", NULL }; const char *m69327b5d[] = { "www.limetorrents.info/register/", NULL }; +const char *m69331d6f[] = { "terroppop.com^", NULL }; const char *m69338f45[] = { "ivw.dumontreise.de^", NULL }; const char *m6933b36c[] = { "logmein.com/Serve.aspx?ZoneID=", NULL }; const char *m69346156[] = { "imagetwist.com/", "?", NULL }; @@ -21327,6 +21369,7 @@ const char *m6abeae89[] = { "yimg.com/mi/eu/ywa.js", NULL }; const char *m6abf0bd1[] = { "/yahooads/", NULL }; const char *m6ac10aaa[] = { "stack-sonar.com^", NULL }; const char *m6ac43593[] = { "hpmgdwvvqulp.com^", NULL }; +const char *m6ac53ee5[] = { "idszrbmjvkdodt.com^", NULL }; const char *m6ac5685c[] = { "advertlets.com^", NULL }; const char *m6ac7a2b4[] = { "castasap.com/publi2.html", NULL }; const char *m6ac8d389[] = { "/blockalyzer-adblock-counter/js/advertisement.js", NULL }; @@ -21473,6 +21516,7 @@ const char *m6b53bd02[] = { "/log/error?", NULL }; const char *m6b5612ca[] = { "smartcompany.com.au/images/stories/sponsored-posts/", NULL }; const char *m6b577145[] = { "/deluxe/ad.", NULL }; const char *m6b59a3c [] = { "/adserver2.", NULL }; +const char *m6b59e1f1[] = { "jndnkgjqlxr.com^", NULL }; const char *m6b5b5fcc[] = { "/acounter.php?", NULL }; const char *m6b5c8da [] = { "/scripts/ad.", NULL }; const char *m6b5dae8b[] = { "qiksilver.net^", "^banners^", NULL }; @@ -22443,6 +22487,7 @@ const char *m6f6fb55d[] = { "nkredir.com^", NULL }; const char *m6f710e49[] = { ".link/ads/", NULL }; const char *m6f71e130[] = { "static.cdn-ec.viddler.com^", NULL }; const char *m6f721cac[] = { "/HitTracker/", NULL }; +const char *m6f72e606[] = { "nxnjpslufglmvp.com^", NULL }; const char *m6f7382fc[] = { "track.dzloans.com^", NULL }; const char *m6f73a610[] = { "/tizers.php?", NULL }; const char *m6f747053[] = { "/counter/ct.php?", NULL }; @@ -22684,6 +22729,7 @@ const char *m70652a5f[] = { "torrentcacher.info^", NULL }; const char *m7066e943[] = { "/adframe?", NULL }; const char *m70684b00[] = { "picturescream.com/top_banners.html", NULL }; const char *m70697437[] = { "tvas-b.pw^", NULL }; +const char *m70698898[] = { "hnnp4ixxkl.com^", NULL }; const char *m706c939 [] = { "href.li^", NULL }; const char *m706d9f7e[] = { "/pixeltag.", NULL }; const char *m706e5f68[] = { "/cyad1.", NULL }; @@ -23777,6 +23823,7 @@ const char *m74e030e0[] = { "/visitWebPage?_", NULL }; const char *m74e14aaf[] = { "/ads/indexsponsors/", NULL }; const char *m74e1769a[] = { ".com/js/ga.js", NULL }; const char *m74e40b9 [] = { "/Google/ga.js", NULL }; +const char *m74e4f3d1[] = { "vlscppe.microsoft.com/fp/tags.js", NULL }; const char *m74e6c5f9[] = { "akamaihd.net^", "^showads", NULL }; const char *m74e6d1d [] = { "nbcudigitaladops.com/hosted/js/", "_com_header.js", NULL }; const char *m74e9b285[] = { "igsxvpghnamnsz.com^", NULL }; @@ -23878,6 +23925,7 @@ const char *m7545fa95[] = { "ivism.org^", NULL }; const char *m75467942[] = { "69oxt4q05.com^", NULL }; const char *m75472bac[] = { "deiqehvcdnntg.com^", NULL }; const char *m7547d5a3[] = { "ad5track.com^", NULL }; +const char *m7548403b[] = { "smac-ssp.com^", NULL }; const char *m754c1434[] = { "yieldsoftware.com^", NULL }; const char *m754c725b[] = { "nljpyhzkat.com^", NULL }; const char *m754d0341[] = { "hrfziiddxa.ru^", NULL }; @@ -23973,6 +24021,7 @@ const char *m75a2a9aa[] = { "dollarade.com/overlay_gateway.php?oid=", NULL }; const char *m75a36521[] = { "hdplayer.li^", NULL }; const char *m75a45ed2[] = { "hulu.com/watch/", "track.url-1.com", NULL }; const char *m75a505f5[] = { "dhuodal.com^", NULL }; +const char *m75a532e6[] = { "adserved.net^", NULL }; const char *m75a6f902[] = { "hit.copesa.cl^", NULL }; const char *m75a8c03c[] = { "rtctxxxvdq.com^", NULL }; const char *m75a9c38c[] = { "analytics.edgekey.net^", NULL }; @@ -24214,7 +24263,6 @@ const char *m76b813f0[] = { "rapidvideo.com/jwplayer", "/jwplayer.js", NULL }; const char *m76b9bf6c[] = { "akamaized.net^", "^js^tracking^ninja.js", NULL }; const char *m76ba091f[] = { "/~cdn/ads/", NULL }; const char *m76bab4a9[] = { "hancinema.net/images/banner_", NULL }; -const char *m76babb21[] = { "cdn.turner.com/ads/nba/adfuel.js", NULL }; const char *m76babcba[] = { "clicktrace.info^", NULL }; const char *m76bbef3 [] = { "7s08gpbp39.com^", NULL }; const char *m76bc3ebb[] = { "statistiche.it^", NULL }; @@ -24437,6 +24485,7 @@ const char *m7797474f[] = { "vidible.tv/prod/tags/", NULL }; const char *m7797cda7[] = { "/saveStats.php?", NULL }; const char *m779818e [] = { "tube18.sex/tube18.", NULL }; const char *m77996549[] = { "_button_ad_", NULL }; +const char *m779b5ca [] = { "-ad-targeting?", NULL }; const char *m779c1573[] = { "cloudfront.net/pop?", NULL }; const char *m779ca0e0[] = { "ksrcnyrntlyfo.com^", NULL }; const char *m779e2ca5[] = { "rcards.net/wp-content/plugins/useful-banner-manager/", NULL }; @@ -26305,6 +26354,7 @@ const char *m7f9c862 [] = { "1q2w3.website^", NULL }; const char *m7f9cb4c3[] = { "ungstlateriag.club^", NULL }; const char *m7f9e5ac8[] = { "lovefilm.com^", "^lf-perf-beacon.png", NULL }; const char *m7fa40899[] = { "apmkcdsnv.bid^", NULL }; +const char *m7fa42786[] = { "tbkfmuvtzrwsw.com^", NULL }; const char *m7fa4db62[] = { "/beacon/timing?", NULL }; const char *m7fa56423[] = { "/mmt.gif?", NULL }; const char *m7fa67e06[] = { "/ad/add_", NULL }; @@ -26479,6 +26529,7 @@ const char *m80660b0d[] = { "sp.guampdn.com^", NULL }; const char *m80662fcf[] = { "ytiyuqfxjbke.com^", NULL }; const char *m806703ff[] = { "links.boom.ge^", NULL }; const char *m806b96fe[] = { "tracking.realtor.com^", NULL }; +const char *m80703ea6[] = { "xcwnwrgvwg.com^", NULL }; const char *m8070bb39[] = { "tubeplus.me/geoip.php?", NULL }; const char *m807127ac[] = { "flappysquid.net^", NULL }; const char *m8071814 [] = { "surfmusic.de/banner", NULL }; @@ -27198,6 +27249,7 @@ const char *m83982070[] = { "beemrdwn.com^", NULL }; const char *m8398ab6c[] = { "qwrkigqtgygc.com^", NULL }; const char *m839aaad [] = { "/boomerang.js", NULL }; const char *m839b008a[] = { "/fe/track/", NULL }; +const char *m839b1d75[] = { "xijgqrrhyfa.com^", NULL }; const char *m839c301e[] = { "emediate.se/eas?", NULL }; const char *m839c4ee [] = { "mrskincdn.com^", "^flash^aff^", NULL }; const char *m839c86a9[] = { "zxazzpdvhf.bid^", NULL }; @@ -27329,6 +27381,7 @@ const char *m8429cb8e[] = { "copperegg.com^", NULL }; const char *m842ce97e[] = { "dailymotion.com^", "^analytics.js", NULL }; const char *m843008 [] = { "qwuxwxdr.com^", NULL }; const char *m84301867[] = { "pwdmtyzyq.com^", NULL }; +const char *m8431183f[] = { "euwyhbib.com^", NULL }; const char *m8431ad90[] = { "cloudfront.net/customers/24868.min.js", NULL }; const char *m843297d5[] = { "/anametrix_tag.js", NULL }; const char *m843553c8[] = { "thestandard.com.hk/rotate_", NULL }; @@ -27356,6 +27409,7 @@ const char *m844d5ad7[] = { "contadordevisitas.es^", NULL }; const char *m8451ca3f[] = { "eye.swfchan.com^", NULL }; const char *m84521188[] = { "/\\.science\\/[0-9]{2,9}\\/$/", NULL }; const char *m84535b99[] = { "pbsrc.com/footer/", NULL }; +const char *m8454697 [] = { "zpwqnicvzi.com^", NULL }; const char *m8455d9ab[] = { "jwpsrv.com/library/", NULL }; const char *m8457d2bc[] = { "mqlkcicnrgpntw.bid^", NULL }; const char *m8458cacd[] = { "/skyscraper-ad.", NULL }; @@ -27829,6 +27883,7 @@ const char *m8661bca3[] = { "qiqrguvdhcux.com^", NULL }; const char *m866217bf[] = { "nupoot.com^", NULL }; const char *m86642c83[] = { "mediaplex.com^", "^universal.html", NULL }; const char *m86672ec8[] = { "glumifo.info^", NULL }; +const char *m8667f245[] = { "analytics.rambla.be^", NULL }; const char *m866874df[] = { "bargainpricedude.com^", NULL }; const char *m866bc85d[] = { "perfecttoolmedia.com^", NULL }; const char *m866d302c[] = { "theminiforum.co.uk/images/banners/", NULL }; @@ -28757,6 +28812,7 @@ const char *m8a864450[] = { "tracking.conversionlab.it^", NULL }; const char *m8a895d6f[] = { "/t-ads.", NULL }; const char *m8a895fe6[] = { "/pagead46.", NULL }; const char *m8a8b68b8[] = { "vhd.me/custom/interstitial", NULL }; +const char *m8a8b804b[] = { "gxpijskyqwqfjw.com^", NULL }; const char *m8a8c07cd[] = { "gelbooru.com^", NULL }; const char *m8a8d13e3[] = { "cts.tradepub.com/cts4/?ptnr=", "&tm=", NULL }; const char *m8a8f18e9[] = { "freefilefillableforms.com/js/lib/irs/fingerprint.js", NULL }; @@ -29296,6 +29352,7 @@ const char *m8d036f4e[] = { "tns-counter.ru^", NULL }; const char *m8d041458[] = { "/ad2_", NULL }; const char *m8d049219[] = { "codeorigin.jquery.com^", NULL }; const char *m8d070624[] = { "213.174.140.38/bftv/js/msn-", NULL }; +const char *m8d084a36[] = { "frtyi.com^", NULL }; const char *m8d0baf73[] = { "digitaloptout.com^", NULL }; const char *m8d0beb7c[] = { "-120x600_", NULL }; const char *m8d0c8ab1[] = { "getreading.co.uk/static/img/bg_takeover_", NULL }; @@ -29435,6 +29492,7 @@ const char *m8da336d6[] = { "ads2-adnow.com^", NULL }; const char *m8da61ccb[] = { "ojmokfvfi.com^", NULL }; const char *m8da702cf[] = { "-adverts.libs.", NULL }; const char *m8da70685[] = { "collect.finanzen.net^", NULL }; +const char *m8daa871 [] = { "ckrf1.com^", NULL }; const char *m8dab8ef3[] = { "pornhub.com/upload/", NULL }; const char *m8dabb944[] = { "rlypbeouoxxw.com^", NULL }; const char *m8dac3c4c[] = { "team-vitality.fr/assets/images/advert.png", NULL }; @@ -29645,6 +29703,7 @@ const char *m8e7f374b[] = { "picsspell.ru^", NULL }; const char *m8e80e25d[] = { "d2omcicc3a4zlg.cloudfront.net^", NULL }; const char *m8e8332b9[] = { "exchange.automoc.net^", NULL }; const char *m8e833e5c[] = { "/ads/outbrain?", NULL }; +const char *m8e83a0b0[] = { "popuexo.com^", NULL }; const char *m8e85d7f1[] = { "1298bab69bbc4.com^", NULL }; const char *m8e863786[] = { "/imgad.", NULL }; const char *m8e888473[] = { "/chan_slidesurvey.js", NULL }; @@ -29886,6 +29945,7 @@ const char *m8f7ba2a1[] = { "snapvine.club^", NULL }; const char *m8f7d1a05[] = { "tebadu.com^", NULL }; const char *m8f7e0663[] = { "iplsc.com^", "^inpl.box.ad.js", NULL }; const char *m8f7e9c6e[] = { "ixquick.", "/do/avt?", NULL }; +const char *m8f807c53[] = { "/ad-third-party/", NULL }; const char *m8f83331f[] = { "3gporn.biz^", NULL }; const char *m8f84252d[] = { "zomobo.net/images/removeads.png", NULL }; const char *m8f858374[] = { "unlimited-tv.show^", NULL }; @@ -30469,6 +30529,7 @@ const char *m91e367cc[] = { "negdrvgo.com^", NULL }; const char *m91e5301d[] = { "/sample728x90ad.", NULL }; const char *m91e55394[] = { "kfjgnunsuy.bid^", NULL }; const char *m91e99449[] = { "/ad/", "&ifid=", NULL }; +const char *m91ea7c63[] = { "/newrelic-gpt.", NULL }; const char *m91eb00b7[] = { "extensoft.com/artisteer/banners/", NULL }; const char *m91eb10e [] = { "/sitecounter/counter.", NULL }; const char *m91eca690[] = { "jyxckvhds.bid^", NULL }; @@ -30657,6 +30718,7 @@ const char *m92bce4ce[] = { "dxwgpw0lkcum5.cloudfront.net^", NULL }; const char *m92bd0284[] = { "contadorgratis.com^", NULL }; const char *m92bd8751[] = { "fastly-insights.com^", NULL }; const char *m92c309c2[] = { "saboom.com.pccdn.com^", "^banner^", NULL }; +const char *m92c49814[] = { "upzpyrsvvxpoey.com^", NULL }; const char *m92c5b8bd[] = { "wahooads.com/Ads.nsf/", NULL }; const char *m92c5e628[] = { "absolutewrite.com^", "^doyle_editorial.jpg", NULL }; const char *m92c68343[] = { "cef9c80977e050.com^", NULL }; @@ -30727,6 +30789,7 @@ const char *m92fe2441[] = { "imagearn.com/img/picBanner.swf", NULL }; const char *m92ff6d4c[] = { "arsenal-mania.com/images/backsplash_", NULL }; const char *m92ffe168[] = { "tracking.resumecompanion.com^", NULL }; const char *m93016bc4[] = { "avsforum.com/alliance/", NULL }; +const char *m93025bde[] = { "ornament-i.com^", NULL }; const char *m93061ed3[] = { "tawk.to^", NULL }; const char *m93067705[] = { "firstonetv.eu/ajs/", NULL }; const char *m93078216[] = { "brudirect.com/images/banners/", NULL }; @@ -31251,6 +31314,7 @@ const char *m95619d3e[] = { "_skinad.", NULL }; const char *m95630cb2[] = { "finderlocator.com^", NULL }; const char *m9565ab10[] = { "/netseerads.", NULL }; const char *m95668484[] = { "sckzvqadc.com^", NULL }; +const char *m9566ed50[] = { "ebfkifnjs.com^", NULL }; const char *m9566fdc9[] = { "moviewallpaper.net/js/mwpopunder.js", NULL }; const char *m95671df2[] = { "realssp.co.kr^", NULL }; const char *m956935dc[] = { "auditude.com/player/js/lib/aud.html5player.js", NULL }; @@ -31299,6 +31363,7 @@ const char *m959e6463[] = { "fqemzrkwuiaq.bid^", NULL }; const char *m95a08153[] = { "d2dxgm96wvaa5j.cloudfront.net^", NULL }; const char *m95a0ec2e[] = { "lqiublivx.bid^", NULL }; const char *m95a0eefc[] = { "/mobilead_", NULL }; +const char *m95a1ed97[] = { "qhuktypo.com^", NULL }; const char *m95a341dd[] = { "cash.neweramediaworks.com^", NULL }; const char *m95a51d8b[] = { "webtrack.dhlglobalmail.com^", NULL }; const char *m95a689a2[] = { "wvbr.com/images/banner/", NULL }; @@ -31598,6 +31663,7 @@ const char *m96e6309b[] = { "perfectaudience.com^", NULL }; const char *m96eaf949[] = { "/analytics?url=", NULL }; const char *m96ed0bed[] = { "comsec.com.au^", "^homepage_banner_ad.gif", NULL }; const char *m96ed4fe1[] = { "weborama.fr^", NULL }; +const char *m96ef5ae6[] = { "doublelimpup.com^", NULL }; const char *m96f00fbd[] = { "ydoexgadghunl.bid^", NULL }; const char *m96f0ccba[] = { "chiefcurrent.com^", NULL }; const char *m96f3e3e5[] = { "/wcount.php?", NULL }; @@ -31651,6 +31717,7 @@ const char *m971fd627[] = { "/img/ads/", NULL }; const char *m971ffd79[] = { "cheapoair.com/desktopmodules/adsales/adsaleshandle.ashx?", NULL }; const char *m97213b63[] = { "/msnads1.", NULL }; const char *m97216e51[] = { "coinwebmining.com^", NULL }; +const char *m9721b96d[] = { "bmichkohfqtnvq.com^", NULL }; const char *m9722b38c[] = { "imageshimage.com/xupload.js", NULL }; const char *m97239df5[] = { "/kGoogleAnalytics.js", NULL }; const char *m972439ee[] = { "ebaystatic.com^", "^tracking_RaptorheaderJS.js", NULL }; @@ -32055,6 +32122,7 @@ const char *m98ce7dc2[] = { "/valueclickbrands/", NULL }; const char *m98cea2c9[] = { ".ad.wrapper.", NULL }; const char *m98d349d3[] = { "swatchseries.to/jquery.min.js", NULL }; const char *m98d42053[] = { "d2mq0uzafv8ytp.cloudfront.net^", NULL }; +const char *m98d5738 [] = { "buythis.ad^", NULL }; const char *m98d9ad2f[] = { "guanoo.net^", NULL }; const char *m98dac72a[] = { "/trk.gif?", NULL }; const char *m98dc587c[] = { "live-proxy.com/vectrotunnel-logo.jpg", NULL }; @@ -32239,6 +32307,7 @@ const char *m999147cd[] = { "amateuralbum.net/affb.html", NULL }; const char *m999149e5[] = { "usmyfgrdv.bid^", NULL }; const char *m9992320c[] = { "/advert1/", NULL }; const char *m99934276[] = { "-sidebar-ad.", NULL }; +const char *m999383c1[] = { "oktpage.com^", NULL }; const char *m9993fb05[] = { "/switchadbanner.", NULL }; const char *m9994760a[] = { "/ads-sky", NULL }; const char *m999487e [] = { "_468x60.", NULL }; @@ -32276,6 +32345,7 @@ const char *m99b51d99[] = { "cacheserve.", "/promodisplay?", NULL }; const char *m99b6521e[] = { "hyhabjqndvwf.bid^", NULL }; const char *m99b81521[] = { "gostats.de^", NULL }; const char *m99b962e7[] = { "-google-ads-", NULL }; +const char *m99b96633[] = { "hyurzuxoksg.com^", NULL }; const char *m99ba045 [] = { "his.tv.sohu.com/his/ping.do?", NULL }; const char *m99ba29bd[] = { "16e2ae8f200d975b.com^", NULL }; const char *m99babc94[] = { "alicdn.com^", "^click_stat^", NULL }; @@ -32572,6 +32642,7 @@ const char *m9afb8090[] = { "noiaifyednjt.com^", NULL }; const char *m9afc2385[] = { "addroplet.com^", NULL }; const char *m9afcc6ae[] = { "sandai.me/assets/", ".php", NULL }; const char *m9b0013 [] = { "target.fark.com^", NULL }; +const char *m9b02e17a[] = { "duroternout.info^", NULL }; const char *m9b02f679[] = { "x-stat.de^", NULL }; const char *m9b03eb5a[] = { "/smalltopl.", NULL }; const char *m9b040db2[] = { "/popshow.", NULL }; @@ -32772,6 +32843,7 @@ const char *m9be7c278[] = { "kmindex.ru^", NULL }; const char *m9beb0231[] = { "/125x125_banner.", NULL }; const char *m9beb5dd8[] = { "hcrsxbke.com^", NULL }; const char *m9bec22e1[] = { "ksavfuxjbqx.com^", NULL }; +const char *m9becfcf [] = { "/trkga.", NULL }; const char *m9bed82b7[] = { "adtlgc.com^", NULL }; const char *m9bed9c4e[] = { "gnar.grammarly.com^", NULL }; const char *m9bee058 [] = { "mc.webvisor.org^", NULL }; @@ -32929,6 +33001,7 @@ const char *m9c9001dc[] = { "cryptomine.pro^", NULL }; const char *m9c911227[] = { "vxbtrsqjnjpq.com^", NULL }; const char *m9c92962d[] = { "usenetbucket.com^", "-banner^", NULL }; const char *m9c9299f9[] = { "popearn.com^", NULL }; +const char *m9c94fbf0[] = { "kiejztfpkfayak.com^", NULL }; const char *m9c95331d[] = { "/aws-analytics.js", NULL }; const char *m9c9544b [] = { "homestore.com/srv/", NULL }; const char *m9c967fb6[] = { "/initialize_ads-", NULL }; @@ -32939,6 +33012,7 @@ const char *m9c9c7f85[] = { "/log.jphp?", NULL }; const char *m9c9cd4f6[] = { "thisav.com/0628.", NULL }; const char *m9c9f0bd2[] = { "bt.ilsemedia.nl^", NULL }; const char *m9ca0e72 [] = { "apartments.com^", "^al.gif^", NULL }; +const char *m9ca293eb[] = { "btgovcuviqor.com^", NULL }; const char *m9ca35b29[] = { "vidyouall.com^", NULL }; const char *m9ca3c294[] = { "flophous.cf^", NULL }; const char *m9ca40eed[] = { "conexitry.com^", NULL }; @@ -33494,6 +33568,7 @@ const char *m9f122a3c[] = { "wstfgpdmb.bid^", NULL }; const char *m9f1276cb[] = { "syndication.jsadapi.com^", NULL }; const char *m9f13676f[] = { "gmwqmjkggg.com^", NULL }; const char *m9f156fbf[] = { "_adsrv?", NULL }; +const char *m9f1694b7[] = { "cnn.com/analytics/", NULL }; const char *m9f16c7f6[] = { "jshosting.loan", NULL }; const char *m9f1797f0[] = { "fnro4yu0.loan^", NULL }; const char *m9f18a425[] = { "vodhaqaujopg.com^", NULL }; @@ -33769,6 +33844,7 @@ const char *ma0601f29[] = { "ga.canoe.ca^", NULL }; const char *ma06037fc[] = { "performances.bestofmedia.com^", NULL }; const char *ma061f6f3[] = { ".php?zone_id=", NULL }; const char *ma0624766[] = { "/ad-amz.", NULL }; +const char *ma0635766[] = { "ynoiezey.com^", NULL }; const char *ma063c41b[] = { "theirsvendor.com^", NULL }; const char *ma064bc6c[] = { "tracker.tiu.ru^", NULL }; const char *ma0665431[] = { "metrics-api.librato.com^", NULL }; @@ -34116,6 +34192,7 @@ const char *ma1c06fe9[] = { "adcell.de^", NULL }; const char *ma1c2024 [] = { "amnesty.ca/images/banners/", NULL }; const char *ma1c33990[] = { "apis.google.com/js/plusone.js", NULL }; const char *ma1c66dfb[] = { "smdg.ca/ads/banner/pen.png", NULL }; +const char *ma1c69de3[] = { "isupopc.com^", NULL }; const char *ma1c77c7a[] = { "/adsales/", NULL }; const char *ma1c8ed61[] = { "sxc.hu/img/banner", NULL }; const char *ma1c93827[] = { "/index.php?_m=livesupport", "&referrer=", NULL }; @@ -34314,6 +34391,7 @@ const char *ma2976626[] = { "tube911.com/scj/cgi/out.php?scheme_id=", NULL }; const char *ma2994e08[] = { "/log?documentUrl=", NULL }; const char *ma2999f07[] = { "cwbbqhgtjbvtzi.com^", NULL }; const char *ma299baa4[] = { "/cclickTracking.", NULL }; +const char *ma29a4ed4[] = { "/collect?eid=", NULL }; const char *ma29b14b0[] = { "/cgi-bin/ivw-ssl/", NULL }; const char *ma29b752e[] = { "wboewdhesyfgsk.bid^", NULL }; const char *ma29b8be0[] = { "pujj652hkm.com^", NULL }; @@ -35087,6 +35165,7 @@ const char *ma5d1af12[] = { "theseblogs.com/visitScript/", NULL }; const char *ma5d1d16 [] = { "i-am-bored.com/cah.asp", NULL }; const char *ma5d1f00f[] = { "sp.publicopiniononline.com^", NULL }; const char *ma5d26904[] = { "azalead.com^", NULL }; +const char *ma5d41a94[] = { "sscashpop.com^", NULL }; const char *ma5d49cdb[] = { "/RefSplDicAdsTopL.", NULL }; const char *ma5d6fa0a[] = { "/jquery.adi.", NULL }; const char *ma5d72ca0[] = { "/servlet/view/", NULL }; @@ -36439,6 +36518,7 @@ const char *mab98229f[] = { "ad-maven.com^", NULL }; const char *mab9990ca[] = { "f5porn.com/porn.gif", NULL }; const char *mab99f68f[] = { "ervinguewty.com^", NULL }; const char *mab9a6ab6[] = { "stargamesaffiliate.com^", NULL }; +const char *mab9a7785[] = { "ttgvmqdpomt.com^", NULL }; const char *mab9a838f[] = { "phncdn.com/js/general_tablet-min.js", NULL }; const char *mab9acb08[] = { "lottoelite.com/banners/", NULL }; const char *mab9b4945[] = { "coinhive-manager.com^", NULL }; @@ -36636,6 +36716,7 @@ const char *mac694d24[] = { "_480x60.", NULL }; const char *mac697c36[] = { "servepics.com^", NULL }; const char *mac6a11bb[] = { "ensighten.com^", "^scode^", NULL }; const char *mac6b29a3[] = { "banners.cams.com^", NULL }; +const char *mac6b88d2[] = { "hgowmgat.com^", NULL }; const char *mac6d0fc7[] = { "/desktop-ad-", NULL }; const char *mac70010e[] = { "_googleads_", NULL }; const char *mac70699d[] = { "msecnd.net/widget-scripts/extra_content/ads.js", NULL }; @@ -38059,6 +38140,7 @@ const char *mb2525e5b[] = { "suthome.com^", NULL }; const char *mb2528fc [] = { "vast.com/vimpressions.js", NULL }; const char *mb252a122[] = { "/ad7.", NULL }; const char *mb253f852[] = { "addgfxnb.com^", NULL }; +const char *mb2550938[] = { "amazonaws.com^", "^vis_opt.js", NULL }; const char *mb2575731[] = { "googleapis.com^", "^gen_204^", NULL }; const char *mb257791f[] = { "mzguykhxnuap.com^", NULL }; const char *mb25ad7e7[] = { "ntjcrsfvszoen.com^", NULL }; @@ -38767,6 +38849,7 @@ const char *mb5768f0f[] = { "/smartad-", NULL }; const char *mb5769288[] = { "stats.urban-media.com^", NULL }; const char *mb576c295[] = { "widget.uservoice.com^", NULL }; const char *mb57868d3[] = { "hogylomirfc.com^", NULL }; +const char *mb57941da[] = { "lcwfab1.com^", NULL }; const char *mb579fc97[] = { "chatango.com^", NULL }; const char *mb57c5748[] = { "tgarmwltrlb.bid^", NULL }; const char *mb57c5f40[] = { "nyctourist.com/www/delivery/spcjs.php?", NULL }; @@ -39458,6 +39541,7 @@ const char *mb872336f[] = { "rbxtrk.com^", NULL }; const char *mb873c20d[] = { "reson8.com^", NULL }; const char *mb873f7a9[] = { "searchenginejournal.com^", "^sponsored-", NULL }; const char *mb8741683[] = { "/owa.tracker-combined-min.js", NULL }; +const char *mb874f933[] = { "fiv2yl8dct.com^", NULL }; const char *mb876c96e[] = { "xdqjeggqm.com^", NULL }; const char *mb87776ac[] = { "grrduoonwjpy.com^", NULL }; const char *mb877d3e1[] = { "sxjhskptisd.com^", NULL }; @@ -40058,6 +40142,7 @@ const char *mbafb4537[] = { "/stat_search.", NULL }; const char *mbafb4841[] = { "sexykittenporn.com^", NULL }; const char *mbafc68bd[] = { "uservoice.com^", "^track.js", NULL }; const char *mbafccc02[] = { "aotrcqegtfhlaw.bid^", NULL }; +const char *mbafdbdb1[] = { "vjgyxegvfrhthq.com^", NULL }; const char *mbafecaff[] = { "_gallery_ads.", NULL }; const char *mbaffec1 [] = { "viriepak.com^", NULL }; const char *mbb0038d4[] = { "wdbddckjoguz.com^", NULL }; @@ -40074,6 +40159,7 @@ const char *mbb0b15be[] = { "tablespoon.com/library/js/TBSP_ntpagetag.js", NULL const char *mbb0e39dd[] = { "allnvbtrtpku.com^", NULL }; const char *mbb0e7907[] = { "/vtextads.", NULL }; const char *mbb12a446[] = { "metrics.el-mundo.net^", NULL }; +const char *mbb13b3ea[] = { "?adunit=", NULL }; const char *mbb14c2ca[] = { "rmlzgvnuqxlp.com^", NULL }; const char *mbb15cfca[] = { "curtaecompartilha.com^", NULL }; const char *mbb169b55[] = { "tskdngwznw.bid^", NULL }; @@ -40277,6 +40363,7 @@ const char *mbbead82d[] = { "./M5q5.js", NULL }; const char *mbbeba654[] = { "/cnads.js", NULL }; const char *mbbec58fe[] = { "/event-log/", NULL }; const char *mbbecd56a[] = { "auto-insurance-quotes-compare.com^", NULL }; +const char *mbbece13e[] = { ".refreshAds.", NULL }; const char *mbbed9a4d[] = { "crzlkluxnigce.com^", NULL }; const char *mbbef3337[] = { "estream.to/bootstrap.min.js", NULL }; const char *mbbf15b4 [] = { "d33t3vvu2t2yu5.cloudfront.net/pub/", NULL }; @@ -40559,6 +40646,7 @@ const char *mbd173875[] = { "redtube.com/panel/", NULL }; const char *mbd191272[] = { "_adsetup.", NULL }; const char *mbd1ad8e0[] = { "cfake.com/images/a/", NULL }; const char *mbd1d119b[] = { "/adreplace728x90.", NULL }; +const char *mbd1d517 [] = { "jhwkypuhrw.com^", NULL }; const char *mbd1eaf9c[] = { "/ad-background.", NULL }; const char *mbd1ef36 [] = { "/ads-vast-", NULL }; const char *mbd200c6c[] = { "ujwdwwfuqcgnv.com^", NULL }; @@ -40578,6 +40666,7 @@ const char *mbd3b8f0d[] = { "debridnet.com/adframe.js", NULL }; const char *mbd3bc01f[] = { "/shared/ads/", NULL }; const char *mbd3c3215[] = { "/pix_st_v2.php?", NULL }; const char *mbd3c46d7[] = { "player.vioapi.com/ads/flash/vioplayer.swf", NULL }; +const char *mbd3c5eb2[] = { "syndopop.com^", NULL }; const char *mbd3d3e4d[] = { "myawrthcsjc.com^", NULL }; const char *mbd3d95a3[] = { "/cgi-bin/vdz/", NULL }; const char *mbd3e0732[] = { "/ads/?QAPS_", NULL }; @@ -42792,6 +42881,7 @@ const char *mc6a724b1[] = { "wrko.com/sites/wrko.com/files/poll/", "_285x95.jpg" const char *mc6a77c80[] = { "xboxgaming.co.za^", "^images^background^", NULL }; const char *mc6a80a05[] = { "l.yimg.com/", "/adservice/", NULL }; const char *mc6a84fea[] = { "/adevents.", NULL }; +const char *mc6a98659[] = { "stat.ouedkniss.com^", NULL }; const char *mc6aa6082[] = { "9msn.com.au^", ".tracking.udc.", NULL }; const char *mc6aba473[] = { "adcamel.pw^", NULL }; const char *mc6ac0c11[] = { "/adv.css?", NULL }; @@ -43108,6 +43198,7 @@ const char *mc7f22347[] = { "/histats/", NULL }; const char *mc7f29848[] = { "claritytag.com^", NULL }; const char *mc7f370b4[] = { "dwhvkier.com^", NULL }; const char *mc7f69863[] = { "193.34.134.74^", "^banners^", NULL }; +const char *mc7f91b6a[] = { "lhdndgmsy.com^", NULL }; const char *mc7f96898[] = { "updatetube.com/updatetube_html/", NULL }; const char *mc7fb2b61[] = { "zrosbqwecw.com^", NULL }; const char *mc7fb5701[] = { "fifa.com^", "^sponsors^", NULL }; @@ -43797,6 +43888,7 @@ const char *mcadde3d7[] = { "googlecode.com^", "^tracker.js", NULL }; const char *mcade75d9[] = { "phncdn.com/www-static/js/user-start.js?", NULL }; const char *mcade9207[] = { "site-", ".mozfiles.com/files/", "/banners/", NULL }; const char *mcae1313d[] = { "ompzowzfwwfc.com^", NULL }; +const char *mcae25b8f[] = { "bavftcgoapga.com^", NULL }; const char *mcae41962[] = { "213.174.130.8/banners/", NULL }; const char *mcae4b1ca[] = { "sumome.com^", NULL }; const char *mcae4c09c[] = { "adult-adv.com^", NULL }; @@ -43809,6 +43901,7 @@ const char *mcaf133d [] = { "aprtx.com^", NULL }; const char *mcaf2df06[] = { "/pgrightsideads.", NULL }; const char *mcaf2ec2e[] = { "/lftracker.", NULL }; const char *mcaf37be1[] = { "roadrecord.co.uk/widget.js?", NULL }; +const char *mcaf3dd5 [] = { "qvsshkcr.com^", NULL }; const char *mcaf4b58b[] = { "simpleanalytics.io^", NULL }; const char *mcaf55d2e[] = { "195.10.245.55^", NULL }; const char *mcaf6690f[] = { "h-images.net^", NULL }; @@ -44774,6 +44867,7 @@ const char *mcf03e363[] = { "whdulnhnrscfqx.com^", NULL }; const char *mcf04a9ee[] = { "agwsneccrbda.com^", NULL }; const char *mcf05050c[] = { "/adunit/", NULL }; const char *mcf052814[] = { "ask.com/display.html?", NULL }; +const char *mcf085dc4[] = { "imasdk.googleapis.com/pal/sdkloader/pal.js", NULL }; const char *mcf08c4b2[] = { "usymycvrilyt.com^", NULL }; const char *mcf09a666[] = { "cloudfront.net/m/princess/ae.js", NULL }; const char *mcf0bd05d[] = { "adpay.com^", NULL }; @@ -45330,6 +45424,7 @@ const char *md165cefd[] = { "/linkinformer.js", NULL }; const char *md165eea5[] = { "vjjoarpmzb.bid^", NULL }; const char *md169bdc0[] = { "haklopar.com^", NULL }; const char *md16c2244[] = { "/images1/ad_", NULL }; +const char *md16cf0cc[] = { "checkmy.cam^", NULL }; const char *md16e7bc8[] = { "/ping.php?sid=", NULL }; const char *md16e908d[] = { "/beacon/ad/", NULL }; const char *md16ffccc[] = { "zxcrsyhkndzoc.com^", NULL }; @@ -45626,6 +45721,7 @@ const char *md29c7ca4[] = { "timeinc.net/", "/i/oba-compliance.png", NULL }; const char *md29cb7b0[] = { "whxhegjrqlddko.com^", NULL }; const char *md29d4d87[] = { "burbanked.info^", NULL }; const char *md29d59c1[] = { "rarbgproxy.org^", NULL }; +const char *md29d67d1[] = { "hxhxjcffzp.com^", NULL }; const char *md29e6552[] = { "trbas.com/jive/", NULL }; const char *md29e8d89[] = { "tracker.mattel.com/tracker.aspx?site=", NULL }; const char *md29f8fb3[] = { "interfacelift.com^", "^artistsvalley_160x90_", NULL }; @@ -45678,6 +45774,7 @@ const char *md2d9e4b0[] = { "alphasitebuilder.co.za/tracker/", NULL }; const char *md2da0d62[] = { "/tops.ads.", NULL }; const char *md2da55e0[] = { "ml.com/js/ml_dcs_tag_", NULL }; const char *md2db1e8c[] = { "2gok8g15p2.com^", NULL }; +const char *md2dbd3d4[] = { "pi.technik3d.com^", NULL }; const char *md2dc259b[] = { "chtic.net^", NULL }; const char *md2dc9920[] = { "/jsonad/", NULL }; const char *md2ddc752[] = { "/lib/ads.", NULL }; @@ -45938,6 +46035,7 @@ const char *md4065566[] = { "/advertorial_", NULL }; const char *md406dfe5[] = { "/ads_sprout_", NULL }; const char *md4072dd2[] = { "intgr.net^", NULL }; const char *md40775a4[] = { "/thunder/ad.", NULL }; +const char *md4078198[] = { "astpvgpwbewx.com^", NULL }; const char *md409216 [] = { "epnjahss.com^", NULL }; const char *md40a5653[] = { "/uds/stats?", NULL }; const char *md40e4625[] = { "/imp.php?", NULL }; @@ -46166,6 +46264,7 @@ const char *md502b997[] = { "wicktrown.co^", NULL }; const char *md504207e[] = { "-gpt-ad-", NULL }; const char *md5047bd0[] = { "partner.googleadservices.com/gpt/pubads_impl_", NULL }; const char *md504f82c[] = { "plista.com/jsmodule/flash", NULL }; +const char *md5068eb3[] = { "qdgpsfmg.com^", NULL }; const char *md506995c[] = { "mvvecbfomk.com^", NULL }; const char *md5096fcd[] = { "jayisgames.com/maxcdn_160x250.png", NULL }; const char *md509adf0[] = { "glanceguide.com^", NULL }; @@ -47277,6 +47376,7 @@ const char *md9bf6f73[] = { "/images/ad2/", NULL }; const char *md9bf9f87[] = { "8092686a39ac5.com^", NULL }; const char *md9c1f939[] = { "blog.tube8.com/wp-content/", NULL }; const char *md9c268d3[] = { "d1110e4.se^", NULL }; +const char *md9c49fdc[] = { "rettica.com^", NULL }; const char *md9c5b5de[] = { "ofrducrisy.com^", NULL }; const char *md9c7c360[] = { "qfedsccxccfzut.com^", NULL }; const char *md9c7d93f[] = { "/AIV-Ad-", NULL }; @@ -47719,6 +47819,7 @@ const char *mdbad97ce[] = { "adultporntubemovies.com/images/banners/", NULL }; const char *mdbae32df[] = { "imdb.com/twilight/?", NULL }; const char *mdbaf7a40[] = { "tpzukfqaqyxn.bid^", NULL }; const char *mdbb00a0b[] = { "/opentag-", NULL }; +const char *mdbb1d39b[] = { "iqagrsach.com^", NULL }; const char *mdbb26d2a[] = { "msrwoxdkffcl.com^", NULL }; const char *mdbb27ec1[] = { "lxpgdkskkt.com^", NULL }; const char *mdbb48cde[] = { "spotx.tv/directsdk/", NULL }; @@ -47739,6 +47840,7 @@ const char *mdbc32331[] = { "mqs.ioam.de^", NULL }; const char *mdbc3970b[] = { "/adsdfp/", NULL }; const char *mdbc44422[] = { "/qubit-integration2.", NULL }; const char *mdbc87e41[] = { "/cdn-cgi/pe/bag2?r", ".adglare.org", NULL }; +const char *mdbc8ddf0[] = { "hdpreview.com^", NULL }; const char *mdbcb9ea5[] = { "blacklistednews.com^", NULL }; const char *mdbcbdc8b[] = { "popcpm.com^", NULL }; const char *mdbd06cc6[] = { "pornoinside.com/efpop.js", NULL }; @@ -48484,6 +48586,7 @@ const char *mdec62609[] = { "obnyujeibv.com^", NULL }; const char *mdec76089[] = { "sdqspuyipbof.com^", NULL }; const char *mdec88fd5[] = { "nosteam.ro^", "^gamedvprop.js", NULL }; const char *mdec8b676[] = { "widgetadvertising.biz^", NULL }; +const char *mdeca8746[] = { "djagrjpaoek.com^", NULL }; const char *mdecac469[] = { "kompas.com/js_kompasads.php", NULL }; const char *mdecb0d40[] = { "phonebunch.com/images/flipkart_offers_alt.jpg", NULL }; const char *mdecf2306[] = { "unblocked.si^", NULL }; @@ -48754,6 +48857,7 @@ const char *mdffbf470[] = { "8dfaa2dc76855.com^", NULL }; const char *mdffc8c70[] = { "advertiseyourgame.com^", NULL }; const char *me0011ad9[] = { "/coinblind_beta.", NULL }; const char *me00131aa[] = { "tlkcokqtmbgixf.bid^", NULL }; +const char *me002099e[] = { "awejmp.com^", NULL }; const char *me00270a6[] = { "waybig.com/js/lic14.js", NULL }; const char *me00499c3[] = { "slatic.net/js/tracking.js", NULL }; const char *me0059b22[] = { "ssmklfrn.bid^", NULL }; @@ -49247,6 +49351,7 @@ const char *me1f7004d[] = { "drbwugautcgh.com^", NULL }; const char *me1f7bdf6[] = { "ebaystatic.com/aw/signin/ebay-signin-toyota-", NULL }; const char *me1f98810[] = { "wembbuue.com^", NULL }; const char *me1f9b20d[] = { "wunccmpzjqvxe.com^", NULL }; +const char *me1f9b8bd[] = { "aaddcount.com^", NULL }; const char *me1fd25d8[] = { "exashare.com/player_begin.jpg", NULL }; const char *me1fd6d94[] = { "sjnfgvjizo.bid^", NULL }; const char *me1ff170e[] = { "nqlkwyyzzgtn.com^", NULL }; @@ -50469,6 +50574,7 @@ const char *me76e6328[] = { "etoro.com/tradesmonitor/", NULL }; const char *me76eb8e5[] = { "zwjnzhln.bid^", NULL }; const char *me76f03ac[] = { "v12group.com^", NULL }; const char *me76fec4c[] = { "pptv.com/stg/add?", NULL }; +const char *me77042b9[] = { "odlkdyoe.com^", NULL }; const char *me7721908[] = { "datacollector.coin.scribol.com^", NULL }; const char *me772a0d2[] = { "yieldbot.com^", NULL }; const char *me7736c80[] = { "qfgcmddmwrrkmj.bid^", NULL }; @@ -50536,6 +50642,7 @@ const char *me7bfb80b[] = { "/responsive-ads.", NULL }; const char *me7bfd71a[] = { "static.adsnative.com/static/js/render.", ".js", NULL }; const char *me7c0120 [] = { "minero-proxy-", ".now.sh^", NULL }; const char *me7c0fd32[] = { "cross-system.com^", NULL }; +const char *me7c2ad75[] = { "xtccyvimdr.com^", NULL }; const char *me7c39183[] = { "lhjisbsegvxf.com^", NULL }; const char *me7c5296d[] = { "doubleclickbygoogle.com^", NULL }; const char *me7c5762e[] = { "greenoptimistic.com/images/electrician2.png", NULL }; @@ -51073,6 +51180,7 @@ const char *me9e0e20f[] = { "ibm.com/software/reports/compatibility/clarity-repo const char *me9e2ec0f[] = { "llnxfuxszevf.com^", NULL }; const char *me9e3b900[] = { "/qtracker-", NULL }; const char *me9e45e47[] = { "uclftpjqdnvvz.bid^", NULL }; +const char *me9e5484d[] = { "kumjidmumktzq.com^", NULL }; const char *me9e59fe9[] = { "/Javascripts/Cindy-", NULL }; const char *me9e66200[] = { "spottt.com^", NULL }; const char *me9e665da[] = { "travix.com/searchoptions?affiliate=", NULL }; @@ -51575,6 +51683,7 @@ const char *mec1b5394[] = { "sitebro.tw^", NULL }; const char *mec1e66fe[] = { "q8ux4fscc7.com^", NULL }; const char *mec201dce[] = { "?type=ad&", NULL }; const char *mec207e9e[] = { "rampanel.com^", NULL }; +const char *mec216e06[] = { "wwohikwhl.com^", NULL }; const char *mec23288b[] = { "thecorrsmisc.com/msb_banner.jpg", NULL }; const char *mec2386ef[] = { "?adcontext=", NULL }; const char *mec241a1f[] = { "/dart_ads/", NULL }; @@ -51720,6 +51829,7 @@ const char *mecb490f5[] = { "hentaistream.com/out/", NULL }; const char *mecb4be8b[] = { "/quidsi.ga.js?", NULL }; const char *mecb5ed64[] = { "ynlvwynnsstalh.com^", NULL }; const char *mecb610f7[] = { "d1ros97qkrwjf5.cloudfront.net^", NULL }; +const char *mecb791b4[] = { "coocopop.com^", NULL }; const char *mecb9f6c7[] = { "idbtfwllhogxc.com^", NULL }; const char *mecbab337[] = { "nbcudigitaladops.com/hosted/housepix.gif", NULL }; const char *mecbc37ca[] = { "/ad234.", NULL }; @@ -51740,6 +51850,7 @@ const char *mecce7f37[] = { "/ad?pos_", NULL }; const char *meccf230 [] = { "4fuckr.com^", "^adframe.js", NULL }; const char *meccf69ec[] = { "deal.maabm.com^", NULL }; const char *mecd1895c[] = { "bstatic.com^", NULL }; +const char *mecd212af[] = { "tsandycateup.com^", NULL }; const char *mecd2846f[] = { "tvguide.co.uk/images/skyskinus.", NULL }; const char *mecd703c0[] = { "otruzjgxof.com^", NULL }; const char *mecd76ec7[] = { "eastprodcdn.azureedge.net/bundles/", "velaro", NULL }; @@ -51991,6 +52102,7 @@ const char *meddc1b43[] = { "pnet.co.za/jobsearch_iframe_", NULL }; const char *meddc4a9f[] = { "o8q80l1z.top^", NULL }; const char *meddcf290[] = { "/embed/ads.", NULL }; const char *medde8967[] = { "/adserversolutions/", NULL }; +const char *meddf0208[] = { "audienzz.ch^", NULL }; const char *meddf5834[] = { "streamplay.to/player", "/jwplayer.html5.js", NULL }; const char *mede2998d[] = { "mmtro.com^", NULL }; const char *mede2fcf2[] = { "prenvifxzjuo.com^", NULL }; @@ -52105,6 +52217,7 @@ const char *mee43e6c0[] = { "freegeoip.net^", NULL }; const char *mee4461af[] = { "/adicon_", NULL }; const char *mee46f641[] = { "pcpro.co.uk^", "^pcprositeskin", NULL }; const char *mee47706d[] = { "gamecopyworld.eu/games/", NULL }; +const char *mee48169f[] = { "gjijrevdp.com^", NULL }; const char *mee4a0453[] = { "widget.wombo.gg^", NULL }; const char *mee4ac7a2[] = { "d34obr29voew8l.cloudfront.net^", NULL }; const char *mee4b4508[] = { "/adaptvadplayer.", NULL }; @@ -52272,6 +52385,7 @@ const char *mef103283[] = { "/google_lander2.js", NULL }; const char *mef1288e1[] = { "player.cdn.targetspot.com/ts_embed_functions_as3.php", NULL }; const char *mef13114f[] = { "/get_ad_", NULL }; const char *mef131a67[] = { "clickbigo.com^", NULL }; +const char *mef134a3e[] = { "4tube.com/", ".php?", NULL }; const char *mef137a15[] = { "vizury.com^", NULL }; const char *mef13ac2b[] = { "checkerdist.com/product-detail.cfm?", "advert_id=", NULL }; const char *mef148a81[] = { "boldchat.com^", NULL }; @@ -52290,6 +52404,7 @@ const char *mef1f396e[] = { "enoratraffic.com^", NULL }; const char *mef20e606[] = { "gtsads.com^", NULL }; const char *mef218a76[] = { "txbvzcyfyyoy.com^", NULL }; const char *mef21ce58[] = { "herold.at^", ".swf^", "^linktarget^_blank", NULL }; +const char *mef21df58[] = { "/counter/?", "&referer=", NULL }; const char *mef22f18e[] = { "/control/tracking.php?", NULL }; const char *mef239ab2[] = { "/ad_horiz.", NULL }; const char *mef271c3d[] = { "worqvccd.bid^", NULL }; @@ -52729,6 +52844,7 @@ const char *mf0fd6960[] = { "oggifinogi.com^", NULL }; const char *mf100bef0[] = { "equippers.com/absolutebm.aspx?", NULL }; const char *mf102510e[] = { "beacon.nuskin.com^", NULL }; const char *mf102d9a3[] = { "baptisttop1000.com^", NULL }; +const char *mf1036698[] = { "builder-assets.unbounce.com^", NULL }; const char *mf105794e[] = { "jpmcviivqg.bid^", NULL }; const char *mf105d68a[] = { "sitelinktrack.com^", NULL }; const char *mf106be47[] = { "/slidetopad.", NULL }; @@ -53396,6 +53512,7 @@ const char *mf3d841ea[] = { "ad.kissanime.io^", NULL }; const char *mf3dcf6dd[] = { "56sgtrx.com^", NULL }; const char *mf3de75af[] = { ".co/ads?", NULL }; const char *mf3e141b5[] = { "tracking.conversion-lab.it^", NULL }; +const char *mf3e21379[] = { "arjgnqlsdo.com^", NULL }; const char *mf3e2efe2[] = { "jshosting.faith", NULL }; const char *mf3e3085e[] = { "/google-ad?", NULL }; const char *mf3e343ef[] = { "usuarios-online.com^", NULL }; @@ -54037,6 +54154,7 @@ const char *mf69161e5[] = { "eloqua.com/visitor/v200/svrgp.aspx?", NULL }; const char *mf69259ed[] = { "la-la-sf.com^", NULL }; const char *mf692b735[] = { "660a755deb8829fe.com^", NULL }; const char *mf693934b[] = { "klhvqeajy.com^", NULL }; +const char *mf695c6db[] = { "aphookkensidah.pro^", NULL }; const char *mf6961133[] = { "cpm10.com^", NULL }; const char *mf69611a2[] = { "ctnet2.in^", NULL }; const char *mf696ff8e[] = { "/null.gif?", NULL }; @@ -54138,6 +54256,7 @@ const char *mf6f32a77[] = { "/v4/analytics.", NULL }; const char *mf6f47ec6[] = { "asecxggulyrf.com^", NULL }; const char *mf6f49f8f[] = { "/ad_wrapper.", NULL }; const char *mf6f4b4a2[] = { "the-group.net/aether/", NULL }; +const char *mf6f5d0ae[] = { "aycwvgrra.com^", NULL }; const char *mf6f6ad8d[] = { "meetic-partners.com^", NULL }; const char *mf6f80128[] = { "mbvmecdlwlts.com^", NULL }; const char *mf6fa2da5[] = { "stat.pravmir.ru^", NULL }; @@ -54385,6 +54504,7 @@ const char *mf8055ebf[] = { "r.orange.fr^", NULL }; const char *mf8059ea8[] = { "gwallet.com^", NULL }; const char *mf8070875[] = { "/iframe_ad_", NULL }; const char *mf807434f[] = { ".science^", NULL }; +const char *mf8074a97[] = { "banclip.com^", NULL }; const char *mf8094318[] = { "pep.ph/res/js/ads.", NULL }; const char *mf8099ea [] = { "data.marketgid.com^", NULL }; const char *mf809d3bf[] = { "avbnzstidjh.com^", NULL }; @@ -54923,6 +55043,7 @@ const char *mfa460388[] = { "wtk.db.com^", NULL }; const char *mfa461603[] = { "eac0823ca94e3c07.com^", NULL }; const char *mfa486a0 [] = { "doubleclick.net/pfadx/", ".NBCUNIVERSAL-CNBC/", NULL }; const char *mfa497e67[] = { "t.wayfair.com^", NULL }; +const char *mfa49dc30[] = { "/omniture-visitorapi.", NULL }; const char *mfa49fa85[] = { "bellatraffic.com^", NULL }; const char *mfa4aa22f[] = { "5.189.144.107^", NULL }; const char *mfa4b5e52[] = { "reddit.com^", "_sponsor.png^", NULL }; @@ -54958,6 +55079,7 @@ const char *mfa685fc9[] = { "/ga_measure.", NULL }; const char *mfa687f01[] = { "/js_ads/", NULL }; const char *mfa69004c[] = { "/adnet.", NULL }; const char *mfa6c14c0[] = { "conversionruler.com^", NULL }; +const char *mfa6cecd1[] = { "dynsrvazh.com^", NULL }; const char *mfa6da892[] = { "distillery.wistia.com^", NULL }; const char *mfa6e5818[] = { "goredi.com^", NULL }; const char *mfa702bee[] = { "nitrobahn.com.s3.amazonaws.com/theme/getclickybadge.gif", NULL }; @@ -54994,6 +55116,7 @@ const char *mfa8ec735[] = { "hodun.ru/files/promo/", NULL }; const char *mfa908fb3[] = { "_setAnalyticsFields&", NULL }; const char *mfa925da5[] = { "/phpads2/", NULL }; const char *mfa93f3fe[] = { "-ClickTale.", NULL }; +const char *mfa944b04[] = { "uchiytqiuir.com^", NULL }; const char *mfa94aca3[] = { "ixsogpaexhgzn.com^", NULL }; const char *mfa967fbe[] = { "xgogi.com^", NULL }; const char *mfa971c3f[] = { "rdrtrk.com^", NULL }; @@ -56316,6 +56439,7 @@ const char *d1615efed[] = { "vidoza.net", NULL }; const char *d163dcbef[] = { "foreverymom.com", NULL }; const char *d164b58be[] = { "fyi.tv", "history.com", "mylifetime.com", "speedtest.net", NULL }; const char *d168f5eba[] = { "100percentfedup.com", "addictinginfo.com", "allthingsvegas.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "boredomtherapy.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "classicalite.com", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "crossmap.com", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "fitnessconnoisseur.com", "foreverymom.com", "freedomforce.com", "freedomoutpost.com", "gamerant.com", "greatamericanrepublic.com", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "infowars.com", "intellectualconservative.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "libertyunyielding.com", "lidblog.com", "mentalflare.com", "minutemennews.com", "moneyversed.com", "musictimes.com", "myscienceacademy.org", "naturalblaze.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "opednews.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "shark-tank.com", "shedthoselbs.com", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "supercheats.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thehayride.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "urbantabloid.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "youthhealthmag.com", NULL }; +const char *d16e2721e[] = { "analdin.com", "fux.com", "heavy-r.com", "incesto69.com", "mypornstarbook.net", "porn555.com", "pornerbros.com", "porntube.com", "tubepornclassic.com", "txxx.com", "vidmo.org", "vpornvideos.com", NULL }; const char *d16f7b50a[] = { "airbnb.co.uk", "airbnb.com", NULL }; const char *d17007439[] = { "fullmatchesandshows.com", NULL }; const char *d17138c76[] = { "content.wargaming.net", NULL }; @@ -56414,6 +56538,7 @@ const char *d2191ffc2[] = { "nbcnews.com", NULL }; const char *d219e1445[] = { "offers.com", NULL }; const char *d21eddb66[] = { "apps.facebook.com", NULL }; const char *d21ee9276[] = { "spike.com", NULL }; +const char *d2227f2c7[] = { "sxyprn.com", "yourporn.sexy", NULL }; const char *d22d9ccad[] = { "ehow.com", NULL }; const char *d22e931f3[] = { "n-tvnow.de", "rtl-now.rtl.de", "rtl2now.rtl2.de", "rtlnitronow.de", "superrtlnow.de", "voxnow.de", NULL }; const char *d2334edbe[] = { "reference.com", "thesaurus.com", NULL }; @@ -56829,7 +56954,6 @@ const char *d561446ee[] = { "citi.com", "citibank.com", "enmasse.com", "login.sk const char *d561566d5[] = { "politico.com", NULL }; const char *d562a0da8[] = { "yify.is", "yts.am", NULL }; const char *d562b752b[] = { "100percentfedup.com", "addictinginfo.com", "allthingsvegas.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "boredomtherapy.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "classicalite.com", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "crossmap.com", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "fitnessconnoisseur.com", "foreverymom.com", "freedomforce.com", "freedomoutpost.com", "gamerant.com", "godfatherpolitics.com", "gosocial.co", "grammarist.com", "greatamericanrepublic.com", "gymflow100.com", "hallels.com", "hautereport.com", "headcramp.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "infowars.com", "intellectualconservative.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "knowledgedish.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "libertyunyielding.com", "lidblog.com", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "naturalblaze.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", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "shark-tank.com", "shedthoselbs.com", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "supercheats.com", "techconsumer.com", "techtimes.com", "thealternativedaily.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "universityherald.com", "urbantabloid.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "westernjournalism.com", "youthhealthmag.com", NULL }; -const char *d56e52b1f[] = { "analdin.com", "fux.com", "heavy-r.com", "incesto69.com", "mypornstarbook.net", "porn555.com", "tubepornclassic.com", "txxx.com", "vidmo.org", "vpornvideos.com", NULL }; const char *d56fb65a1[] = { "gserp.com", NULL }; const char *d57117c4f[] = { "entertainment.ie", NULL }; const char *d5712e8a8[] = { "boards.4chan.org", NULL }; @@ -57076,7 +57200,6 @@ const char *d77072f4f[] = { "investopedia.com", NULL }; const char *d77121a54[] = { "hdyayinmac1.com", NULL }; const char *d77341b0b[] = { "vice.com", NULL }; const char *d773a22ce[] = { "cdiscount.com", NULL }; -const char *d774318b3[] = { "j.gs", NULL }; const char *d777aed4b[] = { "zynga.com", NULL }; const char *d78348381[] = { "indiatimes.com", "m.tmz.com", "salon.com", "zap2it.com", NULL }; const char *d78453446[] = { "aetv.com", "fyi.tv", "history.com", "mylifetime.com", "speedtest.net", "tweaktown.com", NULL }; @@ -57172,6 +57295,7 @@ const char *d80151edf[] = { "comunicaciones.udd.cl", NULL }; const char *d803cabc4[] = { "murf.nl", "workhardclimbharder.nl", NULL }; const char *d8041f288[] = { "rackspace.co.uk", "rackspace.com.au", NULL }; const char *d8047e355[] = { "djs-jpn.ga", NULL }; +const char *d8056de23[] = { "avianca.com", "jackbox.tv", "newegg.com", NULL }; const char *d8091a331[] = { "digiday.com", NULL }; const char *d80a979b6[] = { "moviezone.cz", NULL }; const char *d80b5443a[] = { "deliverydeals.co.uk", NULL }; @@ -57355,6 +57479,7 @@ const char *d96c460fe[] = { "video.repubblica.it", NULL }; const char *d96e165a1[] = { "metal-hammer.de", "musikexpress.de", "rollingstone.de", NULL }; const char *d970a5ca0[] = { "rte.ie", NULL }; const char *d971844d [] = { "kongregate.com", NULL }; +const char *d97331c30[] = { "20min.ch", NULL }; const char *d97399318[] = { "thevideo.me", "thevideo.website", NULL }; const char *d9748b10e[] = { "novayagazeta.ru", NULL }; const char *d975ec216[] = { "video.foxbusiness.com", NULL }; @@ -57513,6 +57638,7 @@ const char *dabc97409[] = { "enjoydressup.com", NULL }; const char *dabd90dc8[] = { "stocporn.com", NULL }; const char *dac01fa0c[] = { "100percentfedup.com", "addictinginfo.com", "allthingsvegas.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bighealthreport.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "classicalite.com", "comicallyincorrect.com", "conservativebyte.com", "conservativetribune.com", "conservativevideos.com", "coviral.com", "craigjames.com", "crossmap.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "fitnessconnoisseur.com", "foreverymom.com", "freedomforce.com", "freedomoutpost.com", "godfatherpolitics.com", "gosocial.co", "grammarist.com", "greatamericanrepublic.com", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "infowars.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "libertyunyielding.com", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "naturalblaze.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "shark-tank.com", "shedthoselbs.com", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", NULL }; const char *dac8db917[] = { "123movies.com", "123unblock.info", "123unblock.xyz", "1337x.st", "1337x.to", "1movies.is", "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", "gomovieshub.is", "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", "mrunlock.pro", "newser.com", "nocensor.icu", "nocensor.pro", "nowwatchtvlive.ws", "onhax.me", "pirateiro.com", "postimg.cc", "prox4you.pw", "prox4you.xyz", "seedpeer.me", "sendit.cloud", "skidrowcrack.com", "solarmovie.one", "solarmoviez.ru", "swatchseries.to", "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.cx", "unblocked.llc", "unblocked.lol", "unblocked.pet", "unblocked.si", "unlockproject.icu", "unlockproject.live", "uptobox.com", "userscloud.com", "vcstream.to", "vidbull.tv", "watchcartoononline.io", "watchseries.sk", "watchsomuch.info", "x1337x.eu", "x1337x.se", "x1337x.ws", "yesmovies.to", "yify-movies.net", "yify.bz", "yifyddl.movie", "yifytorrent.co", "ymovies.tv", "yourbittorrent2.com", "yts.am", "zippyshare.com", NULL }; +const char *dac9887fd[] = { "davidstea.com", NULL }; const char *dac9dc7e4[] = { "comicbook.com", "multiup.org", NULL }; const char *daca89cbe[] = { "hardforum.com", NULL }; const char *dad65c43e[] = { "superfilm.pl", NULL }; @@ -57611,7 +57737,6 @@ const char *db7f66c5d[] = { "slashdot.org", NULL }; const char *db7f843c5[] = { "secureupload.eu", NULL }; const char *db80c70ff[] = { "cheaptickets.nl", "vayama.com", NULL }; const char *db81e93a1[] = { "cbc.ca", NULL }; -const char *db8795369[] = { "avianca.com", "jackbox.tv", "newegg.com", "bikstok.sonymusicshop.dk", NULL }; const char *db894ab29[] = { "lecho.be", NULL }; const char *db8e71f03[] = { "daltondailycitizen.com", NULL }; const char *db8f80a8 [] = { "arktv.ro", NULL }; @@ -57636,7 +57761,6 @@ const char *dba467c70[] = { "transfermarkt.de", NULL }; const char *dba47306f[] = { "blog.cloudflare.com", NULL }; const char *dba79b0e6[] = { "nmac.to", "xrussianteens.com", NULL }; const char *dbacf24d2[] = { "unblock.net", NULL }; -const char *dbb2631b6[] = { "www.nba.com", NULL }; const char *dbb415057[] = { "huffingtonpost.co.uk", NULL }; const char *dbb6deeb3[] = { "readersdigest.co.uk", NULL }; const char *dbb9e06b1[] = { "capertongillett.com", NULL }; @@ -58119,6 +58243,7 @@ const char *dfa2f7a26[] = { "uptobox.com", "uptostream.com", NULL }; const char *dfa2f890a[] = { "rollingout.com", "viralnova.com", NULL }; const char *dfa41a1aa[] = { "affinitylive.com", NULL }; const char *dfac8d9b3[] = { "epicindustrialautomation.com", NULL }; +const char *dfbb6b8c3[] = { "atea.fi", NULL }; const char *dfbbb7340[] = { "princetonbmw.com", NULL }; const char *dfbc90690[] = { "animerebel.com", NULL }; const char *dfbe96f49[] = { "theoutline.com", NULL }; @@ -59276,6 +59401,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m65b1d636, 0, NULL, NULL}, {m122d850c, 0, NULL, NULL}, {m6a78fe3d, 0, NULL, NULL}, + {mbbece13e, 0, NULL, NULL}, {m2839409e, 0, NULL, NULL}, {mb29327ad, 0, NULL, NULL}, {m228bc520, 0, NULL, NULL}, @@ -59556,6 +59682,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m66bc1766, 0, NULL, NULL}, {m62b9d283, 0, NULL, NULL}, {m7fda9d37, 0, NULL, NULL}, + {m8f807c53, 0, NULL, NULL}, {m5a27fac8, 0, NULL, NULL}, {m9203705a, 0, NULL, NULL}, {m9205aef1, 0, NULL, NULL}, @@ -65663,6 +65790,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m465afb9d, 0, NULL, NULL}, {m9e219d02, 0, NULL, NULL}, {m78e2a3a8, 0, NULL, NULL}, + {mbb13b3ea, 0, NULL, NULL}, {m52ac5a4a, 0, NULL, NULL}, {m3dd7955b, 0, NULL, NULL}, {mba446079, 0, NULL, NULL}, @@ -67374,6 +67502,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4175b1ef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcc16ec2d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m82d70e8a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {me1f9b8bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m747cd1f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc988ed7b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb1b206e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -68144,6 +68273,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma2ada59c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {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}, + {mf695c6db, 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}, @@ -69303,6 +69433,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8056d7a8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9958c2f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m151b5208, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mb874f933, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m49fd09e1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m72e21f5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md75488e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -69604,6 +69735,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc75e85a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {med536ebb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md9f2bc4c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m70698898, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfc64d6bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {macbd7841, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5a0b2492, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -70595,6 +70727,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1a96536, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9908973a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma60c865f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m93025bde, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma9c57568, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8eafa953, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8629bdb2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -71294,6 +71427,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc01ab553, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m20b77844, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mdd3e99b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m7548403b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4ef1bf21, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc3875494, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m21b7d50d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73590,6 +73724,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m956abb48, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m533d20d4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma03dd619, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m44801b53, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me9e887a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m47ecf048, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m169c95fb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73606,6 +73741,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1d63b27e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9cf268a8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma0e69a83, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mf3e21379, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9f3986cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m122ecab4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9bef0385, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73616,6 +73752,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb22c78c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc8697d9a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9d112812, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {md4078198, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me03aa004, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m889a83ca, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md164ea68, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73633,6 +73770,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m44a91a46, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3423f1e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md42f9357, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mf6f5d0ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m27dcb923, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md767719e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcf5bb3ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73645,6 +73783,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md699fee, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {meeac3b7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6db46d9d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mcae25b8f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma948f363, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma1e11adb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m722020a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73652,6 +73791,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m71ea9a08, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbedf61b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5252e4e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m4d3095f7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m46fe960f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me7a1a7d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb3454405, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73677,6 +73817,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4d52e6d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb7a95037, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m79dccda2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m9721b96d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8d372ed8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcfc416a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4b416969, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73701,6 +73842,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m33572bdc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md3720a73, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf115b968, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m9ca293eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9e92e8a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfa10d8dc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m744fafcf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73850,6 +73992,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m232b7612, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6a284c18, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc0e4c398, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mdeca8746, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m74de24ac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb8f973c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5157646, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73881,6 +74024,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8353cd52, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me687a731, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8b69ec6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m186487d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7a1e0202, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m65452241, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m76630d8f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73906,6 +74050,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m26d5fd56, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me724d58f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4d2ba61e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m9566ed50, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m825e1364, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md025809b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md7b2e0fb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -73967,6 +74112,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2919d30c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m136b959f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m38b7fca7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m8431183f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m3c870d6d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mca752e88, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m89d44493, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2cf7a381, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74096,6 +74243,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m106b1988, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1494e5e8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7b47a96d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mee48169f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m172472c7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4cc0b49b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfacbcce1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74146,6 +74294,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m499ac02e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m499ae550, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9927882, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m8a8b804b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1ca2dac7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb070e735, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7bb22379, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74185,6 +74334,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3e13041, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6416d8d3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf7933946, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mac6b88d2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m54dee1e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m99d3b503, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m946dac25, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74246,10 +74396,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me8651af8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6585e8af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8086ad87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {md29d67d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m45756494, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m86fb03a0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5395ea7c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m22fa12de, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m99b96633, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m90a591af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m74369f3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc9a67129, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74274,6 +74426,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md4a9a8fd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m99453b2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mdd12da8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m6ac53ee5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb13fc71, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1bb8cd39, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbf62f99a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74317,8 +74470,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb54f64fd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m26986205, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2f6c6d82, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m4997abeb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc02e59e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma33ce12a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mdbb1d39b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9764a249, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf4361827, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc8507bd3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74374,6 +74529,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb1df99ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4fa72807, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc0924061, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mbd1d517, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m49b3e83, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4449c763, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3c5c0802, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74388,10 +74544,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7074de5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m29ce0a41, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {med3f295, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m3d435c59, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m41f9c7b2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1a37bcad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m47b6cbe4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfe400c62, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m6b59e1f1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4d83c102, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m342b3bf7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma1de8f94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74421,6 +74579,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7797197c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m11b3ee45, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbad4f6bc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m4d2c826, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md69a405c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8364486d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1dd94011, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74465,6 +74624,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m7d7c7c0e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma323f44e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mdb02956b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m9c94fbf0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2904ea3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m555336aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m32716d97, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74498,6 +74658,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6150e1de, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m877ae728, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7e5872b8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {me9e5484d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3805c0a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md1d14fc8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5a719252, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74535,11 +74696,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6c1c30c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcf6d6622, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8a939705, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mc7f91b6a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me7c39183, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m93f90f1c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4786f3bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5e7c4441, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1a8eacd0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m5aee7033, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1e9c6ca4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m304ed92e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4f0494e4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74578,6 +74741,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mdecf5636, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma684ec6d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m80e0a99f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m3c5e18b6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m5b6f57ad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m12759b47, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {maeae73cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2c226d9b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74590,6 +74755,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mdb7d6724, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m94691c0d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m39459df2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m24d1bd53, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m35c2fd5f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7527c51, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m10b3da7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74764,6 +74930,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfecd4e02, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma8d296ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4840f4bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m6f72e606, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me2c9e12e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf4e81d0c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mde34afb9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74786,6 +74953,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6ffecf0e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2aa6075f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7b77cd99, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {me77042b9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7d66bc29, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf121cf49, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mce26c6db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74943,6 +75111,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m46bd9816, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9a92820b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m905a6521, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {md5068eb3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbcce37b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m42d6ada2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m570dcf9f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -74964,6 +75133,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md2fe4598, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7ac4d271, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me1260c6b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m95a1ed97, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m60b3848b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m82e835d9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m16a3fa11, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75017,6 +75187,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc280e255, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3cf3bf5c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m11d866d4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m633c93e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md2c9dea7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mef1c5b33, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9eb15a42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75025,6 +75196,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8330087b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4b334163, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb81a71e0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mcaf3dd5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcbd786fd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m843008, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2285518, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75032,6 +75204,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2493ed6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5295aa76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m91504d6d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m556dfe0f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m25e168bb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5172dfd4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m431a0d7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75150,9 +75323,11 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2fb0f41c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m488ff2cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7daf3ef9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m1efab32f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3ce49071, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md2f21fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma3230d9f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m62c70976, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m65845751, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf3ac3988, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6418a3aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75215,12 +75390,14 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2553ea41, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m56e22809, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me87bfa24, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m7fa42786, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6c393e85, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me3166c50, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf67f79c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfe25249a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me1bb2b9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf23b08e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m3e604ee9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me156bb6b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m835b7268, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2c1f3c0f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75236,6 +75413,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2199849e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2bc31074, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6208cbd0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m49f0ec79, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9cad98ba, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me690142, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m308766d7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75278,6 +75456,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6503bf4c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m880773e4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m479e2446, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mab9a7785, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcc6896e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m42d15bb9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5575232a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75317,6 +75496,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9e0911cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2e974e25, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbed6ea01, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mfa944b04, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5c244661, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m60b85777, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m15b63eb7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75341,6 +75521,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m73ad458d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mecc8c050, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2f1a71a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m223fbd8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m718038c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4fd2479b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mba099206, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75358,6 +75539,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m99e204ef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mefb63308, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mecc8c5e9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m92c49814, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m214c42ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me4906fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma9eba96a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75435,7 +75617,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me987241a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m81c62c04, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1c79e922, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m27a032cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m39b3af31, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mbafdbdb1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mebef4d77, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9b9addc8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb7e742b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75568,6 +75752,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf56622dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m31a17019, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3f5c64bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mec216e06, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma8426c8a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbf18e626, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8ae5a19a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75592,6 +75777,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m10587908, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma7c4ce76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5e85075a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m80703ea6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me86bbfa6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbc49bffe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m12e89191, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75619,10 +75805,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md48fc1a2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma94b4347, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md26e276d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m839b1d75, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf7405dd0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc1ed28b8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m60f521b5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m68443920, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m478a18e7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me5e7f029, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mac59dac1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb5ebd5da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75659,6 +75847,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6f3525b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5301cc79, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf3c4539a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {me7c2ad75, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6325da00, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9b7fe414, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9922b174, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75737,7 +75926,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m603c8676, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5002c8ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mecb5ed64, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {ma0635766, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m367f15a8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m54f27922, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf056086f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {meca2f083, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7fceea5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75823,6 +76014,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m97311088, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcbf1bab6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md63264cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m42aea3e8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me0158dae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8ad15061, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc42b2b7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -75846,6 +76038,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m66d80875, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md106684b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m677274ff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m8454697, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcb840074, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {maf4e5c39, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m349132dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -84071,6 +84264,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m30597c17, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma2d69809, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m78470e33, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m98d5738, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfe5c885e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m5615b749, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mdfd73e3f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -84606,6 +84800,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2e4a3555, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5a859961, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4cda6e39, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m2070a024, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma0a4b0d5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8f7ba2a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mefa3435e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -84845,6 +85040,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma38f283f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me7185ad1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf3b95796, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mb9e8ae69, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4e9e460a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2ad972fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mde5be5b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -84877,6 +85073,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {meb4f1592, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m66a93a76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfc21641b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m75a532e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7d59f1a7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7ad339c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc6da154d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -84965,6 +85162,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8fbb2079, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md3a35f66, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mee7f547, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mf8074a97, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m80eddc24, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m65cb11ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9bcf5970, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85010,6 +85208,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m31c631ae, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma0e98133, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2cdabb1b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m5e6ca2cd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mca98d7f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mdba42052, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m19eda02f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85111,6 +85310,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf8d803c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4e372603, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {meda5292e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m9b02e17a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9fb8e617, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbace788a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6f75f11d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85217,6 +85417,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8c232fde, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4c2a40e0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5d0d981b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mdbc8ddf0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m84956dc0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m85267bf8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m227bc382, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85314,6 +85515,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maab672f9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3b893c2c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1a856a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mb57941da, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfa387b2a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {meaeb819d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7c62a0e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85362,6 +85564,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me93e792, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8aa8574b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3ac0662a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m153ba2af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6235760, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m85355123, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb952555b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85524,6 +85727,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6e766377, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcd5c3bb9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mbecf97bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m58811f08, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m908eb5af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m65b90460, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m878f8b59, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85532,6 +85736,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc0381b97, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4e6cdb16, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma95c8d7f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {mb5a699c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc31e4e3d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3d1aaa92, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8290dc0b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85705,6 +85910,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me98e083, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc69347d5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mf88d56e1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m24f0d601, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m8163af24, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m46348a0d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m7c5e6381, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85868,13 +86074,17 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m59ab10a9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m33d2e680, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mf1bdc626, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m53a8e948, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {maee2e1a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m6533ef9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mef131a67, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m42f4efc1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mede8cc5b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {mecb791b4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m83cb2bf5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m8b06116f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mcd5013e1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m96ef5ae6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m78f31bad, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mdb8d168d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m815978f2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -85892,8 +86102,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me71ee06e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m85101cb7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mdfbfea31, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m19701e7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m85d512a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mbfd720e6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {ma1c69de3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {md9d0dd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m7d0c7b2b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mae7f7d8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -85902,16 +86114,20 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9ad79f44, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m4d2b2ef9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m53b82344, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m6564ec4d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m96833ff2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mc90607df, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m5c6e7821, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m866217bf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m84691712, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m999383c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mbfb82540, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m4f08a8b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m26b81839, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m6a7b9fd4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m8e83a0b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mf2aa8cd6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m5d057d66, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m58811f08, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mb5a699c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mcc27ca13, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -85926,18 +86142,23 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8d6f5584, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m63c5e39d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m327d3448, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {ma5d41a94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m19267e89, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m220f94a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {mbd3c5eb2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m8f7d1a05, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m69331d6f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {madba895f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m47f4990e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m78cb1520, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m258c9736, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {mecd212af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {ma16b6180, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m81f20642, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m43e4e27, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mc907e6b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m66a4b379, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m4ff41c7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {ma43cd214, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m9ca8d655, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mc4e83b28, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -85980,13 +86201,16 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfe586c1d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m461ac5c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3acbd09f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {me002099e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mac6b29a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m68e4e13f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m9b5f840d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m6a702124, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m2af6a890, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {md16cf0cc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m810ef91f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {md2dc259b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m8daa871, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1f3ad4c2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m6e71c106, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m53e8537b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -85999,6 +86223,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m59ed2846, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m54826743, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m6d55a8c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {mfa6cecd1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {ma596c232, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m86762966, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mfc068724, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -86015,6 +86240,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8d9e5a82, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m146072e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m2721d5c8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m8d084a36, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2066fc5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me9bad382, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2b825caa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -93510,6 +93736,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m236d4f14, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d38b293a6, NULL}, {m9a9d6683, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d5aacedfc, NULL}, {mc4a9ee1e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, da0187f1b, NULL}, + {mf1036698, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d28d2ea3d, NULL}, {mc0aaabaa, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, dn38407a13}, {m9632f084, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, df834abc1, NULL}, {m4c3a562a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, @@ -94057,6 +94284,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5c664759, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {md658b864, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m75c35f76, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {mef134a3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {me0549cd4, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m23a9fc89, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mbcea7331, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, @@ -94676,6 +94904,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2bee4ea1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m9f7607cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {m59af1fab, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {m4e2595d1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m75f72a8d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mcdd28ae0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {m4676259a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, @@ -94810,7 +95039,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9bb381d2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m25600309, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mad495a57, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {m5704370d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m8faae660, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m235ed92d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m65ccb21e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m3aca6182, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {mf9066892, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m1ac7ab90, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, @@ -94965,7 +95197,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcadd5f3d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {md04fb664, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mfae71728, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, - {m402d074, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d56e52b1f, NULL}, + {m402d074, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d16e2721e, NULL}, {me864fff0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m30ce16f3, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m4a6cbb25, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, @@ -95025,10 +95257,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mab565198, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mec43108e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dbc740880, NULL}, {m952b5f3d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8f976778, NULL}, - {m6e1bd52e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8f976778, NULL}, - {m81b0bbe1, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8f976778, NULL}, - {me48d15fb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8f976778, NULL}, - {m9d38a8d8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d8f976778, NULL}, + {m6e1bd52e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d2227f2c7, NULL}, + {m81b0bbe1, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d2227f2c7, NULL}, + {me48d15fb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d2227f2c7, NULL}, + {m9d38a8d8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d2227f2c7, NULL}, {m114cdfc5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_MATCH_END | ADBLOCK_FLAG_THIRD_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d677e6120, NULL}, {m43d36c1b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mb6a72f7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, @@ -97536,6 +97768,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1cc2a0da, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d57212938, NULL}, {mf1adc36b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {md4dab852, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, + {m22b53142, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d40e4be15, NULL}, {m6aa25df0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mf4afa600, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, df6636555, NULL}, {m3a16525, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d13dfc5e4, NULL}, @@ -98575,6 +98808,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m36c9c7e8, 0, NULL, NULL}, {m16327984, 0, NULL, NULL}, {maba02f28, 0, NULL, NULL}, + {m779b5ca, 0, NULL, NULL}, {m32b0c277, 0, NULL, NULL}, {m7bf5d148, 0, NULL, NULL}, {m807d9f3b, 0, NULL, NULL}, @@ -98846,6 +99080,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m87b2d283, 0, NULL, NULL}, {m96634c97, 0, NULL, NULL}, {ma59fa0b8, 0, NULL, NULL}, + {m2a754618, 0, NULL, NULL}, {m8aa1c31b, 0, NULL, NULL}, {m46f30a63, ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m96d08c60, 0, NULL, NULL}, @@ -99117,6 +99352,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mfb1838b5, 0, NULL, NULL}, {m76c81da8, 0, NULL, NULL}, {mc223919c, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, + {m39dc55e5, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {m15be9279, 0, NULL, NULL}, {m202f945c, 0, NULL, NULL}, {m284866ab, 0, NULL, NULL}, @@ -99694,6 +99930,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc5c7567e, 0, NULL, NULL}, {mef884cc4, 0, NULL, NULL}, {m3379fe9, 0, NULL, NULL}, + {ma29a4ed4, 0, NULL, NULL}, {m1c8e97d2, 0, NULL, NULL}, {m18914d1f, 0, NULL, NULL}, {mea81c75e, 0, NULL, NULL}, @@ -99783,6 +100020,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4e66d745, 0, NULL, NULL}, {med6d4494, 0, NULL, NULL}, {m387f82, 0, NULL, NULL}, + {mef21df58, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {m55fc84b8, 0, NULL, NULL}, {m22ef27c0, 0, NULL, NULL}, {med7efc38, 0, NULL, NULL}, @@ -101030,6 +101268,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m58663df0, 0, NULL, NULL}, {ma460de54, 0, NULL, NULL}, {m107556bd, 0, NULL, NULL}, + {m91ea7c63, 0, NULL, NULL}, {mde1294b2, 0, NULL, NULL}, {ma0b95b4b, 0, NULL, NULL}, {m22ab594, 0, NULL, NULL}, @@ -101103,6 +101342,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb7901a05, 0, NULL, NULL}, {mfc94fb2a, ADBLOCK_FLAG_MATCH_END, NULL, NULL}, {m60ecea09, 0, NULL, NULL}, + {m4b3b3c2, 0, NULL, NULL}, + {mfa49dc30, 0, NULL, NULL}, {m6ad46b8b, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {me7f6e697, ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m621c18f3, 0, NULL, NULL}, @@ -102427,6 +102668,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc0295e10, 0, NULL, NULL}, {md7f9445d, 0, NULL, NULL}, {m1a2dc659, 0, NULL, NULL}, + {m9becfcf, 0, NULL, NULL}, {m49abcdfd, 0, NULL, NULL}, {m22822648, 0, NULL, NULL}, {m891ded03, 0, NULL, NULL}, @@ -102561,6 +102803,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m257bd884, 0, NULL, NULL}, {mb19c22d3, 0, NULL, NULL}, {mcabe698e, 0, NULL, NULL}, + {m628587c5, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, {m414c8100, 0, NULL, NULL}, {mc9be03c2, 0, NULL, NULL}, {ma711ab8a, 0, NULL, NULL}, @@ -104644,6 +104887,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m99a0b7ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1c839d45, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2cccdef3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {m526c4cb2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mc14b73ab, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m112aeb07, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3b0a8113, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -104827,6 +105071,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m48d346df, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m9bf57148, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m1198dac0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {md9c49fdc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m5c35d10d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcdae3e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mcd9b08fe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -106127,6 +106372,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mef37d86d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m2add430f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me1d602e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, + {meddf0208, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {me50612c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {ma7e7e4d0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m19b7acaf, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, @@ -107171,6 +107417,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5367b242, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {md8a2372c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m40fa192b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, d57c1ddd8, NULL}, + {mb2550938, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m7cfa939f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m1612b8f2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mb5bf7c3e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -109876,7 +110123,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m170f50f1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mf361bde1, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mf5ab73ca, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, - {m51ef090d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mcac7363e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db3f8d4bb, NULL}, {m67495475, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m8a373c93, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, @@ -110298,6 +110544,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mdd4d3033, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mc7ebea92, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m259e4692, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m9f1694b7, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {me325f2b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m6a2a69f9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mdd9c9f01, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -111129,6 +111376,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m43d8b0b2, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {me0350eed, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m517177f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, + {m5755a3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m16c8bea, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m5c48e2bc, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m28d9b242, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, @@ -111480,6 +111728,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb4a357c0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m2a226a83, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m15dd927d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {m283db5aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mfd6468d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m53243903, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_NOT_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mb589cf94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -112664,6 +112913,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb5d63c78, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {md4196830, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m2c87be59, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {md2dbd3d4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {me6ea481b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mb0772a9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mcc185249, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -112829,6 +113079,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcf353dc2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m8f77e773, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m550d0875, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {mc6a98659, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m34efd53, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m36fa190, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m69b8743d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, @@ -113057,6 +113308,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m83a467f9, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mf317f8c3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m63276e14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, + {m8667f245, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {ma62600ef, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {mffcd03dc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {mf38abeb6, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, @@ -114317,6 +114569,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m94130eda, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m56a1b28a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, de2603e9f, NULL}, {mb2e7255b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, + {m287f450, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dfbb6b8c3, NULL}, {mb9c16407, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, d179b254c, NULL}, {mc8436406, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d67038a0b, NULL}, {m6529f77f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d67038a0b, NULL}, @@ -114449,17 +114702,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbc1b0a1d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL}, {m83cea89d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_BEGIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dc574c938, NULL}, {m1145f4b4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_HAS_WILDCARD, d8329c392, NULL}, - {m71b45952, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, db8795369, NULL}, + {m71b45952, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d8056de23, NULL}, {ma424ca78, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m722f036d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, db26b0b8c, NULL}, {m4499236b, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d60537d66, NULL}, - {mdb0ffea5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL}, - {mdb0ffea5, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d774318b3, NULL}, - {m3ddad6ce, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d386f6a42, NULL}, {md3287587, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d66a7bf89, NULL}, {m412183d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d66a7bf89, NULL}, {mc348848a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, - {m4d98c1d0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d6b2b2e54, NULL}, {mbf6958bb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d44fc9df9, NULL}, {m627aff30, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7207085d, NULL}, {mfd59f3e4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL}, @@ -114471,7 +114720,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m749f5140, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL}, {m1835a7c8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {mce2820b3, ADBLOCK_FLAG_EXCEPTION, NULL, NULL}, - {m76babb21, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dbb2631b6, NULL}, {m57177d02, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL}, {m7a560cc4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m3fd942ac, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_PING, NULL, NULL}, @@ -114986,7 +115234,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m73d860d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, dd7910bb4, NULL}, {ma41dd4d4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d3c732a31, NULL}, {ma9deb7d6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL}, - {m725a0dc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d87c52e6c, NULL}, {m58a2f1ae, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, df5200e26, NULL}, {mbe542178, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m44bf8b0e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d29b1ed0f, NULL}, @@ -114998,15 +115245,19 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma81c7012, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_IMAGE | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {m5d0f3e9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d5c822ca8, NULL}, {mb72e5a87, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, de1b7fcfd, NULL}, - {m33eb6dfd, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d28d2ea3d, NULL}, {m68bfd8df, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d47f8719d, NULL}, {mecd76ec7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, {mb7063375, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d9f8d694d, NULL}, {mf8b65efe, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL}, {mf58f3de0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d7c8f6f83, NULL}, {md45ab7d, ADBLOCK_FLAG_EXCEPTION, d32aba243, NULL}, + {m5df88df1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL}, + {m725a0dc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d87c52e6c, NULL}, {m5d0f3e9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d87c52e6c, NULL}, {mc9801017, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d350c25c9, NULL}, + {m1430399, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dac9887fd, NULL}, + {m74e4f3d1, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, NULL, NULL}, + {mcf085dc4, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_RESOURCE_TYPE_IN | ADBLOCK_FLAG_RT_STYLESHEET | ADBLOCK_FLAG_RT_SCRIPT | ADBLOCK_FLAG_RT_MEDIA | ADBLOCK_FLAG_RT_XHR | ADBLOCK_FLAG_RT_PING, d97331c30, NULL}, {mdeb91a55, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, {m4a8b1322, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR, dd5e8d49e, NULL}, {mbe90abbe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL}, diff --git a/build/patches/AV1-codec-support.patch b/build/patches/AV1-codec-support.patch index e75abf77..e35c9ec8 100644 --- a/build/patches/AV1-codec-support.patch +++ b/build/patches/AV1-codec-support.patch @@ -18,16 +18,14 @@ Report AV1 as playable on Android 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(-) + 15 files changed, 26 insertions(+), 15 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 -@@ -540,9 +540,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( +@@ -539,9 +539,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid( case THEORA: return false; @@ -45,7 +43,7 @@ diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc 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) { +@@ -74,7 +74,7 @@ if (enable_libaom_decoder) { sources = aom_dsp_common_asm_sse2 sources += aom_dsp_common_asm_ssse3 sources += aom_ports_asm_x86 @@ -54,7 +52,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn include_dirs = libaom_include_dirs } -@@ -158,7 +158,7 @@ if (enable_av1_decoder) { +@@ -158,7 +158,7 @@ if (enable_libaom_decoder) { configs += [ "//build/config/compiler:no_chromium_code" ] if (current_cpu == "arm") { configs -= [ "//build/config/compiler:compiler_arm_fpu" ] @@ -62,8 +60,8 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn + cflags = [ "-mfpu=neon", "-fPIC" ] } configs += [ ":libaom_config" ] - sources = aom_av1_common_intrin_neon -@@ -198,6 +198,8 @@ if (enable_av1_decoder) { + +@@ -203,6 +203,8 @@ if (enable_libaom_decoder) { if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") { deps += [ ":libaom_intrinsics_neon" ] @@ -75,7 +73,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn 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 -@@ -483,6 +483,11 @@ aom_mem_sources = [ +@@ -488,6 +488,11 @@ aom_mem_sources = [ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ] @@ -97,8 +95,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -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 + CONFIG_SHARED equ 0 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 @@ -109,8 +107,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a -#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 + #define CONFIG_SHARED 0 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 @@ -121,8 +119,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a -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 + CONFIG_SHARED 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 @@ -133,8 +131,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h -#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 + #define CONFIG_SHARED 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 @@ -145,8 +143,8 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/ -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 + CONFIG_SHARED 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 @@ -157,8 +155,8 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th -#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 + #define CONFIG_SHARED 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 @@ -169,8 +167,8 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm -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 + CONFIG_SHARED 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 @@ -181,8 +179,8 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/ -#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 + #define CONFIG_SHARED 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 @@ -193,8 +191,8 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as -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 + CONFIG_SHARED equ 0 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 @@ -205,32 +203,8 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h -#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 + #define CONFIG_SHARED 0 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 @@ -241,8 +215,8 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/ -%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 + %define CONFIG_SHARED 0 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 @@ -253,8 +227,8 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th -#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 + #define CONFIG_SHARED 0 -- 2.11.0 diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index cf3f0766..3e3ddfed 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -17,8 +17,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se // Increment this if you change the data in ways that mean users with // existing data should get a new version. Otherwise, existing data may // continue to be used and updates made here will not always appear. -- "kCurrentDataVersion": 111 -+ "kCurrentDataVersion": 112 +- "kCurrentDataVersion": 112 ++ "kCurrentDataVersion": 113 }, // The following engines are included in country lists and are added to the diff --git a/build/patches/Add-Qwant-search-engine.patch b/build/patches/Add-Qwant-search-engine.patch index 8fc9130a..c13d6c8d 100644 --- a/build/patches/Add-Qwant-search-engine.patch +++ b/build/patches/Add-Qwant-search-engine.patch @@ -16,8 +16,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se // Increment this if you change the data in ways that mean users with // existing data should get a new version. Otherwise, existing data may // continue to be used and updates made here will not always appear. -- "kCurrentDataVersion": 112 -+ "kCurrentDataVersion": 113 +- "kCurrentDataVersion": 113 ++ "kCurrentDataVersion": 114 }, // The following engines are included in country lists and are added to the diff --git a/build/patches/Add-StartPage-search-engine.patch b/build/patches/Add-StartPage-search-engine.patch index 2bdd7bbf..fef9137e 100644 --- a/build/patches/Add-StartPage-search-engine.patch +++ b/build/patches/Add-StartPage-search-engine.patch @@ -15,8 +15,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se // Increment this if you change the data in ways that mean users with // existing data should get a new version. Otherwise, existing data may // continue to be used and updates made here will not always appear. -- "kCurrentDataVersion": 110 -+ "kCurrentDataVersion": 111 +- "kCurrentDataVersion": 111 ++ "kCurrentDataVersion": 112 }, // The following engines are included in country lists and are added to the 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 6413dc18..b0e2dff9 100644 --- a/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch +++ b/build/patches/Add-a-flag-for-DNS-over-HTTPS.patch @@ -10,7 +10,7 @@ Do not fallback to UDP when using DoH See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt --- - chrome/browser/about_flags.cc | 14 +++++++++++ + chrome/browser/about_flags.cc | 11 +++++++++ chrome/browser/flag_descriptions.cc | 3 +++ chrome/browser/flag_descriptions.h | 3 +++ .../browser/net/system_network_context_manager.cc | 17 +++++++------ @@ -18,14 +18,14 @@ See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt .../common/network_features.h | 5 +++- .../common/network_switch_list.h | 4 ++++ net/base/load_flags_list.h | 6 +++++ - net/dns/dns_transaction.cc | 28 +++------------------- + net/dns/dns_transaction.cc | 27 +++------------------ net/url_request/url_request_http_job.cc | 28 +++++++++++++--------- - 10 files changed, 67 insertions(+), 48 deletions(-) + 10 files changed, 64 insertions(+), 47 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -423,6 +423,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = { +@@ -398,6 +398,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = { base::size(kCCTModuleCache_ThirtyMinutes), nullptr}, }; @@ -39,24 +39,21 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc + #endif // OS_ANDROID - const FeatureEntry::Choice kMHTMLGeneratorOptionChoices[] = { -@@ -3433,6 +3441,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kAsyncDns)}, - #endif // defined(OS_ANDROID) - -+#if defined(OS_ANDROID) + const FeatureEntry::Choice kEnableGpuRasterizationChoices[] = { +@@ -3400,6 +3408,9 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kTabSwitcherOnReturn, + kTabSwitcherOnReturnVariations, + "TabSwitcherOnReturn")}, + {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName, + flag_descriptions::kDnsOverHttpsDescription, kOsAndroid, + MULTI_VALUE_TYPE(kDnsOverHttpsChoices)}, -+#endif // defined(OS_ANDROID) -+ - {"enable-overflow-icons-for-media-controls", - flag_descriptions::kOverflowIconsForMediaControlsName, - flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll, + #endif + + {"enable-built-in-module-all", flag_descriptions::kBuiltInModuleAllName, 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 -@@ -2292,6 +2292,9 @@ const char kAutoFetchOnNetErrorPageDescription[] = +@@ -2209,6 +2209,9 @@ const char kAutoFetchOnNetErrorPageDescription[] = "When enabled, and navigation fails with an offline error, schedule a " "fetch of the page when online again."; @@ -69,7 +66,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 -@@ -1362,6 +1362,9 @@ extern const char kAsyncDnsDescription[]; +@@ -1306,6 +1306,9 @@ extern const char kAsyncDnsDescription[]; extern const char kAutoFetchOnNetErrorPageName[]; extern const char kAutoFetchOnNetErrorPageDescription[]; @@ -82,7 +79,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 -@@ -24,6 +24,7 @@ +@@ -25,6 +25,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" @@ -90,7 +87,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" -@@ -121,6 +122,7 @@ void GetStubResolverConfig( +@@ -122,6 +123,7 @@ void GetStubResolverConfig( if (!net::dns_util::IsValidDoHTemplate( doh_server_list[i].GetString(), doh_server_method_list[i].GetString())) { @@ -98,7 +95,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows continue; } -@@ -395,15 +397,12 @@ SystemNetworkContextManager::SystemNetworkContextManager( +@@ -401,15 +403,12 @@ SystemNetworkContextManager::SystemNetworkContextManager( base::Value(ShouldEnableAsyncDns())); base::ListValue default_doh_servers; base::ListValue default_doh_server_methods; @@ -183,11 +180,10 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -352,30 +352,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { - - HttpRequestHeaders extra_request_headers; +@@ -358,29 +358,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType); -- + + DCHECK(url_request_context); - request_ = url_request_context->CreateRequest( - url, request_priority_, this, - net::DefineNetworkTrafficAnnotation("dns_over_https", R"( @@ -215,7 +211,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc net_log_ = request_->net_log(); if (use_post) { -@@ -391,6 +368,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -396,6 +374,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { request_->SetExtraRequestHeaders(extra_request_headers); request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE | @@ -223,7 +219,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc LOAD_BYPASS_PROXY); request_->set_allow_credentials(false); } -@@ -807,7 +785,7 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -815,7 +794,7 @@ class DnsTransactionImpl : public DnsTransaction, had_tcp_attempt_(false), doh_attempt_(false), first_server_index_(0), @@ -235,7 +231,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 -@@ -423,17 +423,21 @@ void URLRequestHttpJob::Start() { +@@ -425,17 +425,21 @@ void URLRequestHttpJob::Start() { // plugin could set a referrer although sending the referrer is inhibited. request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer); @@ -263,7 +259,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); AddCookieHeaderAndStart(); -@@ -652,10 +656,12 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -659,10 +663,12 @@ void URLRequestHttpJob::AddExtraHeaders() { } else { // Advertise "br" encoding only if transferred data is opaque to proxy. bool advertise_brotli = false; @@ -280,7 +276,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } } -@@ -673,7 +679,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -680,7 +686,7 @@ void URLRequestHttpJob::AddExtraHeaders() { } } diff --git a/build/patches/Add-a-proxy-configuration-page.patch b/build/patches/Add-a-proxy-configuration-page.patch index caa76d06..579f0d3d 100644 --- a/build/patches/Add-a-proxy-configuration-page.patch +++ b/build/patches/Add-a-proxy-configuration-page.patch @@ -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 -@@ -237,6 +237,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() { +@@ -236,6 +236,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 -@@ -209,6 +209,8 @@ +@@ -213,6 +213,8 @@ @@ -90,7 +90,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc -@@ -158,7 +158,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { +@@ -161,7 +161,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() { SetValue( proxy_config::prefs::kProxy, std::make_unique(ProxyConfigDictionary::CreateFixedServers( @@ -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 -@@ -266,6 +266,8 @@ jumbo_split_static_library("ui") { +@@ -271,6 +271,8 @@ jumbo_split_static_library("ui") { "webui/metrics_handler.h", "webui/net_export_ui.cc", "webui/net_export_ui.h", @@ -521,14 +521,14 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -51,6 +51,7 @@ - #include "chrome/browser/ui/webui/policy_tool_ui.h" + #include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h" #include "chrome/browser/ui/webui/policy_ui.h" #include "chrome/browser/ui/webui/predictors/predictors_ui.h" +#include "chrome/browser/ui/webui/proxy_config_ui.h" #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" -@@ -378,6 +379,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, +@@ -386,6 +387,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui, return &NewWebUI; if (url.host_piece() == chrome::kChromeUINetExportHost) 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 -@@ -182,6 +182,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] = +@@ -177,6 +177,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 -@@ -351,6 +353,7 @@ const char* const kChromeHostURLs[] = { +@@ -354,6 +356,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, -@@ -385,6 +388,7 @@ const char* const kChromeHostURLs[] = { +@@ -388,6 +391,7 @@ const char* const kChromeHostURLs[] = { #if !defined(OS_ANDROID) #if !defined(OS_CHROMEOS) kChromeUIAppLauncherPageHost, @@ -1010,7 +1010,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h -@@ -103,6 +103,8 @@ extern const char kChromeUIMemoryInternalsHost[]; +@@ -102,6 +102,8 @@ extern const char kChromeUIMemoryInternalsHost[]; extern const char kChromeUINTPTilesInternalsHost[]; extern const char kChromeUINaClHost[]; extern const char kChromeUINetExportHost[]; @@ -1022,12 +1022,12 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc --- a/components/policy/core/browser/proxy_policy_handler.cc +++ b/components/policy/core/browser/proxy_policy_handler.cc -@@ -203,7 +203,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, +@@ -199,7 +199,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies, + bypass_list->GetAsString(&bypass_list_string); prefs->SetValue(proxy_config::prefs::kProxy, - std::make_unique( - ProxyConfigDictionary::CreateFixedServers( -- proxy_server, bypass_list_string))); -+ proxy_server, bypass_list_string, false))); + ProxyConfigDictionary::CreateFixedServers( +- proxy_server, bypass_list_string)); ++ proxy_server, bypass_list_string, false)); } break; } diff --git a/build/patches/Add-an-always-incognito-mode.patch b/build/patches/Add-an-always-incognito-mode.patch index 89189864..84ce6441 100644 --- a/build/patches/Add-an-always-incognito-mode.patch +++ b/build/patches/Add-an-always-incognito-mode.patch @@ -19,7 +19,7 @@ clicked links to launch as incognito. 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 -@@ -40,6 +40,11 @@ +@@ -39,6 +39,11 @@ android:key="usage_and_crash_reports" android:title="@string/usage_and_crash_reports_title_legacy" android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment" /> @@ -112,7 +112,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 -@@ -261,6 +261,7 @@ public abstract class ChromeActivity +@@ -260,6 +260,7 @@ public abstract class ChromeActivity private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener; // Observes when sync becomes ready to create the mContextReporter. @@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener; @Nullable -@@ -1728,6 +1729,9 @@ public abstract class ChromeActivity +@@ -1731,6 +1732,9 @@ public abstract class ChromeActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -151,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu private AppMenu mAppMenu; private AppMenuDragHelper mAppMenuDragHelper; private Menu mMenu; -@@ -167,6 +171,14 @@ public class AppMenuHandler { +@@ -182,6 +186,14 @@ public class AppMenuHandler { if (mDelegate.shouldShowHeader(appRect.height())) { headerResourceId = mDelegate.getHeaderResourceId(); } @@ -164,8 +164,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + } + mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y, - footerResourceId, headerResourceId, mHighlightMenuId, showFromBottom); - mAppMenuDragHelper.onShow(startDragging); + footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight, + showFromBottom); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -216,12 +216,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome @@ -16,6 +18,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; import org.chromium.chrome.browser.tab.Tab; - import org.chromium.chrome.browser.tab.TabDelegateFactory; + import org.chromium.chrome.browser.tab.TabBuilder; +import org.chromium.chrome.browser.tab.TabObserver; + import org.chromium.chrome.browser.tab.TabDelegateFactory; + import org.chromium.chrome.browser.tab.TabParentIntent; import org.chromium.chrome.browser.tab.TabRedirectHandler; - import org.chromium.chrome.browser.tab.TabState; - import org.chromium.chrome.browser.util.IntentUtils; -@@ -33,6 +36,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -35,6 +38,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { private final ChromeActivity mActivity; private final boolean mIncognito; @@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome private WindowAndroid mNativeWindow; private TabModel mTabModel; -@@ -44,6 +48,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -46,6 +50,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { mActivity = activity; mNativeWindow = nativeWindow; mIncognito = incognito; @@ -241,7 +241,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome } @Override -@@ -154,6 +163,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -170,6 +179,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { tab.getWebContents()); } @@ -252,9 +252,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type); return tab; } finally { -@@ -178,6 +191,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { - Tab tab = Tab.createLiveTab( - Tab.INVALID_TAB_ID, mIncognito, mNativeWindow, type, parentId, !openInForeground); +@@ -198,6 +211,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { + .setLaunchType(type) + .build(); tab.initialize(webContents, mTabContentManager, delegateFactory, !openInForeground, false); + + if (mExtraLogic != null) { @@ -264,7 +264,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome mTabModel.addTab(tab, position, type); return true; } -@@ -220,7 +238,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -240,7 +258,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { */ public Tab launchUrlFromExternalApp(String url, String referer, String headers, String appId, boolean forceNewTab, Intent intent, long intentTimestamp) { @@ -272,7 +272,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName()); // If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is -@@ -280,6 +297,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { +@@ -304,6 +321,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator { tab.initialize( null, mTabContentManager, createDefaultTabDelegateFactory(), !selectTab, false); assert state.isIncognito() == mIncognito; @@ -287,7 +287,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 -@@ -685,6 +685,12 @@ CHAR-LIMIT guidelines: +@@ -722,6 +722,12 @@ CHAR-LIMIT guidelines: Sends some system information and page content to Google diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 079960ab..5f100808 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -46,21 +46,21 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/ +++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml @@ -22,6 +22,20 @@ app:showAsAction="ifRoom" - app:iconTint="@color/dark_mode_tint" /> + app:iconTint="@color/standard_mode_tint" /> ++ app:iconTint="@color/standard_mode_tint" /> + ++ app:iconTint="@color/standard_mode_tint" /> + > createPairsList(int[] left, int[] right) { List> pairList = new ArrayList>(); for (int i = 0; i < left.length; i++) { -@@ -906,6 +950,8 @@ public class BookmarkBridge { +@@ -905,6 +949,8 @@ public class BookmarkBridge { boolean getFolders, boolean getBookmarks, List bookmarksList); private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type, int index); @@ -336,7 +336,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: +@@ -233,6 +233,12 @@ CHAR-LIMIT guidelines: Search @@ -363,7 +363,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", -@@ -2665,8 +2669,6 @@ jumbo_split_static_library("browser") { +@@ -2769,8 +2773,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", @@ -372,7 +372,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", -@@ -2755,8 +2757,6 @@ jumbo_split_static_library("browser") { +@@ -2859,8 +2861,6 @@ jumbo_split_static_library("browser") { "importer/importer_uma.h", "importer/in_process_importer_bridge.cc", "importer/in_process_importer_bridge.h", @@ -384,13 +384,14 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc --- a/chrome/browser/android/bookmarks/bookmark_bridge.cc +++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc -@@ -9,18 +9,29 @@ +@@ -9,19 +9,30 @@ #include +#include "base/android/content_uri_utils.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" + #include "base/bind.h" +#include "base/android/path_utils.h" #include "base/containers/stack.h" #include "base/containers/stack_container.h" @@ -414,7 +415,7 @@ 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,10 +41,13 @@ +@@ -31,10 +42,13 @@ #include "components/bookmarks/managed/managed_bookmark_service.h" #include "components/prefs/pref_service.h" #include "components/query_parser/query_parser.h" @@ -428,7 +429,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse #include "services/identity/public/cpp/identity_manager.h" using base::android::AttachCurrentThread; -@@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode; +@@ -54,6 +68,57 @@ using bookmarks::BookmarkPermanentNode; using bookmarks::BookmarkType; using content::BrowserThread; @@ -486,7 +487,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse namespace { class BookmarkTitleComparer { -@@ -129,6 +194,10 @@ BookmarkBridge::~BookmarkBridge() { +@@ -130,6 +195,10 @@ BookmarkBridge::~BookmarkBridge() { bookmark_model_->RemoveObserver(this); if (partner_bookmarks_shim_) partner_bookmarks_shim_->RemoveObserver(this); @@ -497,7 +498,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse } void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef&) { -@@ -474,6 +543,152 @@ jint BookmarkBridge::GetTotalBookmarkCount( +@@ -475,6 +544,152 @@ jint BookmarkBridge::GetTotalBookmarkCount( return count; } @@ -517,7 +518,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse + //NOTE: extension and description are not used on Android, thus not set + ui::SelectFileDialog::FileTypeInfo file_type_info; + -+ static const std::vector v_accept_types = { base::UTF8ToUTF16("text/html") }; ++ const std::vector v_accept_types = { base::UTF8ToUTF16("text/html") }; + + // Android needs the original MIME types and an additional capture value. + std::pair, bool> accept_types = @@ -775,7 +776,7 @@ diff --git a/chrome/browser/importer/profile_writer.h 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 -@@ -440,6 +440,9 @@ static_library("common") { +@@ -438,6 +438,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -788,7 +789,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -61,8 +61,6 @@ static_library("utility") { +@@ -60,8 +60,6 @@ static_library("utility") { if (!is_android) { sources += [ @@ -797,7 +798,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn "importer/bookmarks_file_importer.cc", "importer/bookmarks_file_importer.h", "importer/edge_database_reader_win.cc", -@@ -173,6 +171,11 @@ static_library("utility") { +@@ -170,6 +168,11 @@ static_library("utility") { } } @@ -918,7 +919,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java -@@ -32,6 +32,7 @@ import org.chromium.base.task.AsyncTask; +@@ -34,6 +34,7 @@ import org.chromium.base.task.TaskTraits; import org.chromium.ui.ContactsPickerListener; import org.chromium.ui.PhotoPickerListener; import org.chromium.ui.R; @@ -926,7 +927,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui import org.chromium.ui.UiUtils; import java.io.File; -@@ -52,6 +53,7 @@ public class SelectFileDialog +@@ -54,6 +55,7 @@ public class SelectFileDialog private static final String IMAGE_TYPE = "image/"; private static final String VIDEO_TYPE = "video/"; private static final String AUDIO_TYPE = "audio/"; @@ -934,7 +935,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*"; private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*"; private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*"; -@@ -130,6 +132,11 @@ public class SelectFileDialog +@@ -132,6 +134,11 @@ public class SelectFileDialog mFileTypes = fileTypes; } @@ -946,16 +947,16 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui /** * Creates and starts an intent based on the passed fileTypes and capture value. * @param fileTypes MIME types requested (i.e. "image/*") -@@ -159,7 +166,7 @@ public class SelectFileDialog +@@ -161,7 +168,7 @@ public class SelectFileDialog if (!window.hasPermission(Manifest.permission.READ_CONTACTS)) { missingPermissions.add(Manifest.permission.READ_CONTACTS); } - } else if (shouldUsePhotoPicker()) { + } else if (shouldUsePhotoPicker() || shouldShowHtmlTypes()) { - if (!window.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) { - missingPermissions.add(Manifest.permission.READ_EXTERNAL_STORAGE); - } -@@ -326,9 +333,7 @@ public class SelectFileDialog + if (BuildInfo.isAtLeastQ()) { + String newImagePermission = "android.permission.READ_MEDIA_IMAGES"; + if (!window.hasPermission(newImagePermission)) { +@@ -333,9 +340,7 @@ public class SelectFileDialog * 3.) There is a valid Android Activity associated with the file request. */ private boolean shouldUseContactsPicker() { @@ -966,7 +967,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui } /** -@@ -349,6 +354,7 @@ public class SelectFileDialog +@@ -356,6 +361,7 @@ public class SelectFileDialog } if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType); } @@ -974,7 +975,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui return mimeTypes; } -@@ -652,6 +658,10 @@ public class SelectFileDialog +@@ -646,6 +652,10 @@ public class SelectFileDialog return countAcceptTypesFor(specificType) > 0; } diff --git a/build/patches/Add-custom-tab-intents-privacy-option.patch b/build/patches/Add-custom-tab-intents-privacy-option.patch index 30906324..a5def066 100644 --- a/build/patches/Add-custom-tab-intents-privacy-option.patch +++ b/build/patches/Add-custom-tab-intents-privacy-option.patch @@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res 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 -@@ -48,6 +48,11 @@ +@@ -47,6 +47,11 @@ android:title="@string/clear_browsing_data_title" android:summary="@string/clear_browsing_data_summary" android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" /> @@ -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; -@@ -275,6 +276,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega +@@ -271,6 +272,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega */ public static boolean isCustomTabIntent(Intent intent) { if (intent == null) return false; @@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis 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 -@@ -39,6 +39,7 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -40,6 +40,7 @@ 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"; @@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 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"; -@@ -104,6 +105,11 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -117,6 +118,11 @@ public class PrivacyPreferences extends PreferenceFragment navigationErrorPref.setOnPreferenceChangeListener(this); navigationErrorPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri ChromeBaseCheckBoxPreference searchSuggestionsPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS); searchSuggestionsPref.setOnPreferenceChangeListener(this); -@@ -135,6 +141,10 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -139,6 +145,10 @@ public class PrivacyPreferences extends PreferenceFragment recordNetworkPredictionEnablingUMA((boolean) newValue); } else if (PREF_NAVIGATION_ERROR.equals(key)) { PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue); @@ -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 -@@ -4012,6 +4012,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from +@@ -4004,6 +4004,13 @@ To change this setting, <resetlink>reset sync

diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch index 01d94855..b8ca87ac 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 -@@ -2138,6 +2138,8 @@ public abstract class ChromeActivity +@@ -2150,6 +2150,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 -@@ -3054,6 +3054,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 69d9ed63..ec0c437d 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 -@@ -809,6 +809,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -740,6 +740,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -30,22 +30,22 @@ 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 == -@@ -2357,6 +2362,9 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kMaterialDesignIncognitoNTPName, - flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid, - FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)}, +@@ -2292,6 +2297,9 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kWebrtcH264WithOpenh264FfmpegDescription, kOsDesktop, + FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)}, + #endif // BUILDFLAG(RTC_USE_H264) && BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) + {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName, + flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll, + MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)}, - {"safe-search-url-reporting", - flag_descriptions::kSafeSearchUrlReportingName, - flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll, + #if defined(OS_ANDROID) + {"offlining-recent-pages", flag_descriptions::kOffliningRecentPagesName, + flag_descriptions::kOffliningRecentPagesDescription, kOsAndroid, 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 -@@ -1264,6 +1264,10 @@ const char kMaterialDesignIncognitoNTPDescription[] = - "If enabled, the Incognito New Tab page uses the new material design with " - "a better readable text."; +@@ -1245,6 +1245,10 @@ const char kLookalikeUrlNavigationSuggestionsDescription[] = + const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure"; + const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages"; +const char kMaxConnectionsPerHostName[] = "Maximum connections per host"; +const char kMaxConnectionsPerHostDescription[] = @@ -57,9 +57,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -766,6 +766,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; - extern const char kMaterialDesignIncognitoNTPName[]; - extern const char kMaterialDesignIncognitoNTPDescription[]; +@@ -748,6 +748,9 @@ extern const char kMarkHttpAsWarning[]; + extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[]; + extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; +extern const char kMaxConnectionsPerHostName[]; +extern const char kMaxConnectionsPerHostDescription[]; @@ -111,7 +111,7 @@ diff --git a/components/network_session_configurator/common/network_switch_list. diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc --- a/net/socket/client_socket_pool_manager.cc +++ b/net/socket/client_socket_pool_manager.cc -@@ -23,6 +23,10 @@ +@@ -22,6 +22,10 @@ #include "net/socket/transport_client_socket_pool.h" #include "net/socket/transport_connect_job.h" #include "net/ssl/ssl_config.h" @@ -122,7 +122,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket namespace net { -@@ -297,6 +301,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool( +@@ -285,6 +289,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 23a93cff..6ae9b707 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 @@ -4,31 +4,30 @@ Subject: Add flag to control video playback resume feature Disable it by default on Android as it is everywhere else --- - chrome/browser/about_flags.cc | 5 +++++ + chrome/browser/about_flags.cc | 4 ++++ chrome/browser/flag_descriptions.cc | 5 +++++ chrome/browser/flag_descriptions.h | 3 +++ media/base/media_switches.cc | 6 +----- - 4 files changed, 14 insertions(+), 5 deletions(-) + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3947,6 +3947,11 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kSiteCharacteristicsDatabase)}, - #endif - +@@ -1407,6 +1407,10 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kVideoPlayerChromecastSupportDescription, kOsCrOS, + SINGLE_VALUE_TYPE( + chromeos::switches::kEnableVideoPlayerChromecastSupport)}, + {"resume-background-video", + flag_descriptions::kResumeBackgroundVideoName, + flag_descriptions::kResumeBackgroundVideoDescription, kOsAll, + FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)}, -+ - #if defined(OS_MACOSX) - {"enable-text-suggestions-touch-bar", - flag_descriptions::kTextSuggestionsTouchBarName, + {"list-all-display-modes", flag_descriptions::kListAllDisplayModesName, + flag_descriptions::kListAllDisplayModesDescription, kOsCrOS, + FEATURE_VALUE_TYPE(display::features::kListAllDisplayModes)}, 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 -@@ -833,6 +833,11 @@ const char kEnablePictureInPictureDescription[] = +@@ -840,6 +840,11 @@ const char kEnablePictureInPictureDescription[] = "controls. The #enable-surfaces-for-videos flag must be enabled as well " "to use it."; @@ -43,7 +42,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 -@@ -502,6 +502,9 @@ extern const char kOOPHPStackModePseudo[]; +@@ -495,6 +495,9 @@ extern const char kEnableNewDownloadBackendDescription[]; extern const char kEnablePictureInPictureName[]; extern const char kEnablePictureInPictureDescription[]; @@ -56,7 +55,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc -@@ -212,11 +212,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", +@@ -205,11 +205,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad", // when in background. const base::Feature kResumeBackgroundVideo { "resume-background-video", diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 4761f0b5..a5776b28 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 -@@ -3269,6 +3269,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2975,6 +2975,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kHandwritingGesture)}, #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 -@@ -835,6 +835,10 @@ const char kOOPHPStackModeNative[] = "Native"; +@@ -842,6 +842,10 @@ const char kOOPHPStackModeNative[] = "Native"; const char kOOPHPStackModeNativeWithThreadNames[] = "Native with thread names"; const char kOOPHPStackModePseudo[] = "Trace events"; @@ -43,9 +43,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -505,6 +505,9 @@ extern const char kOOPHPStackModeNative[]; - extern const char kOOPHPStackModeNativeWithThreadNames[]; - extern const char kOOPHPStackModePseudo[]; +@@ -498,6 +498,9 @@ extern const char kDownloadAutoResumptionNativeDescription[]; + extern const char kEnableNewDownloadBackendName[]; + extern const char kEnableNewDownloadBackendDescription[]; +extern const char kIPv6ProbingName[]; +extern const char kIPv6ProbingDescription[]; @@ -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 -@@ -82,6 +82,7 @@ +@@ -81,6 +81,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) -@@ -2874,8 +2875,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) { +@@ -2751,8 +2752,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) { bool cached = true; if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() > kIPv6ProbePeriodMs) { @@ -83,7 +83,7 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc --- a/services/network/public/cpp/features.cc +++ b/services/network/public/cpp/features.cc -@@ -14,6 +14,9 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting", +@@ -16,6 +16,9 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting", const base::Feature kNetworkErrorLogging{"NetworkErrorLogging", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -91,8 +91,8 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c +const base::Feature kIPv6Probing{"IPv6Probing", + base::FEATURE_DISABLED_BY_DEFAULT}; // Enables the network service. - const base::Feature kNetworkService{"NetworkService", - base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kNetworkService { + "NetworkService", diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h 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 103ac10d..2d04fa7e 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 -@@ -2770,6 +2770,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2473,6 +2473,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 -@@ -599,6 +599,14 @@ const char kEnableGenericSensorDescription[] = +@@ -600,6 +600,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 -@@ -391,6 +391,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[]; +@@ -382,6 +382,12 @@ extern const char kEnforceTLS13DowngradeDescription[]; extern const char kEnableGenericSensorName[]; extern const char kEnableGenericSensorDescription[]; @@ -70,7 +70,7 @@ 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 -@@ -144,6 +144,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs( +@@ -93,6 +93,9 @@ void SetIndividualRuntimeFeatures( base::FeatureList::IsEnabled(features::kSharedArrayBuffer) || base::FeatureList::IsEnabled(features::kWebAssemblyThreads)); @@ -83,10 +83,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features. diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc --- a/content/public/common/content_features.cc +++ b/content/public/common/content_features.cc -@@ -596,6 +596,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{ - // https://wicg.github.io/webusb - const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; - +@@ -596,6 +596,16 @@ const base::Feature kExperimentalProductivityFeatures{ + // TODO(rouslan): Remove this. + const base::Feature kWebPayments{"WebPayments", + base::FEATURE_ENABLED_BY_DEFAULT}; +// Enables the device motion API used to track device acceleration; +// no user authorization or notifications happens when in use. +const base::Feature kDeviceMotion{"DeviceMotion", @@ -97,14 +97,14 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c +const base::Feature kDeviceOrientation{"DeviceOrientation", + base::FEATURE_DISABLED_BY_DEFAULT}; + - // Controls whether WebVR VSync-aligned render loop timing is enabled. - const base::Feature kWebVrVsyncAlign{"WebVrVsyncAlign", - base::FEATURE_ENABLED_BY_DEFAULT}; + + // Makes WebRTC use ECDSA certs by default (i.e., when no cert type was + // specified in JS). 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 -@@ -155,6 +155,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[]; - CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[]; +@@ -158,6 +158,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess; + CONTENT_EXPORT extern const base::Feature kWebNfc; #endif // defined(OS_ANDROID) +CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation; @@ -115,7 +115,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h --- a/third_party/blink/public/platform/web_runtime_features.h +++ b/third_party/blink/public/platform/web_runtime_features.h -@@ -95,6 +95,8 @@ class WebRuntimeFeatures { +@@ -97,6 +97,8 @@ class WebRuntimeFeatures { BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool); BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool); BLINK_PLATFORM_EXPORT static void EnableDatabase(bool); @@ -123,7 +123,7 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa + BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool); BLINK_PLATFORM_EXPORT static void EnableDecodeToYUV(bool); BLINK_PLATFORM_EXPORT static void EnableDisplayCutoutAPI(bool); - BLINK_PLATFORM_EXPORT static void EnableFastMobileScrolling(bool); + BLINK_PLATFORM_EXPORT static void EnableFallbackCursorMode(bool); diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc --- a/third_party/blink/renderer/modules/modules_initializer.cc +++ b/third_party/blink/renderer/modules/modules_initializer.cc @@ -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 -@@ -160,6 +160,14 @@ void WebRuntimeFeatures::EnableDatabase(bool enable) { +@@ -165,6 +165,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 -@@ -374,6 +374,14 @@ +@@ -409,6 +409,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 ba39523d..ea522efa 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,9 +75,9 @@ 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 -@@ -2239,6 +2239,14 @@ public abstract class ChromeActivity - final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent(); - currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange); +@@ -2253,6 +2253,14 @@ public abstract class ChromeActivity + currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent( + !usingDesktopUserAgent, reloadOnChange); RecordUserAction.record("MobileMenuRequestDesktopSite"); + } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) { + final boolean reloadOnChange = !currentTab.isNativePage(); @@ -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 -@@ -1720,6 +1720,14 @@ public class ChromeTabbedActivity +@@ -1857,6 +1857,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; -@@ -197,6 +198,8 @@ public class AppMenuPropertiesDelegate { +@@ -196,6 +197,8 @@ public class AppMenuPropertiesDelegate { updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -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 -@@ -3039,6 +3039,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 821729a4..0cb14edb 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 @@ -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 -@@ -1005,8 +1005,10 @@ public class ChromeTabbedActivity +@@ -1138,8 +1138,10 @@ public class ChromeTabbedActivity boolean hadCipherData = CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); @@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri import org.chromium.base.BuildInfo; import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.R; -@@ -43,6 +45,7 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -44,6 +46,7 @@ public class PrivacyPreferences extends PreferenceFragment 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"; @@ -80,9 +80,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri private static final String PREF_DO_NOT_TRACK = "do_not_track"; private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports"; private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; -@@ -94,6 +97,11 @@ public class PrivacyPreferences extends PreferenceFragment - preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER)); - preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK)); +@@ -71,6 +74,11 @@ public class PrivacyPreferences extends PreferenceFragment + (ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); + canMakePaymentPref.setOnPreferenceChangeListener(this); + ChromeBaseCheckBoxPreference closeTabsOnExitPref = + (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT); @@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri ChromeBaseCheckBoxPreference networkPredictionPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS); networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled()); -@@ -139,6 +147,12 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -143,6 +151,12 @@ public class PrivacyPreferences extends PreferenceFragment } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue); recordNetworkPredictionEnablingUMA((boolean) newValue); @@ -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 -@@ -3893,6 +3893,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from +@@ -3880,6 +3880,12 @@ To change this setting, <resetlink>reset sync

IMAGE diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch index 8bd35c85..8fbd57db 100644 --- a/build/patches/Add-option-to-use-home-page-as-NTP.patch +++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch @@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre 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 -@@ -637,6 +637,9 @@ CHAR-LIMIT guidelines: +@@ -674,6 +674,9 @@ CHAR-LIMIT guidelines: Open this page @@ -182,7 +182,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc -@@ -57,6 +57,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; +@@ -58,6 +58,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode"; // A boolean specifying whether the New Tab page is the home page or not. const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage"; @@ -196,8 +196,8 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h -@@ -292,6 +292,7 @@ extern const char kMostRecentlyUsedNetworkFileShareURL[]; - extern const char kParentAccessCodeConfig[]; +@@ -293,6 +293,7 @@ extern const char kParentAccessCodeConfig[]; + extern const char kDeviceWallpaperImageFilePath[]; #endif // defined(OS_CHROMEOS) extern const char kShowHomeButton[]; +extern const char kNewTabPageIsHomePage[]; 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 094155e3..1c3ea860 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 @@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) { prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue)); } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) { -@@ -768,6 +772,8 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -769,6 +773,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,7 +119,7 @@ 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); -@@ -798,6 +804,7 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -799,6 +805,7 @@ public class SingleCategoryPreferences extends PreferenceFragment if (hideSecondaryToggles) { screen.removePreference(thirdPartyCookies); @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web screen.removePreference(notificationsVibrate); screen.removePreference(explainProtectedMediaKey); screen.removePreference(allowedGroup); -@@ -807,12 +814,15 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -808,12 +815,15 @@ public class SingleCategoryPreferences extends PreferenceFragment return; } @@ -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. -@@ -917,6 +927,15 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -918,6 +928,15 @@ public class SingleCategoryPreferences extends PreferenceFragment preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged()); } @@ -163,7 +163,7 @@ 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 -@@ -876,6 +876,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -913,6 +913,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 @@ -179,7 +179,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc --- a/chrome/browser/android/preferences/pref_service_bridge.cc +++ b/chrome/browser/android/preferences/pref_service_bridge.cc -@@ -310,6 +310,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled( +@@ -311,6 +311,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled( return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies); } @@ -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) { -@@ -767,6 +778,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled( +@@ -768,6 +779,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 32ae9881..7fccbfdb 100644 --- a/build/patches/Allow-building-without-safebrowsing-for-Android.patch +++ b/build/patches/Allow-building-without-safebrowsing-for-Android.patch @@ -14,15 +14,15 @@ Fix build from scratch (issue found by nikolowry) 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.cc | 22 ++++++++++++ .../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_resource_dispatcher_host_delegate.cc | 2 ++ chrome/browser/net/chrome_network_delegate.cc | 35 ++----------------- - 18 files changed, 85 insertions(+), 112 deletions(-) + 18 files changed, 87 insertions(+), 112 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 @@ -45,7 +45,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/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 -@@ -39,9 +39,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -40,9 +40,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"; @@ -55,16 +55,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri 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,8 +73,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -83,8 +80,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_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)); -@@ -118,17 +113,6 @@ public class PrivacyPreferences extends PreferenceFragment + +@@ -131,17 +126,6 @@ public class PrivacyPreferences extends PreferenceFragment preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH)); } @@ -79,10 +79,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri - safeBrowsingPref.setOnPreferenceChangeListener(this); - safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); - - if (BuildInfo.isAtLeastQ()) { - ChromeBaseCheckBoxPreference usageStatsPref = - (ChromeBaseCheckBoxPreference) findPreference(PREF_USAGE_STATS); -@@ -146,11 +130,6 @@ public class PrivacyPreferences extends PreferenceFragment + updateSummaries(); + } + +@@ -150,11 +134,6 @@ public class PrivacyPreferences extends PreferenceFragment String key = preference.getKey(); if (PREF_SEARCH_SUGGESTIONS.equals(key)) { PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue); @@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri } else if (PREF_NETWORK_PREDICTIONS.equals(key)) { PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue); recordNetworkPredictionEnablingUMA((boolean) newValue); -@@ -202,19 +181,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -206,19 +185,6 @@ public class PrivacyPreferences extends PreferenceFragment searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled()); } @@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri CheckBoxPreference canMakePaymentPref = (CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); if (canMakePaymentPref != null) { -@@ -256,12 +222,6 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -267,12 +233,6 @@ public class PrivacyPreferences extends PreferenceFragment if (PREF_SEARCH_SUGGESTIONS.equals(key)) { return prefs.isSearchSuggestManaged(); } @@ -130,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 -@@ -243,16 +243,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask, +@@ -250,16 +250,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask, return false; } @@ -150,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 -@@ -110,7 +110,6 @@ +@@ -115,7 +115,6 @@ #include "chrome/browser/safe_browsing/certificate_reporting_service.h" #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" @@ -158,7 +158,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/ui_manager.h" #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" -@@ -4256,11 +4255,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4248,11 +4247,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( PreviewsLitePageDecider::MaybeCreateThrottleFor(handle); if (previews_lite_page_throttle) throttles.push_back(std::move(previews_lite_page_throttle)); @@ -170,7 +170,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch #if defined(OS_WIN) || defined(OS_MACOSX) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -@@ -5130,19 +5124,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( +@@ -5192,19 +5186,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate( content::ResourceContext* resource_context) { DCHECK_CURRENTLY_ON(BrowserThread::IO); @@ -207,7 +207,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -38,8 +38,10 @@ +@@ -39,8 +39,10 @@ #include "chrome/browser/download/save_package_file_picker.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" @@ -218,8 +218,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" -@@ -49,7 +51,9 @@ - #include "chrome/common/chrome_features.h" +@@ -51,7 +53,9 @@ + #include "chrome/common/chrome_paths.h" #include "chrome/common/pdf_util.h" #include "chrome/common/pref_names.h" +#if defined(FULL_SAFE_BROWSING) @@ -228,10 +228,10 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom #include "chrome/grit/generated_resources.h" #include "components/download/public/common/download_interrupt_reasons.h" #include "components/download/public/common/download_item.h" -@@ -101,8 +105,10 @@ - using content::BrowserThread; +@@ -106,8 +110,10 @@ using content::DownloadManager; using download::DownloadItem; - using content::DownloadManager; + using download::DownloadPathReservationTracker; + using download::PathValidationResult; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; using safe_browsing::DownloadProtectionService; @@ -239,7 +239,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom namespace { -@@ -764,19 +770,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const { +@@ -768,19 +774,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const { return std::string(chrome::kApplicationClientIDStringForAVScanning); } @@ -261,7 +261,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom void ChromeDownloadManagerDelegate::NotifyExtensions( DownloadItem* download, -@@ -1219,13 +1225,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( +@@ -1222,13 +1228,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined( DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -282,8 +282,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h --- a/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h -@@ -22,8 +22,10 @@ - #include "chrome/browser/download/download_path_reservation_tracker.h" +@@ -21,8 +21,10 @@ + #include "build/build_config.h" #include "chrome/browser/download/download_target_determiner_delegate.h" #include "chrome/browser/download/download_target_info.h" +#if defined(FULL_SAFE_BROWSING) @@ -292,8 +292,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome +#endif #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_item.h" - #include "content/public/browser/download_manager_delegate.h" -@@ -131,8 +133,10 @@ class ChromeDownloadManagerDelegate + #include "components/download/public/common/download_path_reservation_tracker.h" +@@ -134,8 +136,10 @@ class ChromeDownloadManagerDelegate DownloadPrefs* download_prefs() { return download_prefs_.get(); } protected: @@ -304,7 +304,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome // Show file picker for |download|. virtual void ShowFilePickerForDownload( -@@ -197,9 +201,11 @@ class ChromeDownloadManagerDelegate +@@ -201,9 +205,11 @@ class ChromeDownloadManagerDelegate const content::NotificationSource& source, const content::NotificationDetails& details) override; @@ -430,7 +430,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -22,7 +22,9 @@ +@@ -23,7 +23,9 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" @@ -440,10 +440,10 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow #include "chrome/grit/generated_resources.h" #include "components/download/public/common/download_interrupt_reasons.h" #include "components/history/core/browser/history_service.h" -@@ -56,13 +58,16 @@ - +@@ -59,13 +61,16 @@ using content::BrowserThread; using download::DownloadItem; + using download::DownloadPathReservationTracker; +#if defined(FULL_SAFE_BROWSING) using safe_browsing::DownloadFileType; +#endif @@ -457,7 +457,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a // single bool. A host is considered visited before if prior visible visits were // found in history and the first such visit was earlier than the most recent -@@ -76,6 +81,7 @@ void VisitCountsToVisitedBefore( +@@ -79,6 +84,7 @@ void VisitCountsToVisitedBefore( found_visits && count > 0 && (first_visit.LocalMidnight() < base::Time::Now().LocalMidnight())); } @@ -465,7 +465,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow #if defined(OS_WIN) // Keeps track of whether Adobe Reader is up to date. -@@ -100,7 +106,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( +@@ -103,7 +109,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer( create_target_directory_(false), conflict_action_(conflict_action), danger_type_(download->GetDangerType()), @@ -475,7 +475,20 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow virtual_path_(initial_virtual_path), is_filetype_handled_safely_(false), #if defined(OS_ANDROID) -@@ -719,6 +727,7 @@ DownloadTargetDeterminer::Result +@@ -259,8 +267,12 @@ DownloadTargetDeterminer::Result + // |suggested_filename| and Content-Disposition header have higher priority + // than the URL. + bool safe_file_ext = ++#if defined(FULL_SAFE_BROWSING) + !safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( + generated_filename); ++#else ++ true; ++#endif + net::HttpContentDisposition content_disposition_header( + download_->GetContentDisposition(), referrer_charset); + bool should_replace_extension = +@@ -749,6 +761,7 @@ DownloadTargetDeterminer::Result return CONTINUE; } @@ -483,7 +496,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow // First determine the danger level assuming that the user doesn't have any // prior visits to the referrer recoreded in history. The resulting danger // level would be ALLOW_ON_USER_GESTURE if the level depends on the visit -@@ -755,6 +764,7 @@ DownloadTargetDeterminer::Result +@@ -785,6 +798,7 @@ DownloadTargetDeterminer::Result // invalid, then assume the referrer has not been visited before. if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -491,7 +504,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow return CONTINUE; } -@@ -762,11 +772,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( +@@ -792,11 +806,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( bool visited_referrer_before) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); @@ -505,7 +518,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow DoLoop(); } -@@ -861,7 +873,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -901,7 +917,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( << " Intermediate:" << intermediate_path_.AsUTF8Unsafe() << " Confirmation reason:" << static_cast(confirmation_reason_) << " Danger type:" << danger_type_ @@ -515,7 +528,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow << " Result:" << static_cast(result); std::unique_ptr target_info(new DownloadTargetInfo); -@@ -873,7 +887,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( +@@ -913,7 +931,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf( ? DownloadItem::TARGET_DISPOSITION_PROMPT : DownloadItem::TARGET_DISPOSITION_OVERWRITE); target_info->danger_type = danger_type_; @@ -525,7 +538,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow target_info->intermediate_path = intermediate_path_; target_info->mime_type = mime_type_; target_info->is_filetype_handled_safely = is_filetype_handled_safely_; -@@ -959,6 +975,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { +@@ -999,6 +1019,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const { DownloadItem::TARGET_DISPOSITION_PROMPT); } @@ -533,7 +546,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( PriorVisitsToReferrer visits) const { DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -990,6 +1007,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1030,6 +1051,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( return DownloadFileType::NOT_DANGEROUS; } @@ -544,8 +557,8 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h --- a/chrome/browser/download/download_target_determiner.h +++ b/chrome/browser/download/download_target_determiner.h -@@ -17,7 +17,9 @@ - #include "chrome/browser/download/download_path_reservation_tracker.h" +@@ -16,7 +16,9 @@ + #include "build/build_config.h" #include "chrome/browser/download/download_target_determiner_delegate.h" #include "chrome/browser/download/download_target_info.h" +#if defined(FULL_SAFE_BROWSING) @@ -553,8 +566,8 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows +#endif #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_item.h" - #include "content/public/browser/download_manager_delegate.h" -@@ -297,6 +299,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { + #include "components/download/public/common/download_path_reservation_tracker.h" +@@ -300,6 +302,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { // operation. bool HasPromptedForPath() const; @@ -562,7 +575,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows // Returns true if this download should show the "dangerous file" warning. // Various factors are considered, such as the type of the file, whether a // user action initiated the download, and whether the user has explicitly -@@ -306,6 +309,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { +@@ -309,6 +312,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { // to true if the download requires explicit user consent. safe_browsing::DownloadFileType::DangerLevel GetDangerLevel( PriorVisitsToReferrer visits) const; @@ -570,9 +583,9 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows // download::DownloadItem::Observer void OnDownloadDestroyed(download::DownloadItem* download) override; -@@ -317,7 +321,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { - bool create_target_directory_; - DownloadPathReservationTracker::FilenameConflictAction conflict_action_; +@@ -321,7 +325,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer { + download::DownloadPathReservationTracker::FilenameConflictAction + conflict_action_; download::DownloadDangerType danger_type_; +#if defined(FULL_SAFE_BROWSING) safe_browsing::DownloadFileType::DangerLevel danger_level_; @@ -689,7 +702,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 -@@ -400,14 +400,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( +@@ -399,7 +399,9 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( content::ResourceContext* resource_context, ResourceType resource_type, std::vector>* throttles) { @@ -697,17 +710,8 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); +#endif // defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE) - // Insert either safe browsing or data reduction proxy throttle at the front - // of the list, so one of them gets to decide if the resource is safe. + // Insert safe browsing to decide if the resource is safe. content::ResourceThrottle* first_throttle = NULL; - #if defined(OS_ANDROID) -+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE) - first_throttle = DataReductionProxyResourceThrottle::MaybeCreate( - request, resource_context, resource_type, nullptr); -+#endif - #endif // defined(OS_ANDROID) - - #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE) 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 @@ -731,7 +735,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) -@@ -214,26 +201,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 89c1780d..385243e3 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 -@@ -1014,6 +1014,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -948,6 +948,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()); -@@ -3297,7 +3303,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const { +@@ -3113,7 +3119,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(this)) { @@ -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 -@@ -153,6 +153,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl +@@ -141,6 +141,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-allow-partner-customisation.patch b/build/patches/Always-allow-partner-customisation.patch index 7505bdfe..19818810 100644 --- a/build/patches/Always-allow-partner-customisation.patch +++ b/build/patches/Always-allow-partner-customisation.patch @@ -9,7 +9,7 @@ Subject: Always allow partner customisation diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java -@@ -242,14 +242,14 @@ public class PartnerBrowserCustomizations { +@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations { @Override protected Void doInBackground() { try { 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 84577bf1..07e9ddc9 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 -@@ -220,7 +220,7 @@ void OnAuthPrefsChanged(PrefService* local_state, +@@ -226,7 +226,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 -@@ -517,7 +517,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -544,7 +544,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/build/patches/Always-show-home-page-settings.patch b/build/patches/Always-show-home-page-settings.patch index e3230535..06f2f0ca 100644 --- a/build/patches/Always-show-home-page-settings.patch +++ b/build/patches/Always-show-home-page-settings.patch @@ -7,19 +7,19 @@ display home page settings. This allows removing the home page button and restoring it from settings. --- .../browser/init/ProcessInitializationHandler.java | 12 -------- - .../partnercustomizations/HomepageManager.java | 17 ++-------- + .../partnercustomizations/HomepageManager.java | 17 ++--------- .../preferences/ChromePreferenceManager.java | 7 ----- .../browser/preferences/MainPreferences.java | 12 +++----- - .../chrome/browser/util/FeatureUtilities.java | 36 ---------------------- + .../chrome/browser/util/FeatureUtilities.java | 34 ---------------------- chrome/browser/about_flags.cc | 3 -- chrome/browser/android/chrome_feature_list.cc | 4 --- chrome/browser/android/chrome_feature_list.h | 1 - - 8 files changed, 7 insertions(+), 85 deletions(-) + 8 files changed, 7 insertions(+), 83 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java -@@ -328,18 +328,6 @@ public class ProcessInitializationHandler { +@@ -338,18 +338,6 @@ public class ProcessInitializationHandler { deferredStartupHandler.addDeferredTask(new Runnable() { @Override public void run() { @@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java -@@ -144,13 +144,6 @@ public class ChromePreferenceManager { +@@ -147,13 +147,6 @@ public class ChromePreferenceManager { private static final String CHROME_MODERN_DESIGN_ENABLED_KEY = "chrome_modern_design_enabled"; /** @@ -106,8 +106,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Chr 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 -@@ -195,15 +195,11 @@ public class MainPreferences extends PreferenceFragment - +@@ -207,15 +207,11 @@ public class MainPreferences extends PreferenceFragment + updateSyncAndServicesPreference(); updateSearchEnginePreference(); - if (HomepageManager.shouldShowHomepageSetting()) { @@ -129,7 +129,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -@@ -71,7 +71,6 @@ public class FeatureUtilities { +@@ -73,7 +73,6 @@ public class FeatureUtilities { private static Boolean sHasRecognitionIntentHandler; private static Boolean sIsSoleEnabled; @@ -137,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti private static Boolean sIsHomepageTileEnabled; private static Boolean sIsNewTabPageButtonEnabled; private static Boolean sIsBottomToolbarEnabled; -@@ -186,7 +185,6 @@ public class FeatureUtilities { +@@ -194,7 +193,6 @@ public class FeatureUtilities { cacheSoleEnabled(); cacheCommandLineOnNonRootedEnabled(); FirstRunUtils.cacheFirstRunPrefs(); @@ -145,7 +145,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti cacheHomepageTileEnabled(); cacheNewTabPageButtonEnabled(); cacheBottomToolbarEnabled(); -@@ -212,40 +210,6 @@ public class FeatureUtilities { +@@ -229,38 +227,6 @@ public class FeatureUtilities { } /** @@ -166,10 +166,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti - if (sIsHomePageButtonForceEnabled == null) { - ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance(); - -- try (StrictModeContext unused = StrictModeContext.allowDiskReads()) { -- sIsHomePageButtonForceEnabled = prefManager.readBoolean( -- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false); -- } +- sIsHomePageButtonForceEnabled = prefManager.readBoolean( +- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false); - } - return sIsHomePageButtonForceEnabled; - } @@ -189,7 +187,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti 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 -@@ -1891,9 +1891,6 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1710,9 +1710,6 @@ const FeatureEntry kFeatureEntries[] = { {"enable-chrome-duet", flag_descriptions::kChromeDuetName, flag_descriptions::kChromeDuetDescription, kOsAndroid, FEATURE_VALUE_TYPE(chrome::android::kChromeDuetFeature)}, @@ -202,15 +200,15 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc 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 -@@ -124,7 +124,6 @@ const base::Feature* kFeaturesExposedToJava[] = { - &kGestureNavigation, +@@ -133,7 +133,6 @@ const base::Feature* kFeaturesExposedToJava[] = { + &kExploreSites, &kHandleMediaIntents, &kHideUserDataFromIncognitoNotifications, - &kHomePageButtonForceEnabled, &kHomepageTile, &kHorizontalTabSwitcherAndroid, &kImprovedA2HS, -@@ -337,9 +336,6 @@ const base::Feature kHandleMediaIntents{"HandleMediaIntents", +@@ -377,9 +376,6 @@ const base::Feature kHandleMediaIntents{"HandleMediaIntents", const base::Feature kHideUserDataFromIncognitoNotifications{ "HideUserDataFromIncognitoNotifications", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -223,8 +221,8 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h --- a/chrome/browser/android/chrome_feature_list.h +++ b/chrome/browser/android/chrome_feature_list.h -@@ -56,7 +56,6 @@ extern const base::Feature kForegroundNotificationManager; - extern const base::Feature kGestureNavigation; +@@ -63,7 +63,6 @@ extern const base::Feature kExploreSites; + extern const base::Feature kForegroundNotificationManager; extern const base::Feature kHandleMediaIntents; extern const base::Feature kHideUserDataFromIncognitoNotifications; -extern const base::Feature kHomePageButtonForceEnabled; diff --git a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch index dd558204..8f49d395 100644 --- a/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch +++ b/build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch @@ -43,14 +43,14 @@ 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 -@@ -315,6 +315,7 @@ void AudioContext::StopRendering() { +@@ -324,6 +324,7 @@ void AudioContext::StopRendering() { double AudioContext::baseLatency() const { DCHECK(IsMainThread()); DCHECK(destination()); + return 0.04; // TODO(hongchan): Due to the incompatible constructor between - // AudioDestinationNode and DefaultAudioDestinationNode, casting directly from + // AudioDestinationNode and RealtimeAudioDestinationNode, casting directly -- 2.11.0 diff --git a/build/patches/Battery-API-return-nothing.patch b/build/patches/Battery-API-return-nothing.patch index 6f800099..84ecd0d9 100644 --- a/build/patches/Battery-API-return-nothing.patch +++ b/build/patches/Battery-API-return-nothing.patch @@ -9,7 +9,7 @@ Subject: Battery API: return nothing diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc --- a/third_party/blink/renderer/modules/battery/battery_manager.cc +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc -@@ -43,45 +43,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) { +@@ -44,45 +44,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) { } bool BatteryManager::charging() { diff --git a/build/patches/Bromite-adblock-engine.patch b/build/patches/Bromite-adblock-engine.patch index d03a2d42..2fb9f4e8 100644 --- a/build/patches/Bromite-adblock-engine.patch +++ b/build/patches/Bromite-adblock-engine.patch @@ -33,7 +33,7 @@ Add support for Webview content blocking diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc --- a/android_webview/browser/net/aw_network_delegate.cc +++ b/android_webview/browser/net/aw_network_delegate.cc -@@ -19,9 +19,11 @@ +@@ -20,9 +20,11 @@ #include "net/base/proxy_server.h" #include "net/http/http_response_headers.h" #include "net/proxy_resolution/proxy_info.h" @@ -45,7 +45,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie namespace android_webview { -@@ -48,6 +50,72 @@ AwNetworkDelegate::AwNetworkDelegate() {} +@@ -49,6 +51,72 @@ AwNetworkDelegate::AwNetworkDelegate() {} AwNetworkDelegate::~AwNetworkDelegate() { } @@ -64,7 +64,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie + isValidUrl = false; + } + } -+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); ++ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); + + // there are no per-site nor global ad/content settings when using the SystemWebView + bool adblock_enabled = true; @@ -177,7 +177,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 -@@ -2249,6 +2249,14 @@ public abstract class ChromeActivity +@@ -2263,6 +2263,14 @@ public abstract class ChromeActivity RecordUserAction.record("MobileMenuRequestEnableJavascript"); } else if (id == R.id.reader_mode_prefs_id) { DomDistillerUIUtils.openSettings(currentTab.getWebContents()); @@ -195,7 +195,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 -@@ -1678,6 +1678,14 @@ public class ChromeTabbedActivity +@@ -1815,6 +1815,14 @@ public class ChromeTabbedActivity reportNewTabShortcutUsed(true); getTabCreator(true).launchNTP(); } @@ -213,7 +213,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 -@@ -196,6 +196,8 @@ public class AppMenuPropertiesDelegate { +@@ -195,6 +195,8 @@ public class AppMenuPropertiesDelegate { && !TextUtils.isEmpty(url); prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem); @@ -280,7 +280,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 -@@ -3059,6 +3059,17 @@ To change this setting, <resetlink>reset sync

<resetlink>reset sync

Turn on Request desktop site @@ -317,7 +317,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ #endif #if defined(OS_CHROMEOS) -@@ -195,10 +197,91 @@ void ChromeNetworkDelegate::set_cookie_settings( +@@ -193,10 +195,91 @@ void ChromeNetworkDelegate::set_cookie_settings( cookie_settings_ = cookie_settings; } @@ -336,7 +336,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + isValidUrl = false; + } + } -+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); ++ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); + + bool adblock_enabled = false; + if (isValidUrl && info) { @@ -423,7 +423,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 -@@ -1797,6 +1797,13 @@ component("net") { +@@ -1794,6 +1794,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 c81f1999..83ef3292 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/common/features.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" -@@ -790,7 +788,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -799,7 +797,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { GetState().GetTextAlign(), text); // scale text metrics by 3/1000000th @@ -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") { +@@ -1423,7 +1423,9 @@ jumbo_component("platform") { "//third_party/blink/renderer:non_test_config", ] @@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h" #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" -@@ -128,6 +130,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type, +@@ -127,6 +129,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type, const SkPixmap& pixmap) const { DCHECK(is_valid_); @@ -112,7 +112,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/gpu/GrContext.h" -@@ -171,10 +174,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents( +@@ -151,10 +154,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents( DCHECK(read_pixels_successful || !sk_image->bounds().intersect(SkIRect::MakeXYWH( rect.X(), rect.Y(), info.width(), info.height()))); diff --git a/build/patches/Disable-NTP-remote-suggestions-by-default.patch b/build/patches/Disable-NTP-remote-suggestions-by-default.patch index d796dd7c..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{ diff --git a/build/patches/Disable-Omaha-update-checks.patch b/build/patches/Disable-Omaha-update-checks.patch index 349fa207..6371e290 100644 --- a/build/patches/Disable-Omaha-update-checks.patch +++ b/build/patches/Disable-Omaha-update-checks.patch @@ -36,7 +36,7 @@ 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 -@@ -357,7 +357,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{ +@@ -400,7 +400,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{ base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kJellyBeanSupported{"JellyBeanSupported", diff --git a/build/patches/Disable-contextual-search-by-default.patch b/build/patches/Disable-contextual-search-by-default.patch index b439a57d..1071590a 100644 --- a/build/patches/Disable-contextual-search-by-default.patch +++ b/build/patches/Disable-contextual-search-by-default.patch @@ -9,7 +9,7 @@ Subject: Disable contextual search by default diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -143,7 +143,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -144,7 +144,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #if defined(OS_ANDROID) registry->RegisterStringPref( prefs::kContextualSearchEnabled, diff --git a/build/patches/Disable-data-saver.patch b/build/patches/Disable-data-saver.patch index 9a6e8841..837baa50 100644 --- a/build/patches/Disable-data-saver.patch +++ b/build/patches/Disable-data-saver.patch @@ -41,7 +41,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java -@@ -68,7 +68,7 @@ public class DataReductionPromoUtils { +@@ -70,7 +70,7 @@ public class DataReductionPromoUtils { } if (DataReductionProxySettings.getInstance().isDataReductionProxyManaged()) return false; if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) return false; diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index ba8e38c9..c31fedbd 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 -@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, +@@ -240,17 +240,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 deleted file mode 100644 index 55cf7363..00000000 --- a/build/patches/Disable-hyperlink-auditing-by-default.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Daniel Micay -Date: Sat, 26 Nov 2016 14:57:22 -0500 -Subject: Disable hyperlink auditing by default - ---- - chrome/browser/about_flags.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 -@@ -1325,7 +1325,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)}, -+ SINGLE_VALUE_TYPE(switches::kNoPings)}, - #if defined(OS_ANDROID) - {"contextual-search", flag_descriptions::kContextualSearchName, - flag_descriptions::kContextualSearchDescription, kOsAndroid, --- -2.11.0 - diff --git a/build/patches/Disable-metrics-collection-for-NTP-tiles.patch b/build/patches/Disable-metrics-collection-for-NTP-tiles.patch index db24d60e..4c7e9139 100644 --- a/build/patches/Disable-metrics-collection-for-NTP-tiles.patch +++ b/build/patches/Disable-metrics-collection-for-NTP-tiles.patch @@ -10,7 +10,7 @@ Subject: Disable metrics collection for NTP tiles diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc --- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc +++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc -@@ -22,7 +22,6 @@ +@@ -23,7 +23,6 @@ #include "chrome/browser/profiles/profile_android.h" #include "components/favicon_base/favicon_types.h" #include "components/history/core/browser/history_service.h" @@ -18,7 +18,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br #include "components/ntp_tiles/most_visited_sites.h" #include "components/ntp_tiles/section_type.h" #include "components/rappor/rappor_service_impl.h" -@@ -44,7 +43,6 @@ using ntp_tiles::NTPTilesVector; +@@ -45,7 +44,6 @@ using ntp_tiles::NTPTilesVector; using ntp_tiles::SectionType; using ntp_tiles::TileTitleSource; using ntp_tiles::TileSource; @@ -26,7 +26,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br namespace { -@@ -239,7 +237,6 @@ void MostVisitedSitesBridge::RecordPageImpression( +@@ -240,7 +238,6 @@ void MostVisitedSitesBridge::RecordPageImpression( JNIEnv* env, const JavaParamRef& obj, jint jtiles_count) { @@ -34,7 +34,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br } void MostVisitedSitesBridge::RecordTileImpression( -@@ -252,18 +249,6 @@ void MostVisitedSitesBridge::RecordTileImpression( +@@ -253,18 +250,6 @@ void MostVisitedSitesBridge::RecordTileImpression( jint jsource, jlong jdata_generation_time_ms, const JavaParamRef& jurl) { @@ -53,7 +53,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br } void MostVisitedSitesBridge::RecordOpenedMostVisitedItem( -@@ -274,12 +259,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem( +@@ -275,12 +260,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem( jint title_source, jint source, jlong jdata_generation_time_ms) { 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 91c692e1..339dcf0b 100644 --- a/build/patches/Disable-metrics-on-all-I-O-threads.patch +++ b/build/patches/Disable-metrics-on-all-I-O-threads.patch @@ -22,7 +22,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc -@@ -56,8 +56,6 @@ +@@ -55,8 +55,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" diff --git a/build/patches/Disable-plugins-enumeration.patch b/build/patches/Disable-plugins-enumeration.patch index da93a103..564f857f 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 -@@ -1321,10 +1321,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1357,10 +1357,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 623d2fab..b169e3e7 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 -@@ -189,7 +189,6 @@ chrome_java_sources = [ +@@ -166,7 +166,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-references-to-fonts.googleapis.com.patch b/build/patches/Disable-references-to-fonts.googleapis.com.patch index 9b9f9bb3..8044fec8 100644 --- a/build/patches/Disable-references-to-fonts.googleapis.com.patch +++ b/build/patches/Disable-references-to-fonts.googleapis.com.patch @@ -12,10 +12,10 @@ Subject: Disable references to fonts.googleapis.com diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest( +@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest( + } - std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() - const { + std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() const { - return "style-src 'self' https://fonts.googleapis.com;"; + return "style-src 'self';"; } diff --git a/build/patches/Disable-seed-based-field-trials.patch b/build/patches/Disable-seed-based-field-trials.patch index d1dd877c..a55918fe 100644 --- a/build/patches/Disable-seed-based-field-trials.patch +++ b/build/patches/Disable-seed-based-field-trials.patch @@ -9,7 +9,7 @@ Subject: Disable seed-based field trials diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc --- a/components/variations/service/variations_field_trial_creator.cc +++ b/components/variations/service/variations_field_trial_creator.cc -@@ -513,8 +513,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials( +@@ -514,8 +514,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials( #endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED) bool used_seed = false; if (!used_testing_config) { diff --git a/build/patches/Disable-signin-and-data-saver-preferences.patch b/build/patches/Disable-signin-and-data-saver-preferences.patch index 0c39358c..5200df62 100644 --- a/build/patches/Disable-signin-and-data-saver-preferences.patch +++ b/build/patches/Disable-signin-and-data-saver-preferences.patch @@ -4,10 +4,9 @@ Subject: Disable signin and data saver preferences Never show the data saver promo snackbar --- - chrome/android/java/res/xml/main_preferences.xml | 9 ----- - .../chromium/chrome/browser/ChromeActivity.java | 6 ++- - .../browser/preferences/MainPreferences.java | 46 ++++++---------------- - 3 files changed, 15 insertions(+), 46 deletions(-) + chrome/android/java/res/xml/main_preferences.xml | 9 --- + .../browser/preferences/MainPreferences.java | 91 +--------------------- + 2 files changed, 2 insertions(+), 98 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 @@ -21,61 +20,24 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j - android:order="1" - android:title="@string/sign_in_to_chrome"/> - - private EphemeralTabPanel mEphemeralTabPanel; - protected ReaderModeManager mReaderModeManager; - private SnackbarManager mSnackbarManager; -- private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController; -+ //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController; - private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate; - private AppMenuHandler mAppMenuHandler; - private ToolbarManager mToolbarManager; -@@ -694,6 +694,7 @@ public abstract class ChromeActivity - mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) { - @Override - public void didFirstVisuallyNonEmptyPaint(Tab tab) { -+/* - // 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. -@@ -707,6 +708,7 @@ public abstract class ChromeActivity - DataReductionProxySettings.getInstance() - .getTotalHttpContentLengthSaved()); - } -+*/ - } - - @Override 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,11 +17,9 @@ import org.chromium.base.VisibleForTesting; +@@ -17,16 +17,12 @@ import org.chromium.base.VisibleForTesting; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeFeatureList; import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils; @@ -87,21 +49,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai import org.chromium.chrome.browser.preferences.developer.DeveloperPreferences; import org.chromium.chrome.browser.search_engines.TemplateUrl; import org.chromium.chrome.browser.search_engines.TemplateUrlService; -@@ -37,13 +35,11 @@ import java.util.Map; +-import org.chromium.chrome.browser.signin.SigninManager; +-import org.chromium.chrome.browser.sync.ProfileSyncService; + import org.chromium.chrome.browser.util.FeatureUtilities; + + import java.util.HashMap; +@@ -36,11 +32,8 @@ import java.util.Map; + * The main settings screen, shown when the user first opens Settings. + */ public class MainPreferences extends PreferenceFragment - implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener { +- implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener, +- SigninManager.SignInStateObserver { ++ implements TemplateUrlService.LoadListener { public static final String PREF_ACCOUNT_SECTION = "account_section"; - public static final String PREF_SIGN_IN = "sign_in"; - public static final String PREF_SYNC_AND_SERVICES = "sync_and_services"; +- public static final String PREF_SYNC_AND_SERVICES = "sync_and_services"; public static final String PREF_SEARCH_ENGINE = "search_engine"; public static final String PREF_SAVED_PASSWORDS = "saved_passwords"; public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions"; - public static final String PREF_HOMEPAGE = "homepage"; -- public static final String PREF_DATA_REDUCTION = "data_reduction"; - public static final String PREF_NOTIFICATIONS = "notifications"; - public static final String PREF_LANGUAGES = "languages"; - public static final String PREF_DOWNLOADS = "downloads"; -@@ -57,7 +53,6 @@ public class MainPreferences extends PreferenceFragment +@@ -60,7 +53,6 @@ public class MainPreferences extends PreferenceFragment private final ManagedPreferenceDelegate mManagedPreferenceDelegate; private final Map mAllPreferences = new HashMap<>(); @@ -109,38 +75,41 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai public MainPreferences() { setHasOptionsMenu(true); -@@ -73,25 +68,29 @@ public class MainPreferences extends PreferenceFragment +@@ -76,33 +68,16 @@ public class MainPreferences extends PreferenceFragment @Override public void onDestroy() { super.onDestroy(); - mSignInPreference.onPreferenceFragmentDestroyed(); -+ //mSignInPreference.onPreferenceFragmentDestroyed(); } @Override public void onStart() { super.onStart(); -+/* - if (SigninManager.get().isSigninSupported()) { - SigninManager.get().addSignInStateObserver(this); - mSignInPreference.registerForUpdates(); - } -+*/ +- if (SigninManager.get().isSigninSupported()) { +- SigninManager.get().addSignInStateObserver(this); +- mSignInPreference.registerForUpdates(); +- } +- ProfileSyncService syncService = ProfileSyncService.get(); +- if (syncService != null) { +- syncService.addSyncStateChangedListener(this); +- } } @Override public void onStop() { super.onStop(); -+/* - if (SigninManager.get().isSigninSupported()) { - SigninManager.get().removeSignInStateObserver(this); - mSignInPreference.unregisterForUpdates(); - } -+*/ +- if (SigninManager.get().isSigninSupported()) { +- SigninManager.get().removeSignInStateObserver(this); +- mSignInPreference.unregisterForUpdates(); +- } +- ProfileSyncService syncService = ProfileSyncService.get(); +- if (syncService != null) { +- syncService.removeSyncStateChangedListener(this); +- } } @Override -@@ -104,17 +103,12 @@ public class MainPreferences extends PreferenceFragment +@@ -115,17 +90,11 @@ public class MainPreferences extends PreferenceFragment PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences); cachePreferences(); @@ -151,7 +120,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai - getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES)); - } + getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION)); -+ getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES)); updatePasswordsPreference(); @@ -160,16 +128,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { // If we are on Android O+ the Notifications preference should lead to the Android -@@ -178,7 +172,7 @@ public class MainPreferences extends PreferenceFragment +@@ -189,7 +158,6 @@ public class MainPreferences extends PreferenceFragment Preference preference = getPreferenceScreen().getPreference(index); mAllPreferences.put(preference.getKey(), preference); } - mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN); -+ //mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN); } private void setManagedPreferenceDelegateForPreference(String key) { -@@ -187,12 +181,6 @@ public class MainPreferences extends PreferenceFragment +@@ -198,13 +166,6 @@ public class MainPreferences extends PreferenceFragment } private void updatePreferences() { @@ -179,10 +146,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai - removePreferenceIfPresent(PREF_SIGN_IN); - } - +- updateSyncAndServicesPreference(); updateSearchEnginePreference(); Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE); -@@ -216,10 +204,6 @@ public class MainPreferences extends PreferenceFragment +@@ -234,10 +195,6 @@ public class MainPreferences extends PreferenceFragment } else { removePreferenceIfPresent(PREF_DEVELOPER); } @@ -193,22 +161,64 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } private Preference addPreferenceIfAbsent(String key) { -@@ -279,11 +263,11 @@ public class MainPreferences extends PreferenceFragment - - private void onSignInPreferenceStateChanged() { - // Remove "Account" section header if the personalized sign-in promo is shown. -- if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) { -+// if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) { - removePreferenceIfPresent(PREF_ACCOUNT_SECTION); -- } else { -+/* } else { - addPreferenceIfAbsent(PREF_ACCOUNT_SECTION); -- } -+ }*/ +@@ -251,15 +208,6 @@ public class MainPreferences extends PreferenceFragment + if (preference != null) getPreferenceScreen().removePreference(preference); } +- private void updateSyncAndServicesPreference() { +- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) return; +- +- ChromeBasePreference syncAndServices = +- (ChromeBasePreference) findPreference(PREF_SYNC_AND_SERVICES); +- syncAndServices.setIcon(SyncPreferenceUtils.getSyncStatusIcon(getActivity())); +- syncAndServices.setSummary(SyncPreferenceUtils.getSyncStatusSummary(getActivity())); +- } +- + private void updateSearchEnginePreference() { + if (!TemplateUrlService.getInstance().isLoaded()) { + ChromeBasePreference searchEnginePref = +@@ -291,28 +239,6 @@ public class MainPreferences extends PreferenceFragment + pref.setSummary(getResources().getString(isOn ? R.string.text_on : R.string.text_off)); + } + +- // SigninManager.SignInStateObserver implementation. +- @Override +- public void onSignedIn() { +- // After signing in or out of a managed account, preferences may change or become enabled +- // or disabled. +- new Handler().post(() -> updatePreferences()); +- } +- +- @Override +- public void onSignedOut() { +- updatePreferences(); +- } +- +- private void onSignInPreferenceStateChanged() { +- // Remove "Account" section header if the personalized sign-in promo is shown. +- if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) { +- removePreferenceIfPresent(PREF_ACCOUNT_SECTION); +- } else { +- addPreferenceIfAbsent(PREF_ACCOUNT_SECTION); +- } +- } +- // TemplateUrlService.LoadListener implementation. -@@ -302,9 +286,6 @@ public class MainPreferences extends PreferenceFragment + @Override + public void onTemplateUrlServiceLoaded() { +@@ -320,11 +246,6 @@ public class MainPreferences extends PreferenceFragment + updateSearchEnginePreference(); + } + +- @Override +- public void syncStateChanged() { +- updateSyncAndServicesPreference(); +- } +- + @VisibleForTesting + ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() { + return mManagedPreferenceDelegate; +@@ -334,9 +255,6 @@ public class MainPreferences extends PreferenceFragment return new ManagedPreferenceDelegate() { @Override public boolean isPreferenceControlledByPolicy(Preference preference) { @@ -218,7 +228,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(); } -@@ -313,11 +294,6 @@ public class MainPreferences extends PreferenceFragment +@@ -345,11 +263,6 @@ public class MainPreferences extends PreferenceFragment @Override public boolean isPreferenceClickDisabledByPolicy(Preference preference) { diff --git a/build/patches/Disable-signin-data-reduction-promos.patch b/build/patches/Disable-signin-data-reduction-promos.patch index 3f02b2e0..ff940338 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 -@@ -599,34 +599,10 @@ public class ChromeTabbedActivity +@@ -695,34 +695,10 @@ public class ChromeTabbedActivity } ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance(); 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 4a22684f..3764376a 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 @@ -11,7 +11,7 @@ Block gelocation by default instead of granting it for non-enterprise use cases diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc --- a/chrome/browser/android/search_permissions/search_permissions_service.cc +++ b/chrome/browser/android/search_permissions/search_permissions_service.cc -@@ -343,11 +343,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { +@@ -344,11 +344,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { return; } @@ -24,7 +24,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy); // Initialize the pref for geolocation if it hasn't been initialized yet. -@@ -380,10 +376,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { +@@ -381,10 +377,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated); } else if (dse_geolocation_setting == CONTENT_SETTING_ASK) { // If the user hasn't explicitly allowed or blocked geolocation for the @@ -37,7 +37,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic } // Update the content setting with the auto-grants for the DSE. -@@ -409,11 +403,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { +@@ -410,11 +404,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() { GetContentSetting(dse_origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS); ContentSetting dse_notifications_setting = notifications_setting_to_restore; // If the user hasn't explicitly allowed or blocked notifications for the @@ -54,7 +54,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -296,7 +296,7 @@ const base::Feature kGeoLanguage{"GeoLanguage", +@@ -322,7 +322,7 @@ const base::Feature kGoogleBrandedContextMenu{ #if defined(OS_ANDROID) const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE", diff --git a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch index 79ead02a..af811425 100644 --- a/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch +++ b/build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch @@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -268,6 +268,10 @@ config("compiler") { +@@ -272,6 +272,10 @@ config("compiler") { } } diff --git a/build/patches/Enable-history-requirement-of-user-gesture.patch b/build/patches/Enable-history-requirement-of-user-gesture.patch index 837e8049..4ac704d0 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 -@@ -1323,7 +1323,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1199,7 +1199,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-history-entry-requires-user-gesture", flag_descriptions::kHistoryRequiresUserGestureName, flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll, diff --git a/build/patches/Enable-secure-DNS-mode-by-default-in-DnsTransaction.patch b/build/patches/Enable-secure-DNS-mode-by-default-in-DnsTransaction.patch index 85a9113c..6c5e13ee 100644 --- a/build/patches/Enable-secure-DNS-mode-by-default-in-DnsTransaction.patch +++ b/build/patches/Enable-secure-DNS-mode-by-default-in-DnsTransaction.patch @@ -3,39 +3,13 @@ Date: Fri, 15 Mar 2019 10:05:14 +0100 Subject: Enable secure DNS mode by default in DnsTransaction. --- - chrome/browser/net/dns_probe_runner.cc | 2 +- - components/certificate_transparency/log_dns_client.cc | 2 +- - net/dns/host_resolver_impl.cc | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + net/dns/host_resolver_impl.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc ---- a/chrome/browser/net/dns_probe_runner.cc -+++ b/chrome/browser/net/dns_probe_runner.cc -@@ -110,7 +110,7 @@ void DnsProbeRunner::RunProbe(const base::Closure& callback) { - kKnownGoodHostname, net::dns_protocol::kTypeA, - base::Bind(&DnsProbeRunner::OnTransactionComplete, - weak_factory_.GetWeakPtr()), -- NetLogWithSource(), net::SecureDnsMode::AUTOMATIC); -+ NetLogWithSource(), net::SecureDnsMode::SECURE); - - transaction_->Start(); - } -diff --git a/components/certificate_transparency/log_dns_client.cc b/components/certificate_transparency/log_dns_client.cc ---- a/components/certificate_transparency/log_dns_client.cc -+++ b/components/certificate_transparency/log_dns_client.cc -@@ -472,7 +472,7 @@ bool AuditProofQueryImpl::StartDnsTransaction(const std::string& qname) { - qname, net::dns_protocol::kTypeTXT, - base::BindOnce(&AuditProofQueryImpl::OnDnsTransactionComplete, - weak_ptr_factory_.GetWeakPtr()), -- net_log_, net::SecureDnsMode::AUTOMATIC); -+ net_log_, net::SecureDnsMode::SECURE); - - current_dns_transaction_->Start(); - return true; 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 -@@ -1066,7 +1066,7 @@ class HostResolverImpl::DnsTask : public base::SupportsWeakPtr { +@@ -984,7 +984,7 @@ class HostResolverImpl::DnsTask : public base::SupportsWeakPtr { base::BindOnce(&DnsTask::OnTransactionComplete, base::Unretained(this), tick_clock_->NowTicks(), dns_query_type), diff --git a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch index 66a2d5fb..0ce52ca1 100644 --- a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch +++ b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch @@ -9,8 +9,8 @@ Subject: Enable site per process isolation for devices with enough memory diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc -@@ -518,11 +518,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL", - // (e.g. this approach lets ChromeCast avoid site-per-process mode). +@@ -552,11 +552,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL", + // browser_features, as they are only used on the browser side. const base::Feature kSitePerProcess { "site-per-process", -#if defined(OS_ANDROID) @@ -20,8 +20,8 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc -#endif }; - // kSitePerProcessOnlyForHighMemoryClients is checked before kSitePerProcess, -@@ -535,7 +531,7 @@ const base::Feature kSitePerProcess { + // Controls a mode for dynamically process-isolating sites where the user has +@@ -578,7 +574,7 @@ const base::Feature kSiteIsolationForPasswordSites{ // base::SysInfo::AmountOfPhysicalMemoryMB(). const base::Feature kSitePerProcessOnlyForHighMemoryClients{ "site-per-process-only-for-high-memory-clients", 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 009296f3..5a427f8a 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,7 +9,7 @@ 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 -@@ -694,6 +694,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( +@@ -695,6 +695,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( if (status != CONTENT_SETTING_DEFAULT) return PermissionResult(status, PermissionStatusSource::UNSPECIFIED); PermissionContextBase* context = GetPermissionContext(permission); 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 18e654c7..746d5ebe 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 @@ -20,7 +20,7 @@ Send a random key press to circumvent idle status detection 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 -@@ -150,6 +150,8 @@ blink_core_sources("dom") { +@@ -144,6 +144,8 @@ blink_core_sources("dom") { "global_event_handlers.h", "icon_url.cc", "icon_url.h", @@ -32,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 -@@ -236,6 +236,7 @@ +@@ -241,6 +241,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" @@ -40,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" -@@ -296,6 +297,8 @@ +@@ -300,6 +301,8 @@ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" #include "third_party/blink/renderer/platform/wtf/time.h" @@ -49,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(); -@@ -6199,8 +6202,35 @@ void Document::FinishedParsing() { +@@ -6224,8 +6227,35 @@ void Document::FinishedParsing() { // Parser should have picked up all preloads by now fetcher_->ClearPreloads(ResourceFetcher::kClearSpeculativeMarkupPreloads); @@ -111,7 +111,7 @@ new file mode 100644 diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third_party/blink/renderer/core/html/html_script_element.cc --- a/third_party/blink/renderer/core/html/html_script_element.cc +++ b/third_party/blink/renderer/core/html/html_script_element.cc -@@ -155,6 +155,11 @@ void HTMLScriptElement::setTextContent( +@@ -154,6 +154,11 @@ void HTMLScriptElement::setTextContent( } } diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index e84e10c4..c7866ac1 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -9,7 +9,7 @@ Subject: Modify default preferences 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/signin/signin_promo.cc | 2 +- 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 ---- @@ -19,12 +19,12 @@ Subject: Modify default preferences 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(-) + 16 files changed, 22 insertions(+), 40 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 +++ b/chrome/browser/background/background_mode_manager.cc -@@ -351,7 +351,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -352,7 +352,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif @@ -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 -@@ -1098,7 +1098,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1121,7 +1121,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -72,7 +72,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc -@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -139,7 +139,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -96,13 +96,11 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc -@@ -291,8 +291,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) { +@@ -172,7 +172,7 @@ bool IsAutoCloseEnabledInEmbeddedURL(const GURL& url) { + void RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0); -- registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false); - registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true); -+ registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true); + registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false); registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false); registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0); @@ -127,7 +125,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc --- a/chrome/browser/ui/navigation_correction_tab_observer.cc +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc -@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() { +@@ -57,7 +57,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() { void NavigationCorrectionTabObserver::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* prefs) { prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, @@ -165,7 +163,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc --- a/components/autofill/core/browser/autofill_manager.cc +++ b/components/autofill/core/browser/autofill_manager.cc -@@ -356,10 +356,7 @@ bool AutofillManager::ShouldParseForms(const std::vector& forms, +@@ -359,10 +359,7 @@ bool AutofillManager::ShouldParseForms(const std::vector& forms, bool enabled = IsAutofillEnabled(); sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState() : AutofillSyncSigninState::kNumSyncStates; @@ -177,7 +175,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a return enabled; } -@@ -627,10 +624,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl( +@@ -625,10 +622,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl( // suggestions available. // TODO(mathp): Differentiate between number of suggestions available // (current metric) and number shown to the user. @@ -189,7 +187,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a } } -@@ -1237,8 +1231,8 @@ void AutofillManager::Reset() { +@@ -1234,8 +1228,8 @@ void AutofillManager::Reset() { #if defined(OS_ANDROID) || defined(OS_IOS) autofill_assistant_.Reset(); #endif diff --git a/build/patches/Never-send-any-crash-upload-data.patch b/build/patches/Never-send-any-crash-upload-data.patch index 4e6fa949..99df4ad8 100644 --- a/build/patches/Never-send-any-crash-upload-data.patch +++ b/build/patches/Never-send-any-crash-upload-data.patch @@ -9,7 +9,7 @@ Subject: Never send any crash upload data diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc --- a/chrome/browser/tracing/crash_service_uploader.cc +++ b/chrome/browser/tracing/crash_service_uploader.cc -@@ -126,6 +126,9 @@ void TraceCrashServiceUploader::DoUpload( +@@ -127,6 +127,9 @@ void TraceCrashServiceUploader::DoUpload( std::unique_ptr metadata, const UploadProgressCallback& progress_callback, UploadDoneCallback done_callback) { diff --git a/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch b/build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch index 9dba4eda..76a5cadd 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 -@@ -235,6 +235,8 @@ std::vector +@@ -234,6 +234,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 338dbb43..34dcc84d 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 -@@ -401,6 +401,13 @@ public class ExternalNavigationHandler { +@@ -400,6 +400,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 36c166dd..329e7c3b 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 -@@ -518,7 +518,7 @@ void ChromeContentClient::AddContentDecryptionModules( +@@ -521,7 +521,7 @@ void ChromeContentClient::AddContentDecryptionModules( base::FilePath cdm_path; content::CdmCapability capability; if (IsWidevineAvailable(&cdm_path, &capability)) { diff --git a/build/patches/Remove-Sync-and-Translate-menu.patch b/build/patches/Remove-Sync-and-Translate-menu.patch index 70a728c0..b7b1c502 100644 --- a/build/patches/Remove-Sync-and-Translate-menu.patch +++ b/build/patches/Remove-Sync-and-Translate-menu.patch @@ -177,7 +177,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web } else { // If both Autoplay and Protected Content menus are available, they'll be tucked under // the Media key. Otherwise, we can remove the Media menu entry. -@@ -108,11 +106,6 @@ public class SiteSettingsPreferences extends PreferenceFragment +@@ -105,11 +103,6 @@ public class SiteSettingsPreferences extends PreferenceFragment if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) { getPreferenceScreen().removePreference(findPreference(Type.CLIPBOARD)); } @@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web if (!ChromeFeatureList.isEnabled(ChromeFeatureList.GENERIC_SENSOR_EXTRA_CLASSES)) { getPreferenceScreen().removePreference(findPreference(Type.SENSORS)); } -@@ -122,10 +115,6 @@ public class SiteSettingsPreferences extends PreferenceFragment +@@ -119,10 +112,6 @@ public class SiteSettingsPreferences extends PreferenceFragment private void updatePreferenceStates() { PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance(); @@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web // Preferences that navigate to Website Settings. List websitePrefs = new ArrayList(); if (mMediaSubMenu) { -@@ -142,7 +131,7 @@ public class SiteSettingsPreferences extends PreferenceFragment +@@ -139,7 +128,7 @@ public class SiteSettingsPreferences extends PreferenceFragment if (!mProtectedContentMenuAvailable) { websitePrefs.add(Type.AUTOPLAY); } @@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web websitePrefs.add(Type.CAMERA); if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) { websitePrefs.add(Type.CLIPBOARD); -@@ -241,11 +230,4 @@ public class SiteSettingsPreferences extends PreferenceFragment +@@ -236,11 +225,4 @@ public class SiteSettingsPreferences extends PreferenceFragment preference.getTitle().toString()); return false; } diff --git a/build/patches/Remove-help-menu-item.patch b/build/patches/Remove-help-menu-item.patch index 7d9af617..2276a725 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 -@@ -2165,15 +2165,6 @@ public abstract class ChromeActivity +@@ -2177,15 +2177,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 -@@ -865,7 +865,7 @@ public class CustomTabActivity extends ChromeActivity diff --git a/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch b/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch index 7a0098db..d8983fc5 100644 --- a/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch +++ b/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch @@ -10,7 +10,6 @@ This reverts commit 9a48587dbd1988cf5066b454e7d09ae35d124366. build/android/AndroidManifest.xml | 2 +- build/android/gradle/android.jinja | 2 +- chrome/android/BUILD.gn | 8 ++++---- - chrome/android/java/res/layout/autofill_local_card_editor.xml | 4 ++-- .../test/android/chrome_public_test_support/AndroidManifest.xml | 2 +- components/cronet/android/sample/AndroidManifest.xml | 3 +-- components/cronet/android/sample/javatests/AndroidManifest.xml | 3 +-- @@ -30,8 +29,8 @@ This reverts commit 9a48587dbd1988cf5066b454e7d09ae35d124366. testing/android/driver/java/AndroidManifest.xml | 2 +- testing/android/native_test/java/AndroidManifest.xml.jinja2 | 2 +- tools/android/audio_focus_grabber/java/AndroidManifest.xml | 2 +- - tools/android/push_apps_to_background/AndroidManifest.xml | 2 +- - 27 files changed, 31 insertions(+), 35 deletions(-) + tools/android/push_apps_to_background/AndroidManifest.xml | 4 ++-- + 26 files changed, 30 insertions(+), 34 deletions(-) diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml b/android_webview/test/embedded_test_server/java/AndroidManifest.xml --- a/android_webview/test/embedded_test_server/java/AndroidManifest.xml @@ -41,7 +40,7 @@ diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml package="org.chromium.android_webview.test.support"> - -+ ++ @@ -53,7 +52,7 @@ diff --git a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml b android:versionName="1.0" > - -+ ++ @@ -65,7 +64,7 @@ diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_g - -+ ++ @@ -77,7 +76,7 @@ diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.x package="org.dummy"> - -+ ++ diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja @@ -88,70 +87,49 @@ diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.j defaultConfig { vectorDrawables.useSupportLibrary = true - minSdkVersion 19 -+ minSdkVersion 16 ++ minSdkVersion 17 targetSdkVersion {{ target_sdk_version }} } diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -68,7 +68,7 @@ jinja_template("chrome_public_android_manifest") { +@@ -65,7 +65,7 @@ jinja_template("chrome_public_android_manifest") { output = chrome_public_android_manifest variables = chrome_public_jinja_variables variables += [ - "min_sdk_version=19", -+ "min_sdk_version=16", ++ "min_sdk_version=17", "target_sdk_version=$android_sdk_version", ] -@@ -1459,7 +1459,7 @@ template("chrome_public_apk_or_module_tmpl") { +@@ -1554,7 +1554,7 @@ template("chrome_public_apk_or_module_tmpl") { android_manifest = chrome_modern_public_android_manifest android_manifest_dep = ":chrome_modern_public_android_manifest" } else { - min_sdk_version = 19 -+ min_sdk_version = 16 ++ min_sdk_version = 17 android_manifest = chrome_public_android_manifest android_manifest_dep = ":chrome_public_android_manifest" } -@@ -1646,7 +1646,7 @@ jinja_template("chrome_public_test_apk_manifest") { +@@ -1777,7 +1777,7 @@ jinja_template("chrome_public_test_apk_manifest") { variables = default_chrome_public_jinja_variables variables += [ "manifest_package=$test_manifest_package", - "min_sdk_version=19", -+ "min_sdk_version=16", ++ "min_sdk_version=17", "target_sdk_version=$android_sdk_version", ] } -@@ -1657,7 +1657,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") { +@@ -1788,7 +1788,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") { output = chrome_public_test_vr_apk_manifest variables = chrome_public_jinja_variables variables += [ - "min_sdk_version=19", -+ "min_sdk_version=16", ++ "min_sdk_version=17", "target_sdk_version=$android_sdk_version", ] } -diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml ---- a/chrome/android/java/res/layout/autofill_local_card_editor.xml -+++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml -@@ -19,7 +19,7 @@ - - - - - -+ ++ - -+ ++ @@ -236,7 +214,7 @@ diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b package="org.chromium.content_browsertests_apk"> - -+ ++ @@ -248,7 +226,7 @@ diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell - -+ ++ -@@ -1039,8 +997,6 @@ by a child template that "extends" this file. +@@ -1050,8 +1008,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 @@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL /** * Disables the automatic use of the GCMNetworkManager. When disabled, the methods which * interact with GCM can still be used, but will not be called automatically on creation, or by -@@ -124,30 +118,6 @@ public class BackgroundSyncLauncher { +@@ -123,30 +117,6 @@ public class BackgroundSyncLauncher { @VisibleForTesting @CalledByNative protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) { @@ -206,7 +206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL } /** -@@ -159,7 +129,6 @@ public class BackgroundSyncLauncher { +@@ -158,7 +128,6 @@ public class BackgroundSyncLauncher { } protected BackgroundSyncLauncher() { @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL launchBrowserIfStopped(false, 0); } -@@ -188,72 +157,6 @@ public class BackgroundSyncLauncher { +@@ -187,72 +156,6 @@ public class BackgroundSyncLauncher { return !sGCMEnabled; } @@ -310,22 +310,17 @@ 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; -@@ -192,18 +190,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat +@@ -193,13 +191,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat * Registers for Google Cloud Messaging (GCM) for Invalidations. */ private void ensureGcmIsInitialized() { - if (mGcmInitialized) return; mGcmInitialized = true; -- new AsyncTask() { -- @Override -- protected Void doInBackground() { -- boolean useGcmUpstream = true; -- AndroidGcmController.get(ContextUtils.getApplicationContext()) -- .initializeGcm(useGcmUpstream); -- return null; -- } -- } -- .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); +- PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> { +- boolean useGcmUpstream = true; +- AndroidGcmController.get(ContextUtils.getApplicationContext()) +- .initializeGcm(useGcmUpstream); +- }); } @VisibleForTesting @@ -445,8 +440,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService; import org.chromium.base.ContextUtils; -@@ -93,20 +92,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { - * This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR. +@@ -87,20 +86,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { + * This function runs on a thread pool executor thread. */ private void sendUpstreamMessage(String to, Bundle data, String token, Context context) { - // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it. @@ -476,8 +471,8 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni - "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java", "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", - "java/src/org/chromium/chrome/browser/ChromeFeatureList.java", -@@ -1447,7 +1446,6 @@ chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java", +@@ -1385,7 +1384,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", @@ -604,11 +599,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/ - @TaskInfo.NetworkType int networkType) { - switch (networkType) { - // This is correct: GcmNM ANY means no network is guaranteed. -- case TaskInfo.NETWORK_TYPE_NONE: +- case TaskInfo.NetworkType.NONE: - return Task.NETWORK_STATE_ANY; -- case TaskInfo.NETWORK_TYPE_ANY: +- case TaskInfo.NetworkType.ANY: - return Task.NETWORK_STATE_CONNECTED; -- case TaskInfo.NETWORK_TYPE_UNMETERED: +- case TaskInfo.NetworkType.UNMETERED: - return Task.NETWORK_STATE_UNMETERED; - default: - assert false; diff --git a/build/patches/kill-Location-fall-back-to-system.patch b/build/patches/kill-Location-fall-back-to-system.patch index 445c4b7f..63f2f5c6 100644 --- a/build/patches/kill-Location-fall-back-to-system.patch +++ b/build/patches/kill-Location-fall-back-to-system.patch @@ -10,7 +10,7 @@ Subject: kill Location, fall back to system diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn --- a/services/device/geolocation/BUILD.gn +++ b/services/device/geolocation/BUILD.gn -@@ -134,7 +134,6 @@ if (is_android) { +@@ -137,7 +137,6 @@ if (is_android) { "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java", "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java", "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java", diff --git a/build/patches/kill-TOS-and-metrics-opt-out.patch b/build/patches/kill-TOS-and-metrics-opt-out.patch index dc3c2857..9110fe39 100644 --- a/build/patches/kill-TOS-and-metrics-opt-out.patch +++ b/build/patches/kill-TOS-and-metrics-opt-out.patch @@ -23,7 +23,7 @@ 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 -@@ -184,7 +184,6 @@ +@@ -192,7 +192,6 @@ 12dp 24dp 120dp diff --git a/build/patches/kill-Vision.patch b/build/patches/kill-Vision.patch index d746bce9..3be6e321 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 -@@ -85,14 +85,10 @@ if (is_android) { +@@ -84,14 +84,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 01ebe2a1..b0037d22 100644 --- a/build/patches/openH264-enable-ARM-ARM64-optimizations.patch +++ b/build/patches/openH264-enable-ARM-ARM64-optimizations.patch @@ -12,7 +12,7 @@ Limit threads auto-detect only for iOS 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 +++ b/content/renderer/media_recorder/h264_encoder.cc -@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { +@@ -150,11 +150,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { init_params.iRCMode = RC_OFF_MODE; } diff --git a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch b/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch index f686bf9a..f60e7d77 100644 --- a/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch +++ b/build/patches/profile-resetter-do-not-tick-send-settings-by-default.patch @@ -16,7 +16,7 @@ any information. diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc --- a/chrome/browser/profile_resetter/reset_report_uploader.cc +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ namespace { const char kResetReportUrl[] = diff --git a/build/patches/promo-disable-Google-promotion-fetching.patch b/build/patches/promo-disable-Google-promotion-fetching.patch index e8294075..702da4d0 100644 --- a/build/patches/promo-disable-Google-promotion-fetching.patch +++ b/build/patches/promo-disable-Google-promotion-fetching.patch @@ -22,14 +22,14 @@ References: https://github.com/iridium-browser/iridium-browser/issues/33 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc -@@ -86,6 +86,7 @@ const char kSigninPromoLandingURLSuccessPage[] = "success.html"; - - bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) { - DCHECK(profile); +@@ -86,6 +86,7 @@ GURL GetEmbeddedPromoURL(signin_metrics::AccessPoint access_point, + url = net::AppendQueryParameter(url, signin::kSignInPromoQueryKeyAutoClose, + "1"); + } + return false; + return url; + } - // Don't show if the profile is an incognito. - if (profile->IsOffTheRecord()) -- 2.11.0 diff --git a/build/patches/safe_browsing-disable-cookie-transmission.patch b/build/patches/safe_browsing-disable-cookie-transmission.patch index 5398cd63..fa88876a 100644 --- a/build/patches/safe_browsing-disable-cookie-transmission.patch +++ b/build/patches/safe_browsing-disable-cookie-transmission.patch @@ -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 -@@ -761,7 +761,7 @@ void CheckClientDownloadRequest::SendRequest() { +@@ -772,7 +772,7 @@ void CheckClientDownloadRequest::SendRequest() { auto resource_request = std::make_unique(); resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl(); resource_request->method = "POST"; @@ -50,7 +50,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_downl diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc --- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc -@@ -250,7 +250,7 @@ void PPAPIDownloadRequest::SendRequest() { +@@ -251,7 +251,7 @@ void PPAPIDownloadRequest::SendRequest() { auto resource_request = std::make_unique(); resource_request->url = GetDownloadRequestUrl(); resource_request->method = "POST"; @@ -73,7 +73,7 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc --- a/components/safe_browsing/db/v4_update_protocol_manager.cc +++ b/components/safe_browsing/db/v4_update_protocol_manager.cc -@@ -343,8 +343,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() { +@@ -344,8 +344,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() { std::string req_base64 = GetBase64SerializedUpdateRequestProto(); GetUpdateUrlAndHeaders(req_base64, &resource_request->url, &resource_request->headers); diff --git a/build/patches/safe_browsing-disable-incident-reporting.patch b/build/patches/safe_browsing-disable-incident-reporting.patch index d67282e2..0453e1f7 100644 --- a/build/patches/safe_browsing-disable-incident-reporting.patch +++ b/build/patches/safe_browsing-disable-incident-reporting.patch @@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future). diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc --- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc -@@ -22,7 +22,7 @@ namespace safe_browsing { +@@ -23,7 +23,7 @@ namespace safe_browsing { namespace { const char kSbIncidentReportUrl[] = @@ -28,7 +28,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_upl diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -310,11 +310,14 @@ IncidentReportingService::UploadContext::~UploadContext() { +@@ -311,11 +311,14 @@ IncidentReportingService::UploadContext::~UploadContext() { // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { 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 bb1ed358..a9ff51ac 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 -@@ -1258,10 +1258,8 @@ action("generate_devtools_grd") { +@@ -1265,10 +1265,8 @@ action("generate_devtools_grd") { devtools_embedder_scripts + [ "$resources_out_dir/devtools_extension_api.js" ] diff --git a/build/patches/ungoogled-chromium-Disable-Gaia.patch b/build/patches/ungoogled-chromium-Disable-Gaia.patch index e3424446..ad291d1d 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 -@@ -384,7 +384,6 @@ +@@ -396,7 +396,6 @@ @@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou -@@ -487,7 +486,6 @@ +@@ -496,7 +495,6 @@ @@ -37,7 +37,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc -@@ -67,7 +67,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) { +@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) { #endif case IDR_CRYPTOTOKEN_MANIFEST: case IDR_FEEDBACK_MANIFEST: @@ -48,7 +48,7 @@ diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist. diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc --- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc +++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc -@@ -42,7 +42,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) { +@@ -43,7 +43,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) { void LoadGaiaAuthExtension(BrowserContext* context) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -57,7 +57,7 @@ diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/ch ComponentLoader* component_loader = GetComponentLoader(context); const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -@@ -55,6 +55,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) { +@@ -56,6 +56,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) { component_loader->Add(IDR_GAIA_AUTH_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gaia_auth"))); @@ -80,7 +80,7 @@ diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc -@@ -49,7 +49,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { +@@ -51,7 +51,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS); source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS); @@ -91,7 +91,7 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc --- a/google_apis/gaia/gaia_auth_fetcher.cc +++ b/google_apis/gaia/gaia_auth_fetcher.cc -@@ -44,7 +44,7 @@ namespace { +@@ -45,7 +45,7 @@ namespace { const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; @@ -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) { -@@ -260,6 +260,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -261,6 +261,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; -@@ -314,6 +315,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( +@@ -315,6 +316,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 dcbf3b5a..5454a659 100644 --- a/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch +++ b/build/patches/ungoogled-chromium-Disable-Google-host-detection.patch @@ -323,11 +323,11 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co + return false; } - const std::vector& GetGoogleRegistrableDomains() { + bool IsGoogleAssociatedDomainUrl(const GURL& url) { diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc --- a/components/search_engines/template_url.cc +++ b/components/search_engines/template_url.cc -@@ -504,11 +504,7 @@ base::string16 TemplateURLRef::SearchTermToString16( +@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTermToString16( bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); @@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin diff --git a/net/base/url_util.cc b/net/base/url_util.cc --- a/net/base/url_util.cc +++ b/net/base/url_util.cc -@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url, +@@ -392,28 +392,6 @@ void GetIdentityFromURL(const GURL& url, } bool HasGoogleHost(const GURL& url) { diff --git a/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch b/build/patches/ungoogled-chromium-Disable-profile-avatar-downloading.patch index 8bdd94fa..62f684f3 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 -@@ -1289,8 +1289,6 @@ jumbo_split_static_library("browser") { +@@ -1364,8 +1364,6 @@ jumbo_split_static_library("browser") { "profiles/profile_attributes_entry.h", "profiles/profile_attributes_storage.cc", "profiles/profile_attributes_storage.h", diff --git a/build/patches/ungoogled-chromium-disable-safe-browsing.patch b/build/patches/ungoogled-chromium-Disable-safe-browsing.patch similarity index 90% rename from build/patches/ungoogled-chromium-disable-safe-browsing.patch rename to build/patches/ungoogled-chromium-Disable-safe-browsing.patch index f83a81b9..3e36bd80 100644 --- a/build/patches/ungoogled-chromium-disable-safe-browsing.patch +++ b/build/patches/ungoogled-chromium-Disable-safe-browsing.patch @@ -1,33 +1,33 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Tue, 16 Oct 2018 05:22:59 +0200 -Subject: ungoogled-chromium: disable safe browsing +Subject: ungoogled-chromium: Disable safe browsing --- chrome/browser/BUILD.gn | 2 - chrome/browser/browser_process.h | 16 ----- chrome/browser/browser_process_impl.cc | 29 --------- chrome/browser/browser_process_impl.h | 6 -- - .../chrome_browsing_data_remover_delegate.cc | 29 --------- + .../chrome_browsing_data_remover_delegate.cc | 30 --------- chrome/browser/chrome_content_browser_client.cc | 32 +--------- .../file_type_policies_component_installer.cc | 14 ----- - .../download/chrome_download_manager_delegate.cc | 17 ----- + .../download/chrome_download_manager_delegate.cc | 17 ------ chrome/browser/download/download_item_model.cc | 3 - chrome/browser/download/download_prefs.cc | 13 +--- - .../browser/download/download_target_determiner.cc | 24 +------ + .../browser/download/download_target_determiner.cc | 24 +------- .../extensions/api/downloads/downloads_api.cc | 39 +----------- .../extensions/api/downloads/downloads_api.h | 10 --- - .../api/webstore_private/webstore_private_api.cc | 43 +------------ - .../browser/extensions/blacklist_state_fetcher.cc | 34 ++-------- + .../api/webstore_private/webstore_private_api.cc | 44 +------------- + .../browser/extensions/blacklist_state_fetcher.cc | 34 ++--------- .../browser/extensions/blacklist_state_fetcher.h | 3 - - .../chrome_resource_dispatcher_host_delegate.cc | 7 +-- + .../chrome_resource_dispatcher_host_delegate.cc | 5 +- .../metrics/chrome_metrics_service_client.cc | 3 - - .../browser/net/trial_comparison_cert_verifier.cc | 3 - + .../trial_comparison_cert_verifier_controller.cc | 3 - .../chrome_browser_main_extra_parts_profiles.cc | 1 - chrome/browser/profiles/profile_impl.cc | 14 +---- chrome/browser/safe_browsing/BUILD.gn | 2 + chrome/browser/ssl/captive_portal_blocking_page.cc | 7 +-- chrome/browser/ssl/cert_report_helper.cc | 2 - - chrome/browser/ssl/security_state_tab_helper.cc | 73 ---------------------- + chrome/browser/ssl/security_state_tab_helper.cc | 71 ---------------------- .../chrome_subresource_filter_client.cc | 14 ----- chrome/browser/ui/BUILD.gn | 1 - chrome/browser/ui/tab_helpers.cc | 22 +++---- @@ -35,12 +35,12 @@ Subject: ungoogled-chromium: disable safe browsing chrome/renderer/chrome_content_renderer_client.cc | 1 - components/safe_browsing/features.cc | 2 +- .../core/browser/subresource_filter_features.cc | 2 +- - 32 files changed, 33 insertions(+), 446 deletions(-) + 32 files changed, 32 insertions(+), 445 deletions(-) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2696,8 +2696,6 @@ jumbo_split_static_library("browser") { +@@ -2800,8 +2800,6 @@ jumbo_split_static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -175,7 +175,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc 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 -@@ -628,35 +628,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( +@@ -646,36 +646,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData( CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(), website_settings_filter); @@ -202,9 +202,10 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate. - - manager_ptr->DeleteCookies( - std::move(deletion_filter), -- base::BindOnce(&OnClearedCookies, -- CreatePendingTaskCompletionClosure(), -- std::move(cookie_manager))); +- base::BindOnce( +- &OnClearedCookies, +- CreateTaskCompletionClosure(TracingDataType::kCookies), +- std::move(cookie_manager))); - } - } - @@ -214,7 +215,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 -@@ -853,30 +853,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { +@@ -860,30 +860,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) { GetIOThreadApplicationLocale() = locale; } @@ -245,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; -@@ -2052,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( +@@ -2089,7 +2065,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) || @@ -254,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch command_line->AppendSwitch( switches::kDisableClientSidePhishingDetection); } -@@ -2747,7 +2723,7 @@ void ChromeContentBrowserClient::AllowCertificateError( +@@ -2718,7 +2694,7 @@ void ChromeContentBrowserClient::AllowCertificateError( SSLErrorHandler::HandleSSLError( web_contents, cert_error, ssl_info, request_url, expired_previous_decision, @@ -263,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch callback, SSLErrorHandler::BlockingPageReadyCallback()); } -@@ -3030,8 +3006,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( +@@ -3003,8 +2979,6 @@ bool ChromeContentBrowserClient::CanCreateWindow( void ChromeContentBrowserClient::ResourceDispatcherHostCreated() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -272,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(); -@@ -4250,7 +4224,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( +@@ -4242,7 +4216,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation( if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) { throttles.push_back(std::make_unique( handle, @@ -308,7 +309,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -322,13 +322,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() { +@@ -327,13 +327,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() { void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -322,7 +323,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom } #if defined(OS_ANDROID) -@@ -636,16 +629,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( +@@ -644,16 +637,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( base::FilePath* filename) { @@ -385,7 +386,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -988,29 +988,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1028,29 +1028,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -427,7 +428,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1304,9 +1303,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} +@@ -1305,9 +1304,6 @@ DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {} DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -437,7 +438,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b bool DownloadsAcceptDangerFunction::RunAsync() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(*args_)); -@@ -1344,40 +1340,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { +@@ -1345,40 +1341,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) { return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -487,9 +488,9 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br #include "base/scoped_observer.h" #include "base/time/time.h" -#include "chrome/browser/download/download_danger_prompt.h" - #include "chrome/browser/download/download_path_reservation_tracker.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/common/extensions/api/downloads.h" + #include "components/download/content/public/all_download_item_notifier.h" @@ -189,25 +188,16 @@ class DownloadsRemoveFileFunction : public ChromeAsyncExtensionFunction { class DownloadsAcceptDangerFunction : public ChromeAsyncExtensionFunction { @@ -519,18 +520,21 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -682,48 +682,7 @@ WebstorePrivateGetReferrerChainFunction:: +@@ -681,51 +681,9 @@ WebstorePrivateGetReferrerChainFunction:: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { - Profile* profile = chrome_details_.GetProfile(); - if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) -- return RespondNow(ArgumentList(GetReferrerChain::Results::Create(""))); +- return RespondNow(ArgumentList( +- api::webstore_private::GetReferrerChain::Results::Create(""))); - - content::WebContents* web_contents = GetSenderWebContents(); - if (!web_contents) { -- return RespondNow(ErrorWithArguments(GetReferrerChain::Results::Create(""), -- kWebstoreUserCancelledError)); +- return RespondNow(ErrorWithArguments( ++ return RespondNow(ErrorWithArguments( + api::webstore_private::GetReferrerChain::Results::Create(""), + kWebstoreUserCancelledError)); - } - - scoped_refptr @@ -563,16 +567,16 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api - // Base64 encode the proto to avoid issues with base::Value rejecting strings - // which are not valid UTF8. - base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto); -- return RespondNow(ArgumentList( -- GetReferrerChain::Results::Create(serialized_referrer_proto))); -+ return RespondNow(ArgumentList(GetReferrerChain::Results::Create(""))); +- return RespondNow( +- ArgumentList(api::webstore_private::GetReferrerChain::Results::Create( +- serialized_referrer_proto))); } } // namespace extensions diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc --- a/chrome/browser/extensions/blacklist_state_fetcher.cc +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc -@@ -31,28 +31,9 @@ BlacklistStateFetcher::~BlacklistStateFetcher() { +@@ -32,28 +32,9 @@ BlacklistStateFetcher::~BlacklistStateFetcher() { void BlacklistStateFetcher::Request(const std::string& id, const RequestCallback& callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -604,7 +608,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/brows } void BlacklistStateFetcher::SendRequest(const std::string& id) { -@@ -63,8 +44,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) { +@@ -64,8 +45,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) { std::string request_str; request.SerializeToString(&request_str); @@ -614,7 +618,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/brows net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( semantics { -@@ -111,12 +91,6 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) { +@@ -112,12 +92,6 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) { base::Unretained(this), fetcher)); } @@ -650,7 +654,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 -@@ -290,8 +290,7 @@ void NotifyUIThreadOfRequestComplete( +@@ -289,8 +289,7 @@ void NotifyUIThreadOfRequestComplete( } // namespace ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate() @@ -660,7 +664,7 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() { #if BUILDFLAG(ENABLE_EXTENSIONS) -@@ -305,8 +304,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( +@@ -304,8 +303,6 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning( content::AppCacheService* appcache_service, ResourceType resource_type, std::vector>* throttles) { @@ -669,19 +673,10 @@ 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) -@@ -410,7 +407,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles( - content::ResourceThrottle* first_throttle = NULL; - #if defined(OS_ANDROID) - first_throttle = DataReductionProxyResourceThrottle::MaybeCreate( -- request, resource_context, resource_type, safe_browsing_.get()); -+ request, resource_context, resource_type, nullptr); - #endif // defined(OS_ANDROID) - - #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE) 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 -@@ -714,9 +714,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { +@@ -718,9 +718,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() { metrics_service_->RegisterMetricsProvider( std::make_unique()); @@ -691,23 +686,23 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) metrics_service_->RegisterMetricsProvider( std::make_unique()); -diff --git a/chrome/browser/net/trial_comparison_cert_verifier.cc b/chrome/browser/net/trial_comparison_cert_verifier.cc ---- a/chrome/browser/net/trial_comparison_cert_verifier.cc -+++ b/chrome/browser/net/trial_comparison_cert_verifier.cc -@@ -80,9 +80,6 @@ void SendTrialVerificationReport(void* profile_id, +diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc ++++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +@@ -112,9 +112,6 @@ void TrialComparisonCertVerifierController::SendTrialReport( std::string serialized_report; if (!report.Serialize(&serialized_report)) return; - -- CertificateReportingServiceFactory::GetForBrowserContext(profile)->Send( +- CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send( - serialized_report); } - std::unique_ptr TrialVerificationJobResultCallback( + // static 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 -@@ -239,7 +239,6 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -237,7 +237,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalServiceFactory::GetInstance(); #endif @@ -718,7 +713,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 -@@ -589,18 +589,6 @@ ProfileImpl::ProfileImpl( +@@ -563,18 +563,6 @@ ProfileImpl::ProfileImpl( create_mode == CREATE_MODE_SYNCHRONOUS); #endif @@ -737,7 +732,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p content::BrowserContext::Initialize(this, path_); { -@@ -609,7 +597,7 @@ ProfileImpl::ProfileImpl( +@@ -583,7 +571,7 @@ ProfileImpl::ProfileImpl( ->CreateDelegate(); delegate->InitPrefRegistry(pref_registry_.get()); prefs_ = chrome_prefs::CreateProfilePrefs( @@ -749,15 +744,15 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -6,6 +6,7 @@ import("//extensions/buildflags/buildflags.gni") - import("//third_party/protobuf/proto_library.gni") +@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni") + import("//extensions/buildflags/buildflags.gni") - static_library("safe_browsing") { + jumbo_static_library("safe_browsing") { + if (false) { sources = [ "safe_browsing_controller_client.cc", "safe_browsing_controller_client.h", -@@ -100,6 +101,7 @@ static_library("safe_browsing") { +@@ -100,6 +101,7 @@ jumbo_static_library("safe_browsing") { } else { sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ] } @@ -804,7 +799,7 @@ diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_ 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 -@@ -186,79 +186,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const { +@@ -186,77 +186,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const { security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -860,9 +855,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss - return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; -#endif - case safe_browsing::SB_THREAT_TYPE_BILLING: -- return base::FeatureList::IsEnabled(safe_browsing::kBillingInterstitial) -- ? security_state::MALICIOUS_CONTENT_STATUS_BILLING -- : security_state::MALICIOUS_CONTENT_STATUS_NONE; +- return security_state::MALICIOUS_CONTENT_STATUS_BILLING; - case safe_browsing:: - DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING: - case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE: @@ -911,7 +904,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 -@@ -2463,7 +2463,6 @@ jumbo_split_static_library("ui") { +@@ -2461,7 +2461,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 +915,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 -@@ -44,8 +44,8 @@ +@@ -47,8 +47,8 @@ #include "chrome/browser/previews/resource_loading_hints/resource_loading_hints_web_contents_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resource_coordinator/tab_helper.h" @@ -933,7 +926,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ssl/connection_help_tab_helper.h" #include "chrome/browser/ssl/security_state_tab_helper.h" -@@ -105,7 +105,7 @@ +@@ -106,7 +106,7 @@ #else #include "chrome/browser/banners/app_banner_manager_desktop.h" #include "chrome/browser/plugins/plugin_observer.h" @@ -942,7 +935,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/hung_plugin_tab_helper.h" #include "chrome/browser/ui/sad_tab_helper.h" -@@ -200,10 +200,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -201,10 +201,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( web_contents, autofill::ChromeAutofillClient::FromWebContents(web_contents)); @@ -957,7 +950,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc ChromeTranslateClient::CreateForWebContents(web_contents); ClientHintsObserver::CreateForWebContents(web_contents); ConnectionHelpTabHelper::CreateForWebContents(web_contents); -@@ -243,10 +243,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -244,10 +244,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { PreviewsUITabHelper::CreateForWebContents(web_contents); RecentlyAudibleHelper::CreateForWebContents(web_contents); ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents); @@ -970,8 +963,8 @@ 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()) -@@ -299,7 +297,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { - new ChromePDFWebContentsHelperClient())); +@@ -297,7 +295,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { + web_contents, std::make_unique()); PluginObserver::CreateForWebContents(web_contents); SadTabHelper::CreateForWebContents(web_contents); - safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents); @@ -982,15 +975,15 @@ 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 -@@ -250,6 +250,7 @@ BadClockBlockingPage* CreateBadClockBlockingPage( - base::Callback()); +@@ -267,6 +267,7 @@ LookalikeUrlInterstitialPage* CreateLookalikeInterstitialPage( + safe_url)); } +#if 0 safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( content::WebContents* web_contents) { safe_browsing::SBThreatType threat_type = -@@ -308,7 +309,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( +@@ -325,7 +326,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage( g_browser_process->safe_browsing_service()->ui_manager().get(), web_contents, main_frame_url, resource); } @@ -1000,7 +993,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 = -@@ -360,6 +363,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( +@@ -377,6 +380,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage( g_browser_process->safe_browsing_service()->ui_manager().get(), web_contents, main_frame_url, resource, is_giant_webview); } @@ -1008,7 +1001,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( -@@ -460,8 +464,6 @@ void InterstitialHTMLSource::StartDataRequest( +@@ -484,8 +488,6 @@ void InterstitialHTMLSource::StartDataRequest( interstitial_delegate.reset(CreateSSLBlockingPage(web_contents)); } else if (path_without_query == "/mitm-software-ssl") { interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents)); @@ -1016,8 +1009,8 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b - interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents)); } else if (path_without_query == "/clock") { interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents)); - #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) -@@ -472,11 +474,6 @@ void InterstitialHTMLSource::StartDataRequest( + } else if (path_without_query == "/lookalike") { +@@ -501,11 +503,6 @@ void InterstitialHTMLSource::StartDataRequest( if (path_without_query == "/supervised_user") { html = GetSupervisedUserInterstitialHTML(path); @@ -1032,7 +1025,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b 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 -@@ -81,7 +81,6 @@ +@@ -84,7 +84,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" @@ -1043,7 +1036,7 @@ 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 -@@ -44,7 +44,7 @@ const base::Feature kForceEnableResetPasswordWebUI{ +@@ -39,7 +39,7 @@ const base::Feature kForceEnableResetPasswordWebUI{ "ForceEnableResetPasswordWebUI", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSuspiciousSiteTriggerQuotaFeature{ @@ -1055,7 +1048,7 @@ diff --git a/components/safe_browsing/features.cc b/components/safe_browsing/fea diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc --- a/components/subresource_filter/core/browser/subresource_filter_features.cc +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc -@@ -230,7 +230,7 @@ base::LazyInstance>::Leaky +@@ -231,7 +231,7 @@ base::LazyInstance>::Leaky // Constant definitions ------------------------------------------------------- const base::Feature kSafeBrowsingSubresourceFilter{ diff --git a/build/patches/ungoogled-chromium-Disable-translate-integration.patch b/build/patches/ungoogled-chromium-Disable-translate-integration.patch index bf3e0549..86ddde99 100644 --- a/build/patches/ungoogled-chromium-Disable-translate-integration.patch +++ b/build/patches/ungoogled-chromium-Disable-translate-integration.patch @@ -10,9 +10,9 @@ Subject: ungoogled-chromium: Disable translate integration 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 -@@ -664,8 +664,9 @@ void TranslateManager::FilterIsTranslatePossible( - if (net::NetworkChangeNotifier::IsOffline()) - decision->PreventAllTriggering(); +@@ -704,8 +704,9 @@ void TranslateManager::FilterIsTranslatePossible( + TranslateBrowserMetrics::INITIATION_STATUS_NO_NETWORK); + } - if (!ignore_missing_key_for_testing_ && - !::google_apis::HasAPIKeyConfigured()) { diff --git a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch index a3ffa5a8..7e233c28 100644 --- a/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch @@ -16,7 +16,7 @@ Disable additional URLs that are not caught by the "trk" scheme diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc --- a/chrome/browser/android/rlz/rlz_ping_handler.cc +++ b/chrome/browser/android/rlz/rlz_ping_handler.cc -@@ -75,7 +75,7 @@ void RlzPingHandler::Ping( +@@ -76,7 +76,7 @@ void RlzPingHandler::Ping( DCHECK_EQ(id.length(), 50u); GURL request_url(base::StringPrintf( diff --git a/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch b/build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch index b9662c85..e253a086 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 -@@ -129,29 +129,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( +@@ -131,29 +131,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( DCHECK(meta_data.get()); DCHECK(!upload_done_data.log_path.empty()); @@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser } void WebRtcLogUploader::PrepareMultipartPostData( -@@ -162,6 +140,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( +@@ -164,6 +142,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); diff --git a/build/patches/updater-disable-updater-pings.patch b/build/patches/updater-disable-updater-pings.patch index abc1dd19..1c6b3451 100644 --- a/build/patches/updater-disable-updater-pings.patch +++ b/build/patches/updater-disable-updater-pings.patch @@ -30,7 +30,7 @@ diff --git a/components/component_updater/component_updater_url_constants.cc b/c 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 -@@ -48,8 +48,7 @@ ConfiguratorImpl::ConfiguratorImpl( +@@ -49,8 +49,7 @@ ConfiguratorImpl::ConfiguratorImpl( : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()), deltas_enabled_(config_policy.DeltaUpdatesEnabled()), fast_update_(config_policy.FastUpdate()), @@ -40,7 +40,7 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp url_source_override_(config_policy.UrlSourceOverride()), initial_delay_(config_policy.InitialDelay()) { if (config_policy.TestRequest()) { -@@ -88,8 +87,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { +@@ -89,8 +88,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { GURL(kUpdaterJSONFallbackUrl)} : std::vector{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)}; diff --git a/build/patches_list.txt b/build/patches_list.txt index e4cb25c8..cf7e12cc 100644 --- a/build/patches_list.txt +++ b/build/patches_list.txt @@ -13,7 +13,6 @@ promo-disable-Google-promotion-fetching.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 Do-not-store-passwords-by-default.patch Disable-NTP-remote-suggestions-by-default.patch Disable-references-to-fonts.googleapis.com.patch @@ -40,7 +39,7 @@ ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from- safe_browsing-disable-incident-reporting.patch safe_browsing-disable-reporting-of-safebrowsing-override.patch safe_browsing-disable-cookie-transmission.patch -ungoogled-chromium-disable-safe-browsing.patch +ungoogled-chromium-Disable-safe-browsing.patch Allow-building-without-safebrowsing-for-Android.patch Hide-passwords-manager-link.patch Disable-Omaha-update-checks.patch @@ -71,7 +70,6 @@ Add-flags-to-disable-device-motion-and-orientation-APIs.patch Punt-the-Widevine-version-string.patch Disable-metrics-on-all-I-O-threads.patch Add-a-flag-for-DNS-over-HTTPS.patch -Support-different-secure-DNS-modes-within-DnsTransaction.patch Enable-secure-DNS-mode-by-default-in-DnsTransaction.patch Always-respect-async-dns-flag-regardless-of-SDK-version.patch Add-flag-to-configure-maximum-connections-per-host.patch