From 32978e46589ee1f78c3c1b615dee11a410214bcb Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Wed, 5 Sep 2018 00:24:29 +0200 Subject: [PATCH] Release 69.0.3497.73 --- CHANGELOG.md | 6 +- filters/adblock_entries.h | 194 +++++++++++++++--- ...sable-third-party-cookies-by-default.patch | 2 +- ...ging-disable-experiment-status-check.patch | 24 +-- ...BRM005_updater-disable-updater-pings.patch | 20 +- ...6_prefs-only-keep-cookies-until-exit.patch | 2 +- ...mo-disable-Google-promotion-fetching.patch | 2 +- .../BRM010_Modify-default-preferences.patch | 35 +--- ...12_Do-not-store-passwords-by-default.patch | 2 +- ...le-NTP-remote-suggestions-by-default.patch | 2 +- ...RM017_Skip-the-first-run-and-metrics.patch | 36 ++-- ...le-signin-and-data-saver-preferences.patch | 104 ++++++---- ...Disable-signin-data-reduction-promos.patch | 4 +- ...RM020_Remove-Sync-and-Translate-menu.patch | 92 +++++++++ ...M020_Removed-Sync-and-Translate-menu.patch | 177 ---------------- .../BRM022_Hide-Send-reports-to-Google.patch | 2 +- ...24_ungoogled-chromium-Disable-signin.patch | 8 +- ...chromium-Disable-webRTC-log-uploader.patch | 4 +- ...ed-chromium-Disable-untraceable-URLs.patch | 6 +- ...romium-Disable-translate-integration.patch | 15 +- ...m-Disable-intranet-redirect-detector.patch | 2 +- ...romium-Disable-Google-host-detection.patch | 2 +- ...RM031_ungoogled-chromium-Disable-GCM.patch | 6 +- ...M032_ungoogled-chromium-Disable-Gaia.patch | 93 ++++----- ...-chromium-Clear-HTTP-cache-menu-item.patch | 165 --------------- ...chromium-Disable-domain-reliability.patch} | 0 ... BRM034_Disable-Omaha-update-checks.patch} | 2 +- ...BRM035_Add-DuckDuckGo-search-engine.patch} | 0 ... BRM036_Add-StartPage-search-engine.patch} | 6 +- ...M037_Add-Google-English-only-engine.patch} | 6 +- ...h => BRM038_Add-Qwant-search-engine.patch} | 21 +- ...n-accessing-page-info-site-settings.patch} | 2 +- ...H264-enable-ARM-ARM64-optimizations.patch} | 6 +- ...racking-ads-and-video-functionality.patch} | 20 +- ...2_Allow-playing-audio-in-background.patch} | 4 +- ...RM043_Open-YouTube-links-in-Bromite.patch} | 2 +- ....patch => BRM044_Add-exit-menu-item.patch} | 4 +- ...tch => BRM045_Remove-help-menu-item.patch} | 4 +- ...toggle-global-Javascript-preference.patch} | 54 +++-- ...ch => BRM047_Bromite-adblock-engine.patch} | 131 ++++++------ ...atch => BRM048_User-Agent-anonymize.patch} | 0 ...-fingerprinting-mitigations-via-IDL.patch} | 15 +- ...itigations-for-image-data-and-webGL.patch} | 4 +- ...eText-add-fingerprinting-mitigation.patch} | 14 +- ...52_Punt-the-Widevine-version-string.patch} | 10 +- ..._Disable-metrics-on-all-I-O-threads.patch} | 2 +- ...RM054_Add-a-flag-for-DNS-over-HTTPS.patch} | 84 ++++---- ...-dns-flag-regardless-of-SDK-version.patch} | 34 ++- ...figure-maximum-connections-per-host.patch} | 8 +- ...057_Add-flag-to-show-hide-NTP-tiles.patch} | 22 +- ...d-custom-tab-intents-privacy-option.patch} | 44 ++-- ...-to-keep-cookies-until-session-exit.patch} | 55 +++-- ..._Always-allow-partner-customisation.patch} | 0 ...ge-default-homepage-to-new-tab-page.patch} | 0 ...ions-in-bookmarks-activity-and-page.patch} | 18 +- ...to-not-persist-tabs-across-sessions.patch} | 24 +-- ...BRM064_Add-an-always-incognito-mode.patch} | 22 +- ...isable-fetching-of-all-field-trials.patch} | 4 +- ...6_Disable-smooth-scrolling-on-Linux.patch} | 0 ... BRM067_Disable-plugins-enumeration.patch} | 4 +- ...account-access-permission-on-reboot.patch} | 4 +- ...length-for-newly-generated-RSA-keys.patch} | 0 ...obes-to-RIPE-DNS-rather-than-Google.patch} | 2 +- ...o-not-tick-send-settings-by-default.patch} | 0 ...able-warning-about-missing-API-keys.patch} | 0 ...l-disable-autofill-download-manager.patch} | 39 ++-- ..._run-deactivate-autoupdate-globally.patch} | 2 +- ...browsing-disable-incident-reporting.patch} | 0 ...-reporting-of-safebrowsing-override.patch} | 8 +- ...rowsing-disable-cookie-transmission.patch} | 6 +- ...omponent-extensions-in-the-ext-list.patch} | 2 +- ...-of-translate-languages-from-server.patch} | 0 ...nt-suppress-hardcoded-text-warnings.patch} | 2 +- patches/BRM081_kill-Vision.patch | 156 ++++++++++++++ ...3_kill-GCM.patch => BRM082_kill-GCM.patch} | 67 +++--- patches/BRM082_kill-Vision.patch | 83 -------- ...kill-Auth.patch => BRM083_kill-Auth.patch} | 16 +- ...kill-remaining-Play-Services-checks.patch} | 92 ++++----- ...BRM085_kill-TOS-and-metrics-opt-out.patch} | 16 +- ... BRM086_kill-Translate-doesn-t-work.patch} | 0 80 files changed, 1039 insertions(+), 1087 deletions(-) create mode 100644 patches/BRM020_Remove-Sync-and-Translate-menu.patch delete mode 100644 patches/BRM020_Removed-Sync-and-Translate-menu.patch delete mode 100644 patches/BRM033_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch rename patches/{BRM034_ungoogled-chromium-Disable-domain-reliability.patch => BRM033_ungoogled-chromium-Disable-domain-reliability.patch} (100%) rename patches/{BRM035_Disable-Omaha-update-checks.patch => BRM034_Disable-Omaha-update-checks.patch} (94%) rename patches/{BRM036_Add-DuckDuckGo-search-engine.patch => BRM035_Add-DuckDuckGo-search-engine.patch} (100%) rename patches/{BRM037_Add-StartPage-search-engine.patch => BRM036_Add-StartPage-search-engine.patch} (99%) rename patches/{BRM038_Add-Google-English-only-engine.patch => BRM037_Add-Google-English-only-engine.patch} (99%) rename patches/{BRM039_Add-Qwant-search-engine.patch => BRM038_Add-Qwant-search-engine.patch} (97%) rename patches/{BRM040_Fix-crash-when-accessing-page-info-site-settings.patch => BRM039_Fix-crash-when-accessing-page-info-site-settings.patch} (93%) rename patches/{BRM041_openH264-enable-ARM-ARM64-optimizations.patch => BRM040_openH264-enable-ARM-ARM64-optimizations.patch} (96%) rename patches/{BRM042_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch => BRM041_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch} (95%) rename patches/{BRM043_Allow-playing-audio-in-background.patch => BRM042_Allow-playing-audio-in-background.patch} (93%) rename patches/{BRM044_Open-YouTube-links-in-Bromite.patch => BRM043_Open-YouTube-links-in-Bromite.patch} (95%) rename patches/{BRM045_Add-exit-menu-item.patch => BRM044_Add-exit-menu-item.patch} (96%) rename patches/{BRM046_Remove-help-menu-item.patch => BRM045_Remove-help-menu-item.patch} (96%) rename patches/{BRM047_Add-menu-option-to-toggle-global-Javascript-preference.patch => BRM046_Add-menu-option-to-toggle-global-Javascript-preference.patch} (85%) rename patches/{BRM048_Bromite-adblock-engine.patch => BRM047_Bromite-adblock-engine.patch} (86%) rename patches/{BRM049_User-Agent-anonymize.patch => BRM048_User-Agent-anonymize.patch} (100%) rename patches/{BRM050_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch => BRM049_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch} (89%) rename patches/{BRM051_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch => BRM050_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch} (98%) rename patches/{BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch => BRM051_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch} (93%) rename patches/{BRM053_Punt-the-Widevine-version-string.patch => BRM052_Punt-the-Widevine-version-string.patch} (72%) rename patches/{BRM054_Disable-metrics-on-all-I-O-threads.patch => BRM053_Disable-metrics-on-all-I-O-threads.patch} (91%) rename patches/{BRM055_Add-a-flag-for-DNS-over-HTTPS.patch => BRM054_Add-a-flag-for-DNS-over-HTTPS.patch} (83%) rename patches/{BRM056_Always-respect-async-dns-flag-regardless-of-SDK-version.patch => BRM055_Always-respect-async-dns-flag-regardless-of-SDK-version.patch} (52%) rename patches/{BRM057_Add-flag-to-configure-maximum-connections-per-host.patch => BRM056_Add-flag-to-configure-maximum-connections-per-host.patch} (96%) rename patches/{BRM058_Add-flag-to-show-hide-NTP-tiles.patch => BRM057_Add-flag-to-show-hide-NTP-tiles.patch} (86%) rename patches/{BRM059_Add-custom-tab-intents-privacy-option.patch => BRM058_Add-custom-tab-intents-privacy-option.patch} (84%) rename patches/{BRM060_Add-privacy-option-to-keep-cookies-until-session-exit.patch => BRM059_Add-privacy-option-to-keep-cookies-until-session-exit.patch} (86%) rename patches/{BRM061_Always-allow-partner-customisation.patch => BRM060_Always-allow-partner-customisation.patch} (100%) rename patches/{BRM062_Change-default-homepage-to-new-tab-page.patch => BRM061_Change-default-homepage-to-new-tab-page.patch} (100%) rename patches/{BRM063_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch => BRM062_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch} (98%) rename patches/{BRM064_Add-option-to-not-persist-tabs-across-sessions.patch => BRM063_Add-option-to-not-persist-tabs-across-sessions.patch} (89%) rename patches/{BRM065_Add-an-always-incognito-mode.patch => BRM064_Add-an-always-incognito-mode.patch} (94%) rename patches/{BRM066_Disable-fetching-of-all-field-trials.patch => BRM065_Disable-fetching-of-all-field-trials.patch} (96%) rename patches/{BRM067_Disable-smooth-scrolling-on-Linux.patch => BRM066_Disable-smooth-scrolling-on-Linux.patch} (100%) rename patches/{BRM068_Disable-plugins-enumeration.patch => BRM067_Disable-plugins-enumeration.patch} (86%) rename patches/{BRM069_Remove-google-account-access-permission-on-reboot.patch => BRM068_Remove-google-account-access-permission-on-reboot.patch} (93%) rename patches/{BRM070_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch => BRM069_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch} (100%) rename patches/{BRM071_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch => BRM070_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch} (94%) rename patches/{BRM072_profile-resetter-do-not-tick-send-settings-by-default.patch => BRM071_profile-resetter-do-not-tick-send-settings-by-default.patch} (100%) rename patches/{BRM073_browser-ui-disable-warning-about-missing-API-keys.patch => BRM072_browser-ui-disable-warning-about-missing-API-keys.patch} (100%) rename patches/{BRM074_autofill-disable-autofill-download-manager.patch => BRM073_autofill-disable-autofill-download-manager.patch} (60%) rename patches/{BRM075_first_run-deactivate-autoupdate-globally.patch => BRM074_first_run-deactivate-autoupdate-globally.patch} (94%) rename patches/{BRM076_safe_browsing-disable-incident-reporting.patch => BRM075_safe_browsing-disable-incident-reporting.patch} (100%) rename patches/{BRM077_safe_browsing-disable-reporting-of-safebrowsing-override.patch => BRM076_safe_browsing-disable-reporting-of-safebrowsing-override.patch} (88%) rename patches/{BRM078_safe_browsing-disable-cookie-transmission.patch => BRM077_safe_browsing-disable-cookie-transmission.patch} (97%) rename patches/{BRM079_extensions-always-show-component-extensions-in-the-ext-list.patch => BRM078_extensions-always-show-component-extensions-in-the-ext-list.patch} (94%) rename patches/{BRM080_translate-disable-fetching-of-translate-languages-from-server.patch => BRM079_translate-disable-fetching-of-translate-languages-from-server.patch} (100%) rename patches/{BRM081_lint-suppress-hardcoded-text-warnings.patch => BRM080_lint-suppress-hardcoded-text-warnings.patch} (96%) create mode 100644 patches/BRM081_kill-Vision.patch rename patches/{BRM083_kill-GCM.patch => BRM082_kill-GCM.patch} (95%) delete mode 100644 patches/BRM082_kill-Vision.patch rename patches/{BRM084_kill-Auth.patch => BRM083_kill-Auth.patch} (92%) rename patches/{BRM085_kill-remaining-Play-Services-checks.patch => BRM084_kill-remaining-Play-Services-checks.patch} (84%) rename patches/{BRM086_kill-TOS-and-metrics-opt-out.patch => BRM085_kill-TOS-and-metrics-opt-out.patch} (72%) rename patches/{BRM087_kill-Translate-doesn-t-work.patch => BRM086_kill-Translate-doesn-t-work.patch} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0109a323..8ec686fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ +# 69.0.3497.73 +* enabled WebRTC +* drop clear HTTP cache patch + # 68.0.3440.126 * add option to disallow custom tab intents (fixes https://github.com/bromite/bromite/issues/117) * add option to keep local data until browser exit (fixes https://github.com/bromite/bromite/issues/56) -* fix for do not persist tabs preference saving +* remember preference for tabs persistence option * extend anti-AMP to all search results # 68.0.3440.121 diff --git a/filters/adblock_entries.h b/filters/adblock_entries.h index 71c2717c..e77cecf2 100644 --- a/filters/adblock_entries.h +++ b/filters/adblock_entries.h @@ -19,7 +19,7 @@ struct adblock_entry { const char **domains, **domains_skip; }; -#define ADBLOCK_ENTRY_COUNT 52775 +#define ADBLOCK_ENTRY_COUNT 52841 const char *m10030a28[] = { "/InsightTrk/", NULL }; const char *m10045299[] = { "award.sitekeuring.net^", NULL }; const char *m100458cd[] = { "eluhhfyxx.com^", NULL }; @@ -73,6 +73,7 @@ const char *m10352710[] = { "jrcdev.net/promos/", NULL }; const char *m10357769[] = { "gets-web.space^", NULL }; const char *m1036100 [] = { "?Id=", "&cookies=", "&Referer_", NULL }; const char *m1037dad2[] = { "pokerroomkings.com^", "^banner^", NULL }; +const char *m10383fc3[] = { "-javascript_xiti_", NULL }; const char *m10384cf4[] = { "vaeucrdlulu.bid^", NULL }; const char *m1038aea1[] = { "rnzzrylopa.bid^", NULL }; const char *m103db4d0[] = { "/adsmanagement/", NULL }; @@ -87,6 +88,7 @@ const char *m104ac010[] = { "trueffect.underarmour.com^", NULL }; const char *m104c86bf[] = { "/b/ss/", "&pagename=", NULL }; const char *m104cd9e6[] = { "/adztop.", NULL }; const char *m104dad9f[] = { "coinbase.com/assets/application-", ".js", NULL }; +const char *m104f04ee[] = { "mp4upload.com/ads.js", NULL }; const char *m104f27f0[] = { "/ads/oscar/", NULL }; const char *m10502d5e[] = { "ads.web.cs.com^", NULL }; const char *m10511708[] = { "/imgads/", NULL }; @@ -1561,6 +1563,7 @@ const char *m174f2cc3[] = { "statsbox.nl^", NULL }; const char *m174f55c3[] = { "analytics-engine.net^", NULL }; const char *m174fdc28[] = { "touayfftdwcd.com^", NULL }; const char *m174ffa74[] = { "activewin.com/images/", "_ad.gif", NULL }; +const char *m1751600f[] = { "fgnzizhe.com^", NULL }; const char *m1751d353[] = { "stribe.com/00/logs?", NULL }; const char *m17520aa6[] = { "fpslcnjecewd.com^", NULL }; const char *m1752be87[] = { "clickcease.com^", NULL }; @@ -1669,6 +1672,7 @@ const char *m17c1270c[] = { "step-step-go.com^", NULL }; const char *m17c2699f[] = { "sebar.thand.info^", NULL }; const char *m17c2d4bf[] = { "/wp-content/plugins/bhcb/lock.js", NULL }; const char *m17c300ee[] = { "adguru.guruji.com^", NULL }; +const char *m17c51fc6[] = { "cybzsdkmrqgy.com^", NULL }; const char *m17c52eec[] = { ".EventTracking.", NULL }; const char *m17c59dff[] = { "_small_ad.", NULL }; const char *m17c5d51a[] = { "ads.nzcity.co.nz^", NULL }; @@ -4052,6 +4056,7 @@ const char *m22bd2046[] = { "followistic.com/widget/stat/", NULL }; const char *m22bdb02d[] = { "yahoo.co.jp/js/s_retargeting.js", NULL }; const char *m22bdc015[] = { "taiwannews.com.tw/etn/images/banner_", NULL }; const char *m22bfe6dd[] = { "ybemuzknpvkgn.bid^", NULL }; +const char *m22c05fe9[] = { "vndfakned.com^", NULL }; const char *m22c30b3c[] = { "count.rbc.ru^", NULL }; const char *m22c34f6f[] = { "cruisesalefinder.co.nz/affiliates.html", NULL }; const char *m22c37060[] = { "fkdqrjnoxhch.com^", NULL }; @@ -4100,6 +4105,7 @@ const char *m22fd2ffa[] = { "ea.jeuxvideopc.com^", NULL }; const char *m22fe5623[] = { "tripadvisor.com^", "^skyscraper.jpg", NULL }; const char *m230054da[] = { "jjeevbcllev.bid^", NULL }; const char *m23016540[] = { "gpacalculatorhighschoolfree.com^", NULL }; +const char *m230275c4[] = { "pgl.example^", NULL }; const char *m23073e3c[] = { "oijvjlfjjb.bid^", NULL }; const char *m23075a0b[] = { "_doubleclick_ad.", NULL }; const char *m2308aef [] = { "/adlogger.", NULL }; @@ -4896,6 +4902,7 @@ const char *m26c044ae[] = { "securite.01net.com^", NULL }; const char *m26c0cc07[] = { "ebayobjects.com.au^", NULL }; const char *m26c1bd3e[] = { "google.", "/analytics/js/", NULL }; const char *m26c22d87[] = { "productioncars.com/pics/menu/ads2.gif", NULL }; +const char *m26c2f02f[] = { "/direct_ads/", NULL }; const char *m26c38e0c[] = { "host-go.info^", NULL }; const char *m26c5ae6b[] = { "m4carbine.net/tabs/", NULL }; const char *m26c62ade[] = { "usapromotravel.com^", NULL }; @@ -6492,6 +6499,7 @@ const char *m2e16c00f[] = { "voxmedia.com/pickup.js", NULL }; const char *m2e17955b[] = { "thedailypaul.com/images/amzn-", NULL }; const char *m2e194558[] = { "ltassrv.com/goads.swf", NULL }; const char *m2e199dcc[] = { "ttwbs.channelintelligence.com^", NULL }; +const char *m2e1a628 [] = { "/ads/?page=", NULL }; const char *m2e1c5074[] = { "liverail.com/track/?", NULL }; const char *m2e1c7aef[] = { "xlavzhffzwgb.com^", NULL }; const char *m2e1c8a3e[] = { "wkjcdukkwcvr.com^", NULL }; @@ -6732,6 +6740,7 @@ const char *m2f1f7d98[] = { "betweendigital.com^", NULL }; const char *m2f20b124[] = { "/iframe_googleAnalytics", NULL }; const char *m2f20e3c9[] = { "inphonic.com/tracking/", NULL }; const char *m2f232eb2[] = { "/Nielsen.v53.", NULL }; +const char *m2f2528a6[] = { "jeinvegpool.com^", NULL }; const char *m2f254e [] = { "sncpizczabhhafkzeifklgonzzkpqgogmnhyeggikzloelmfmd.com^", NULL }; const char *m2f2655b0[] = { "olderhill.com/ubr.js", NULL }; const char *m2f2b0588[] = { "analytic.pho.fm^", NULL }; @@ -7490,6 +7499,7 @@ const char *m328d8b40[] = { "clicsante.ca^", "^angulartics-google-tag-manager.mi const char *m328fc442[] = { "levexis.com^", NULL }; const char *m32938f57[] = { "data.younow.com^", NULL }; const char *m329456c2[] = { "zowary.com^", NULL }; +const char *m3294b6ce[] = { "c.evidon.com^", NULL }; const char *m3296ad89[] = { "wxwxpxtoqmipif.com^", NULL }; const char *m3296ad91[] = { "ads.brazzers.com^", NULL }; const char *m32980789[] = { "masterstats.com^", NULL }; @@ -7769,6 +7779,7 @@ const char *m33e7782f[] = { "hlserve.com^", NULL }; const char *m33e7afd4[] = { "/ad728.", NULL }; const char *m33e8b261[] = { "/restats_", NULL }; const char *m33e8ef31[] = { "meanjin.com.au/static/images/sponsors.jpg", NULL }; +const char *m33ea2a19[] = { "backstage.funnelenvy.com^", NULL }; const char *m33ea8d4f[] = { "nplrzxvyrhiq.com^", NULL }; const char *m33ec3ce3[] = { "mwgjoofxf.bid^", NULL }; const char *m33ee61a4[] = { "magwfymjhils.com^", NULL }; @@ -8199,6 +8210,7 @@ const char *m35e98524[] = { ".uk/track?", NULL }; const char *m35e9ca60[] = { "_120x600-", NULL }; const char *m35ecb334[] = { "leadforensics.com^", NULL }; const char *m35ecc67c[] = { "qq.com/p?", NULL }; +const char *m35ecf91c[] = { "-mid-ad.", NULL }; const char *m35edd93d[] = { "ewaosdzofcsy.bid^", NULL }; const char *m35eeb21d[] = { "mygpuid.com^", NULL }; const char *m35f048ad[] = { "rnqxziebydqsat.bid^", NULL }; @@ -8355,6 +8367,7 @@ const char *m36a60c3d[] = { "zoomino.com^", NULL }; const char *m36a61981[] = { "edgeio.com^", NULL }; const char *m36a77a3 [] = { "an.tacoda.net^", NULL }; const char *m36a7b62 [] = { "/hyper-assets/app", NULL }; +const char *m36a7f3dd[] = { "/adv-placeholder.", NULL }; const char *m36a85713[] = { "/admedia.", NULL }; const char *m36aa2611[] = { "bjjingda.com^", NULL }; const char *m36ab4f2a[] = { "=getSideStats&", NULL }; @@ -8560,6 +8573,7 @@ const char *m37a4f785[] = { "aeghae5y.com^", NULL }; const char *m37a5e790[] = { "rwugdvqdpxfz.com^", NULL }; const char *m37a6b92b[] = { "damnlol.com/a/leaderboard.php", NULL }; const char *m37a7336f[] = { "wrlr.fm/images/banners/", NULL }; +const char *m37a772e [] = { "nmywwgnnkmud.com^", NULL }; const char *m37a7bef1[] = { "/adseller/", NULL }; const char *m37a82dee[] = { "4fuckr.com/api.php", NULL }; const char *m37a91488[] = { "/nbcuadops-", NULL }; @@ -8802,6 +8816,7 @@ const char *m38c48af6[] = { "computerworld.com/resources/scripts/lib/doubleclick const char *m38c4cd02[] = { "track.gawker.com^", NULL }; const char *m38c569a9[] = { "newprofitcontrol.com^", NULL }; const char *m38c56d08[] = { "chainwalladsy.com^", NULL }; +const char *m38c72922[] = { "novhyaxaioxaon.com^", NULL }; const char *m38c8b4ce[] = { "translate.google.com/translate/static/", "-ads/", NULL }; const char *m38c9464e[] = { "titan24.com/scripts/stats.js", NULL }; const char *m38cb17be[] = { "boostshow.com^", NULL }; @@ -9622,6 +9637,7 @@ const char *m3cddd29c[] = { "dtpictvzcqqm.bid^", NULL }; const char *m3cde151b[] = { "d2b2x1ywompm1b.cloudfront.net^", NULL }; const char *m3cde80a5[] = { "adadvisor.net^", NULL }; const char *m3cdf683d[] = { "/adblock-detector.", NULL }; +const char *m3ce49071[] = { "secfpgpqx.com^", NULL }; const char *m3ce4f36e[] = { "pqarchiver.com^", "^utilstextlinksxml.js", NULL }; const char *m3ce56eed[] = { ".gatracking.js", NULL }; const char *m3ce59089[] = { "760d4b269ea7.com^", NULL }; @@ -12663,6 +12679,7 @@ const char *m4add690d[] = { "inimbus.com.au^", NULL }; const char *m4ade176 [] = { "freeworldgroup.com/banner", NULL }; const char *m4ade78cc[] = { "marketing.net.jumia.com.ng^", NULL }; const char *m4adf3be5[] = { "/ad_contents/", NULL }; +const char *m4ae0351a[] = { "/trackingVtm.", NULL }; const char *m4ae1180c[] = { "/Dotomi.", NULL }; const char *m4ae32f94[] = { "lwyjxvbcjkstxy.com^", NULL }; const char *m4ae3aa56[] = { "hodling.faith^", NULL }; @@ -12797,6 +12814,7 @@ const char *m4b89028e[] = { "chango.com^", NULL }; const char *m4b89faa1[] = { "tagcdn.com/pix/?", NULL }; const char *m4b8a3377[] = { "loc.gov/js/", "/s_code.js", NULL }; const char *m4b8d0fa3[] = { "wiicjajh.com^", NULL }; +const char *m4b8db0eb[] = { "aizopowmtnho.com^", NULL }; const char *m4b8de46a[] = { "/tr/p.gif?", NULL }; const char *m4b8deb85[] = { "ltzjkjxx.com^", NULL }; const char *m4b8e9bc6[] = { "howcast.com/flash/assets/ads/liverail.swf", NULL }; @@ -13317,6 +13335,7 @@ const char *m4e09ea52[] = { "clicksor.net^", NULL }; const char *m4e0a4873[] = { "lwbextsnjgw.com^", NULL }; const char *m4e0bbdf [] = { "_468x120.", NULL }; const char *m4e0d797e[] = { "static.adzerk.net/ados.js", NULL }; +const char *m4e0eb3b0[] = { "kwajysvvjeyvs.com^", NULL }; const char *m4e0ec30c[] = { "mixpanel.com/site_media/js/api/mixpanel.js", NULL }; const char *m4e0fa967[] = { "woopic.com/Magic/o_vr.js", NULL }; const char *m4e0fcfeb[] = { "gevrsbmqvp.bid^", NULL }; @@ -15251,6 +15270,7 @@ const char *m56c85370[] = { "onscroll.com^", NULL }; const char *m56c86cd8[] = { "/oasadfunction.", NULL }; const char *m56c94671[] = { "vidspot.net^", "http", NULL }; const char *m56cbe0e3[] = { "count5.pconline.com.cn^", NULL }; +const char *m56cc0e8a[] = { "infrashift.com^", NULL }; const char *m56d0f90a[] = { "sahadan.com^", NULL }; const char *m56d22340[] = { "ads.ultimate-guitar.com^", NULL }; const char *m56d3eb4e[] = { "adshuffle.com^", NULL }; @@ -15454,6 +15474,7 @@ const char *m57d59fb3[] = { "nrgpugas.com^", NULL }; const char *m57d6f4e1[] = { "/textad/", NULL }; const char *m57d6ff8e[] = { "at-adserver.alltop.com^", NULL }; const char *m57d79644[] = { "toonzone.net^", "^placements.php^", NULL }; +const char *m57d84071[] = { "/webstat.js", NULL }; const char *m57da9818[] = { "/cloudcoins.min.js", NULL }; const char *m57dac107[] = { "uuvwcjtppeonfq.com^", NULL }; const char *m57dad4cb[] = { "/playerlogger.", NULL }; @@ -15518,6 +15539,7 @@ const char *m58242943[] = { "blackshoppingchannel.com^", "^ad_agency^", NULL }; const char *m5824f4db[] = { "cjgpifztileh.com^", NULL }; const char *m58251c7a[] = { "ef5ahgoo.com^", NULL }; const char *m58256671[] = { "ads.betfair.com^", NULL }; +const char *m5825b0aa[] = { "wa.and.co.uk^", NULL }; const char *m58261533[] = { "smilyes4u.com^", NULL }; const char *m58264dd9[] = { "zeroredirect9.com^", NULL }; const char *m5826cb12[] = { "a258c3523a5c4a47bda.com^", NULL }; @@ -15816,6 +15838,7 @@ const char *m599782d7[] = { "terraadstools.com^", NULL }; const char *m59983860[] = { "cdn.cdncomputer.com/js/main.js", NULL }; const char *m59983df2[] = { "pichunter.com/creatives/", NULL }; const char *m59988c3 [] = { "c810b4e386a121f20.com^", NULL }; +const char *m599960c2[] = { "_ads/mobile/", NULL }; const char *m59996a07[] = { "xxxjizz.net/125_125.", NULL }; const char *m5999a897[] = { "youngpornvideos.com/images/teencash/", NULL }; const char *m599b28fe[] = { "/spannerworks-tracking-", NULL }; @@ -16559,6 +16582,7 @@ const char *m5d340ecc[] = { "nlpsxhgmdywaoq.com^", NULL }; const char *m5d3453da[] = { "spot.fitness.com^", NULL }; const char *m5d35accd[] = { "_600x180.", NULL }; const char *m5d36098c[] = { "adlayer.net^", NULL }; +const char *m5d382b0b[] = { "fcjodgfpjiswa.com^", NULL }; const char *m5d39662f[] = { "drowle.com^", NULL }; const char *m5d3a55ca[] = { "partners.betus.com^", NULL }; const char *m5d3ad986[] = { "popupmoney.com^", NULL }; @@ -16634,6 +16658,7 @@ const char *m5d891cb6[] = { "kitguru.net/?kitguru_wrapjs=1&ver=", NULL }; const char *m5d8b85a8[] = { "xhwqginopocs.com^", NULL }; const char *m5d8c27e9[] = { "/afu.php?", NULL }; const char *m5d8c6701[] = { "cdn.ndparking.com/js/init.min.js", NULL }; +const char *m5d8e7e3a[] = { "lusfrsxgxopm.com^", NULL }; const char *m5d8f3a0e[] = { "mkfzovhrfrre.com^", NULL }; const char *m5d8fc32f[] = { "pr.blogflux.com^", NULL }; const char *m5d90f3d2[] = { "/miner.js", NULL }; @@ -16912,6 +16937,7 @@ const char *m5ecce2d3[] = { "phncdn.com/www-static/", "/gif-view.js", NULL }; const char *m5ecd8d3a[] = { "ttzmedia.com^", NULL }; const char *m5ecde469[] = { "/autotag.", NULL }; const char *m5ece6e95[] = { "/ganalytics.", NULL }; +const char *m5ecea101[] = { "3delllwrite.com^", NULL }; const char *m5ecee371[] = { "/ajaxlog?", NULL }; const char *m5ecef02e[] = { "2ip.ua^", NULL }; const char *m5ecfccf6[] = { "_728x90a_", NULL }; @@ -17264,6 +17290,7 @@ const char *m605af903[] = { "parrable.com^", NULL }; const char *m605bf9c5[] = { "/a2/ads/", NULL }; const char *m605d41e7[] = { "webturn.ru^", NULL }; const char *m605e5e50[] = { "/pu-placer.js", NULL }; +const char *m60625544[] = { "qowmqduocv.com^", NULL }; const char *m60628a6d[] = { "pompazilla.com^", NULL }; const char *m6069ca5d[] = { "/analyzer.gif?", NULL }; const char *m606a2692[] = { "penton.com/analytics/", NULL }; @@ -17663,6 +17690,7 @@ const char *m620b8f57[] = { "yimg.com^", "^yad", ".js", NULL }; const char *m620c05a4[] = { "mmdcash.com/mmdcash01.gif", NULL }; const char *m620e33ea[] = { "/_30/ads/", NULL }; const char *m620f8fb4[] = { "catholicweb.com^", "^banners^", NULL }; +const char *m620fc12a[] = { "rdstation.com.br^", NULL }; const char *m6211dfe0[] = { "/getAd;", NULL }; const char *m621279a7[] = { "optnmstr.com^", NULL }; const char *m6213507 [] = { "sahibinden.com/sbbi/", NULL }; @@ -18209,6 +18237,7 @@ const char *m64906344[] = { "largestable.com^", NULL }; const char *m6490ead4[] = { "ngastatic.com^", NULL }; const char *m649230be[] = { "tlvmedia.com^", NULL }; const char *m6493e858[] = { "/AppMeasurement2.js", NULL }; +const char *m64943f12[] = { "plus.addkt.com/slader_exdetail.js", NULL }; const char *m64943fd4[] = { "_media/ads/", NULL }; const char *m64952963[] = { "mashery.com/analytics/", NULL }; const char *m6495690c[] = { "tm-awx.com/felix.min.js", NULL }; @@ -18431,6 +18460,7 @@ const char *m656d05a6[] = { "/trackGAEvents.", NULL }; const char *m656d6da4[] = { "mediabridge.cc^", NULL }; const char *m656fe3f0[] = { "txvxzkwyelnvb.bid^", NULL }; const char *m657127ef[] = { "phfknysgvwhnr.bid^", NULL }; +const char *m65716c7a[] = { "cytpfucbb.com^", NULL }; const char *m6572d367[] = { "bestproducttesters.com^", NULL }; const char *m657357eb[] = { "/adfeed.", NULL }; const char *m6574f2a [] = { "/Hit.aspx?", NULL }; @@ -20609,6 +20639,7 @@ const char *m6f6abc6a[] = { "_728x90.", NULL }; const char *m6f6b1b71[] = { "888poker.com^", NULL }; const char *m6f6b9bb2[] = { "/webstats.js", NULL }; const char *m6f6cc1a6[] = { "1movies.to/site/videoroller", NULL }; +const char *m6f6d0cc [] = { "/lead-tracking.", NULL }; const char *m6f6ec7ce[] = { "ex.ua/counter/", NULL }; const char *m6f6fb55d[] = { "nkredir.com^", NULL }; const char *m6f705c25[] = { "hidden.gogoceleb.com^", NULL }; @@ -20738,6 +20769,7 @@ const char *m6ff9e242[] = { "qvrfxlskqr.com^", NULL }; const char *m6ffa6db1[] = { "christianpost.com/js/plugins/sticky/sticky.js", NULL }; const char *m6ffb54d7[] = { "d3ojzyhbolvoi5.cloudfront.net^", NULL }; const char *m6ffbfbc0[] = { "counter.sina.com.cn^", NULL }; +const char *m6ffe0f14[] = { "/ad250.", NULL }; const char *m6fff51a2[] = { "https:", NULL }; const char *m6fff7ad3[] = { "-468x60px-", NULL }; const char *m70027c6e[] = { "fusionquest.com^", NULL }; @@ -21839,6 +21871,7 @@ const char *m7501a9c [] = { "mobprofitxxl.com^", NULL }; const char *m75020cb9[] = { "/analyticstrack.", NULL }; const char *m7502b1c9[] = { "convrse.media^", NULL }; const char *m75049680[] = { "ua.badongo.com^", NULL }; +const char *m75057145[] = { "xkzzkxntmryst.com^", NULL }; const char *m7505c1db[] = { "tanil.info^", NULL }; const char *m75076b96[] = { "educationbusinessuk.net/images/stage.gif", NULL }; const char *m750907ad[] = { "microsoft.com/getsilverlight/scripts/Tracker.js", NULL }; @@ -22464,7 +22497,6 @@ const char *m77edebaf[] = { "truste.com/common/js/ga.js", NULL }; const char *m77f0019a[] = { "modescrips.info^", NULL }; const char *m77f3022a[] = { "nkyngrtleloc.com^", NULL }; const char *m77f32a8d[] = { ".n.2.1.l60.js^", NULL }; -const char *m77f92d65[] = { "?tag_id=", NULL }; const char *m77faa12b[] = { "jujzh9va.com^", NULL }; const char *m77facc7f[] = { "phncdn.com/js/deleteVideo/", NULL }; const char *m77fb42de[] = { "wsj.net/internal/krux.js", NULL }; @@ -22611,6 +22643,7 @@ const char *m78a7d3ff[] = { "crypto-coins.info^", NULL }; const char *m78aa51d0[] = { "mb01.com^", NULL }; const char *m78ac80eb[] = { "fapxl.com/view/spot/", NULL }; const char *m78ac993d[] = { "secure.ed4.net/GSI/", NULL }; +const char *m78acfdc1[] = { "/adshandler/", NULL }; const char *m78af05ed[] = { "cklad.xyz^", NULL }; const char *m78aff2d6[] = { ".ads-tool.", NULL }; const char *m78b0d6a0[] = { "llwemrshzovw.com^", NULL }; @@ -23210,6 +23243,7 @@ const char *m7b71ad9 [] = { "travelscream.com^", NULL }; const char *m7b723670[] = { "auroravid.to/banner.php", NULL }; const char *m7b724ee5[] = { "theparking-motorcycle.eu/images/flag/gif/ad.gif", NULL }; const char *m7b73642c[] = { "amazon.com/gp/yourstore/recs/", NULL }; +const char *m7b73d411[] = { "/loyalty-tracking-", NULL }; const char *m7b7423b2[] = { "/ads6.", NULL }; const char *m7b74ac3a[] = { "-ad.php?", NULL }; const char *m7b758d [] = { "gweini.com^", NULL }; @@ -23367,6 +23401,7 @@ const char *m7c3b55e3[] = { "frameptp.com^", NULL }; const char *m7c3b9ad1[] = { "forums.realgm.com/banners/", NULL }; const char *m7c3d46ef[] = { "/googlead-", NULL }; const char *m7c3d62a3[] = { "k2s.cc/ext/evercookie/", NULL }; +const char *m7c3d8c27[] = { "rapidvideo.com/js/videojs-contrib-hls.min.js", NULL }; const char *m7c3ddc97[] = { "9c9dc429637a02.download^", NULL }; const char *m7c3e0f54[] = { "hrum.hotelsapi.io^", NULL }; const char *m7c45839e[] = { "urbation.net^", NULL }; @@ -23741,6 +23776,7 @@ const char *m7dcd369a[] = { "absolutcheats.com/images/changemy", ".gif", NULL }; const char *m7dcf1951[] = { "basepush.com^", NULL }; const char *m7dd07df2[] = { "cbxqceuuwnaz.com^", NULL }; const char *m7dd2a78e[] = { "measuremap.com^", NULL }; +const char *m7dd400fb[] = { "/traffic-source-cookie/", NULL }; const char *m7dd41a5d[] = { "/bg_ads_", NULL }; const char *m7dd64a23[] = { "48d68bec12064b0012e.com^", NULL }; const char *m7dd9c54a[] = { "ebaystatic.com^", "^motorswidgetsv2.swf^", NULL }; @@ -24590,6 +24626,7 @@ const char *m81d35a6a[] = { "clicktag.de^", NULL }; const char *m81d37a17[] = { "bonnieradnetwork.se^", NULL }; const char *m81d4717f[] = { "/adx_iframe_", NULL }; const char *m81d49af3[] = { "gpr.hu/pr.pr?", NULL }; +const char *m81d645de[] = { "/traffic-source-cookie.", NULL }; const char *m81d71221[] = { "breitlingsource.com/images/pflogo.jpg", NULL }; const char *m81d75d65[] = { "/tracking/log.php?", NULL }; const char *m81d8f9ad[] = { "/analytics-ping.", NULL }; @@ -24935,6 +24972,7 @@ const char *m83876660[] = { "sosh.fr^", "^wtinit.js", NULL }; const char *m8388a6f5[] = { "/ad.slot.", NULL }; const char *m83891ba1[] = { "/adv/ads/", NULL }; const char *m83896563[] = { "affiliatenetwork.co.za^", NULL }; +const char *m838977fa[] = { "qkyzjwhyeh.com^", NULL }; const char *m838aa0e0[] = { "/googleadhtml/", NULL }; const char *m838b0c96[] = { "/inc/ad.", NULL }; const char *m838cc2c4[] = { "fujifilm.com/js/shared/analyzer.js", NULL }; @@ -27668,7 +27706,6 @@ const char *m9071782c[] = { "gorgonprojectinvest.com/images/banners/", NULL }; const char *m9072d4b3[] = { "/i.png?id=", NULL }; const char *m907508a3[] = { "msads.net/adbar/products/", "/adbar.js", NULL }; const char *m907574a6[] = { "clicksagent.com^", NULL }; -const char *m9076182a[] = { "addkt.com/slader", NULL }; const char *m90761e56[] = { "gzkoehgbpozz.com^", NULL }; const char *m907ac7fd[] = { "cisfjtamphuqt.com^", NULL }; const char *m907aea68[] = { ".click/track?", NULL }; @@ -27832,6 +27869,7 @@ const char *m912b0d1b[] = { "ebladestore.com^", "^banners^", NULL }; const char *m912be9f7[] = { "es.puritan.com^", NULL }; const char *m912c3cf [] = { "djuxmbjauluis.com^", NULL }; const char *m912d261b[] = { "cdnads.com^", NULL }; +const char *m912d6d4b[] = { "tvevyrrrnbcbyk.com^", NULL }; const char *m912e840a[] = { "-120x600-", NULL }; const char *m912ec068[] = { "dot2.eporner.com^", NULL }; const char *m912fed1b[] = { "_homadconfig.", NULL }; @@ -29549,6 +29587,7 @@ const char *m99680541[] = { "qdcoqejn.com^", NULL }; const char *m996a3ae4[] = { "wipfilms.net^", "^amazon.png", NULL }; const char *m996b54f6[] = { "cracked.com/tracking/", NULL }; const char *m996b67d3[] = { "eharmony.com.au/partner/", NULL }; +const char *m996b7f57[] = { "/adv-banner-", NULL }; const char *m996bc9a3[] = { "azads.com^", NULL }; const char *m996c37d9[] = { "olswr.27684.club^", NULL }; const char *m996dcda2[] = { "tujbidamlfrn.com^", NULL }; @@ -29713,6 +29752,7 @@ const char *m9a2f69ae[] = { "lightminer.co^", NULL }; const char *m9a2f8e1d[] = { "xjsqhlfscjxo.com^", NULL }; const char *m9a324a9d[] = { "anwufkjjja.com^", NULL }; const char *m9a33b5f8[] = { "damimage.com^", "^DocaWedrOJPPx.png", NULL }; +const char *m9a33b940[] = { "avrdrpwt.com^", NULL }; const char *m9a350ce9[] = { "/usertrackingajax.php?", NULL }; const char *m9a3525dd[] = { "yimg.com/wi/ytc.js", NULL }; const char *m9a35b785[] = { "gefwrite.com^", NULL }; @@ -31368,6 +31408,7 @@ const char *ma20ce0f4[] = { "/ovt_show.asp?", NULL }; const char *ma20f16df[] = { "cams.pornrabbit.com^", NULL }; const char *ma2116c0d[] = { "redfin.com/stingray/clicktracker.jsp?", NULL }; const char *ma2117315[] = { "/pub_images/", NULL }; +const char *ma2125c3c[] = { "trendmd.com/events", NULL }; const char *ma2136e35[] = { "hits.puls.lv^", NULL }; const char *ma213cf34[] = { "/in.gif?url=", NULL }; const char *ma2154f5a[] = { "etracking24.de^", NULL }; @@ -31708,6 +31749,7 @@ const char *ma39ebda8[] = { "ludwmwca.bid^", NULL }; const char *ma39ec6b3[] = { "vsxjjmyz.com^", NULL }; const char *ma39faed1[] = { "circonus.com/hit?", NULL }; const char *ma3a49108[] = { "dydxtkvmktumjp.com^", NULL }; +const char *ma3a52afd[] = { "rotana.video/sw.js", NULL }; const char *ma3a53acc[] = { "/300_250_", NULL }; const char *ma3a60b8d[] = { "/technomedia.", NULL }; const char *ma3a6797e[] = { "exashare.com/ad.js", NULL }; @@ -32000,6 +32042,7 @@ const char *ma4eaa2c8[] = { "p.po.st^", "^vguid^", NULL }; const char *ma4ec7057[] = { "yqqxrfhtgcbxz.com^", NULL }; const char *ma4ee85d7[] = { "syndication1.viraladnetwork.net^", NULL }; const char *ma4f270e3[] = { "ftbpro.com^", NULL }; +const char *ma4f74768[] = { "uyxjfkgudefv.com^", NULL }; const char *ma4f74d25[] = { "iplocationtools.com^", NULL }; const char *ma4f7c1a3[] = { "trackingoffer.net^", NULL }; const char *ma4f7c1cb[] = { "offerenced.com^", NULL }; @@ -33222,6 +33265,7 @@ const char *maa9af11e[] = { "/service/ad/", NULL }; const char *maa9c1b15[] = { "jcount.com^", NULL }; const char *maa9cafc [] = { "/banners_rotation.", NULL }; const char *maa9e28af[] = { "/adv/sprintf-", NULL }; +const char *maaa024e6[] = { "ad.lkqd.net/vpaid/formats.js", NULL }; const char *maaa06786[] = { "dhzmxkoq.bid^", NULL }; const char *maaa075f9[] = { "web-counter.net^", NULL }; const char *maaa0918e[] = { "zbrkywjutuxu.com^", NULL }; @@ -33324,6 +33368,7 @@ const char *mab1f7440[] = { "bookingbuddy.com/js/bookingbuddy.strings.php?", NUL const char *mab1fb0da[] = { "track.xtrasize.nl^", NULL }; const char *mab206c9f[] = { "nativeadsfeed.com^", NULL }; const char *mab2079a1[] = { "openhit.com^", NULL }; +const char *mab20e525[] = { "wnstpoiqrv.com^", NULL }; const char *mab24ff3a[] = { "pornoxo.com/tradethumbs/", NULL }; const char *mab25a469[] = { "nme.com/themes/takeovers/", NULL }; const char *mab25abe5[] = { "computerworld.com/www/js/ads/gpt_includes.js", NULL }; @@ -34265,6 +34310,7 @@ const char *maf46bce8[] = { "mysitetraffic.net^", NULL }; const char *maf46c156[] = { "amazonaws.com^", "^i^stm^", NULL }; const char *maf47c03c[] = { "bzgwkxnjqjdz.com^", NULL }; const char *maf47ff20[] = { "stats.surfaid.ihost.com^", NULL }; +const char *maf49881 [] = { "/lead-tracking/", NULL }; const char *maf4c6246[] = { "thefrisky.com/?act=", NULL }; const char *maf4edf54[] = { "adcontent.gamespy.com^", NULL }; const char *maf4efaac[] = { "adresellers.com^", NULL }; @@ -34432,6 +34478,7 @@ const char *mafffcaa1[] = { "/468x80_", NULL }; const char *mb0046bf6[] = { "-sponsored-links-", NULL }; const char *mb006545c[] = { "kitco.com/ssi/market_ox_deanmg.stm", NULL }; const char *mb00812de[] = { "wheninmanila.com/wp-content/uploads/2012/12/Marie-France-Buy-1-Take-1-Deal-Discount-WhenInManila.jpg", NULL }; +const char *mb00a914b[] = { "olgjzpgp.com^", NULL }; const char *mb00c2358[] = { "/token?referer=", NULL }; const char *mb00edd6c[] = { "nepohita.com^", NULL }; const char *mb00f637a[] = { "intentmedia.com^", NULL }; @@ -34568,6 +34615,7 @@ const char *mb0a9a4be[] = { "/cvs/ads/", NULL }; const char *mb0ab8f08[] = { "vivocha.com^", NULL }; const char *mb0aba5c0[] = { "trackpath.biz^", NULL }; const char *mb0ac60fb[] = { "ad0.bigmir.net^", NULL }; +const char *mb0ae1c26[] = { "/fetchJsAd.", NULL }; const char *mb0ae50f6[] = { "filecrypt.cc/js/scriptaculous/builder.js", NULL }; const char *mb0ae6012[] = { "/lycostrack.js", NULL }; const char *mb0b0a147[] = { "popunderz.com^", NULL }; @@ -35561,6 +35609,7 @@ const char *mb539a402[] = { "adcenter.mobicow.com^", NULL }; const char *mb53a96e7[] = { "sticker.yadro.ru/ad/", NULL }; const char *mb53b3429[] = { "jqleeknw.com^", NULL }; const char *mb53cd318[] = { "lyeannqhhf.bid^", NULL }; +const char *mb53e8d92[] = { "clickperks.info^", NULL }; const char *mb540bfbc[] = { "adlegend.com^", NULL }; const char *mb540f713[] = { "track.wildblue.com^", NULL }; const char *mb5416afe[] = { "ggnabmvnwphu.com^", NULL }; @@ -38805,6 +38854,7 @@ const char *mc44844ae[] = { "sankakucomplex.com^", NULL }; const char *mc448e41b[] = { "zhtcuchr.bid^", NULL }; const char *mc44928dd[] = { "dbftszei.bid^", NULL }; const char *mc449456a[] = { "/tvgdartads.", NULL }; +const char *mc449f508[] = { "1hanritten.com^", NULL }; const char *mc44a6d9d[] = { "cardsharing.info/wp-content/uploads/", "/ALLS.jpg", NULL }; const char *mc44b010c[] = { "hcomicbook.com^", "_banner1.gif", NULL }; const char *mc44eb204[] = { "dom002.site^", NULL }; @@ -38946,6 +38996,7 @@ const char *mc50eba6b[] = { "ads.tripod.lycos.nl^", NULL }; const char *mc50f05c9[] = { "adtrace.org^", NULL }; const char *mc5109e6b[] = { "/alllinksclicktracker.js", NULL }; const char *mc511521c[] = { "torrentz.li/ping?", NULL }; +const char *mc5143b4c[] = { "jzgtnetghdc.com^", NULL }; const char *mc515581d[] = { "exashare.com^", "^", "cbrandom^", NULL }; const char *mc517cacb[] = { "jobs.hrkspjbs.com^", NULL }; const char *mc5199f06[] = { "chronicle.lu/images/Sponsor_", NULL }; @@ -39418,6 +39469,7 @@ const char *mc73034be[] = { "freewheel.mtgx.tv^", NULL }; const char *mc730477b[] = { "safecllc.com^", NULL }; const char *mc73113f1[] = { "sp.sctimes.com^", NULL }; const char *mc73193b9[] = { "/adspace.", NULL }; +const char *mc7379969[] = { "ckxyvauhqfuoin.com^", NULL }; const char *mc737f58c[] = { "/300_ad_", NULL }; const char *mc73a3025[] = { "circular-counters.com^", NULL }; const char *mc73c2158[] = { "frailoffer.com^", NULL }; @@ -41569,6 +41621,7 @@ const char *md0fb9edd[] = { "onecount.net^", NULL }; const char *md0fbb24b[] = { "sexgalaxy.net/wp-includes/js/wp-emoji-release.min.js?", NULL }; const char *md0fc53f2[] = { "r.msn.com^", NULL }; const char *md0fd5e38[] = { "/releases/ads/", NULL }; +const char *md0fea909[] = { "zlacraft.com^", NULL }; const char *md0fec17f[] = { "aefqdgklyu.com^", NULL }; const char *md10038b3[] = { "/ad/leaderboard.", NULL }; const char *md101a66f[] = { "/homeslideadtop/", NULL }; @@ -42133,7 +42186,6 @@ const char *md391a0c8[] = { "international-property.countrylife.co.uk/js/search_ const char *md3933692[] = { "gsxehyapoafiwe.com^", NULL }; const char *md3940acb[] = { "advertica-cdn.com^", NULL }; const char *md3951a8a[] = { "/banner160x600-", NULL }; -const char *md395f263[] = { "cdn.jquerytools.org^", NULL }; const char *md39ca78 [] = { "infra-ad.com^", NULL }; const char *md39e755f[] = { "jal.co.jp/common_rn/js/rtam.js", NULL }; const char *md39ee76 [] = { "btnibbler.com^", NULL }; @@ -42715,6 +42767,7 @@ const char *md65c7729[] = { "questionmarket.com/adsc/", NULL }; const char *md65f65f7[] = { "distiltag.com^", NULL }; const char *md663b7ae[] = { "/rtkbeacon.gif?", NULL }; const char *md6654161[] = { "kbb.com/partner/", NULL }; +const char *md66641ef[] = { "dtto8zfzskfoa.cloudfront.net^", NULL }; const char *md666db4c[] = { "googletagmanager.com^", NULL }; const char *md667d87e[] = { "/doubleclick_ads.", NULL }; const char *md668ef30[] = { "cpmgohigh.com^", NULL }; @@ -42740,6 +42793,7 @@ const char *md68890e6[] = { "/adclick/", NULL }; const char *md689feb6[] = { "/integration?pixel=", NULL }; const char *md68b3930[] = { "againclence.com^", NULL }; const char *md68d3998[] = { "/dtm/", "/satelliteLib-", NULL }; +const char *md68f664 [] = { "/track?cb=", NULL }; const char *md69081ab[] = { "btrd.net/assets/interstitial", NULL }; const char *md690fb71[] = { "/indraeventsapi.", NULL }; const char *md6916c39[] = { "/analytics/collector/", NULL }; @@ -42852,6 +42906,7 @@ const char *md707f8b7[] = { "adserver.spankaway.com^", NULL }; const char *md7082216[] = { "niaqaltky.com^", NULL }; const char *md70938f0[] = { "/Ads-bdl?", NULL }; const char *md70fd617[] = { "vodconcepts.com^", "^banners^", NULL }; +const char *md710b663[] = { "statswebtown.com^", NULL }; const char *md7125827[] = { "ttgtmedia.com/Marketing/", NULL }; const char *md71329a9[] = { "russellgrant.com/hostedsearch/panelcounter.aspx", NULL }; const char *md7149545[] = { "cc-dt.com^", NULL }; @@ -43997,6 +44052,7 @@ const char *mdc507352[] = { "log1.17173.com^", NULL }; const char *mdc5234cf[] = { "images.v3.com^", NULL }; const char *mdc52a40 [] = { "grepdata.com^", NULL }; const char *mdc535dd8[] = { "silverpop.com^", NULL }; +const char *mdc554f30[] = { "/adsensecommon.", NULL }; const char *mdc558f2d[] = { "/adwords-conversion-tracking.", NULL }; const char *mdc561218[] = { "/468-60_", NULL }; const char *mdc564e7b[] = { "vtijuhpxlkoq.bid^", NULL }; @@ -44852,6 +44908,7 @@ const char *me0239ef3[] = { "/wp-click-track/", NULL }; const char *me0244dd5[] = { "yahoo.com/yhs/b?", NULL }; const char *me025404b[] = { "cpmleader.com^", NULL }; const char *me025cdaf[] = { "exsifsi.ru^", NULL }; +const char *me02900cd[] = { "/beacon/portal-lite?", NULL }; const char *me029dafd[] = { "24x7adservice.com^", NULL }; const char *me02b77a7[] = { "hackinformer.com^", NULL }; const char *me02bb9c4[] = { "pitchero.com^", "^toolstation.gif", NULL }; @@ -45138,6 +45195,7 @@ const char *me165a68e[] = { "homedepot.com/static/scripts/resxclsa.js", NULL }; const char *me16629d5[] = { "cloudflare.com/ajax/", NULL }; const char *me166e420[] = { "eur.a1.yimg.com^", NULL }; const char *me167ec6 [] = { "roomkey.com/referrals?", NULL }; +const char *me1697027[] = { "abc.hostedbyfembed.com/freezone.js", NULL }; const char *me169c117[] = { "/spiderad/", NULL }; const char *me16a07ab[] = { "/tc_targeting.", NULL }; const char *me16d01b8[] = { "/o_code.js", NULL }; @@ -45214,6 +45272,7 @@ const char *me1c53e30[] = { "adku.co^", NULL }; const char *me1c5f22 [] = { "/intelliad.", NULL }; const char *me1c64131[] = { "encyclopediadramatica.rs/edf/", NULL }; const char *me1c6faa3[] = { "datacratic-px.com^", NULL }; +const char *me1c8c76 [] = { "zinhavnpak.com^", NULL }; const char *me1cc2e32[] = { "pjeledftjxfnd.com^", NULL }; const char *me1cc8cb [] = { "/nLoggerJB_", NULL }; const char *me1cdcd72[] = { "af-ad.co.uk^", NULL }; @@ -46744,6 +46803,7 @@ const char *me905f94a[] = { "cdnondemand.org^", NULL }; const char *me90625c4[] = { "iialqejeka.com^", NULL }; const char *me9063b6d[] = { "t.eharmony.com^", NULL }; const char *me9073c37[] = { "befade.com^", NULL }; +const char *me907de45[] = { "_xiti_js-", NULL }; const char *me90a2cfb[] = { "burbankleader.com/hive/images/adv_", NULL }; const char *me90b69fb[] = { "honestlypopularvary.xyz^", NULL }; const char *me90bcbe1[] = { "eventbeacon.ca^", NULL }; @@ -46816,6 +46876,7 @@ const char *me9631484[] = { "ymugm4x1pwehlaskticjrn9qz9t.com^", NULL }; const char *me96521ca[] = { "/adspace1.", NULL }; const char *me9661a87[] = { "sophus3.com^", NULL }; const char *me966b972[] = { "get.2leep.com^", NULL }; +const char *me9681a5e[] = { "tjyoznaozivi.com^", NULL }; const char *me968d16f[] = { "hvwagkmgef.com^", NULL }; const char *me96a6ca [] = { "/banners/promo/", NULL }; const char *me96a8a91[] = { "vlvowhlxxibn.com^", NULL }; @@ -47375,6 +47436,7 @@ const char *mec15409d[] = { "_tile_ad_", NULL }; const char *mec165b6f[] = { "/RecordClickv2.", NULL }; const char *mec167a73[] = { "hanlowu.info^", NULL }; const char *mec1785ce[] = { "zelllwrite.com^", NULL }; +const char *mec18563b[] = { "kcnyhfmowc.com^", NULL }; const char *mec19af14[] = { "ads.adultswim.com^", NULL }; const char *mec19dec [] = { "multiview.com^", NULL }; const char *mec1aac77[] = { "-rttracking.", NULL }; @@ -49382,6 +49444,7 @@ const char *mf5623b12[] = { "99widgets.com/counters/", NULL }; const char *mf566e11 [] = { "/ads/dhtml/", NULL }; const char *mf5672cbe[] = { "qqbwymba.com^", NULL }; const char *mf567792e[] = { "haezawhdumz.bid^", NULL }; +const char *mf56889b0[] = { "smashseek.com^", NULL }; const char *mf56c7890[] = { "vhzzzbdtxhh.bid^", NULL }; const char *mf56f16f8[] = { "/setTDUID.do?", NULL }; const char *mf56f54be[] = { ".120x600.", NULL }; @@ -49815,6 +49878,7 @@ const char *mf776162f[] = { "ofghrodsrqkg.com^", NULL }; const char *mf7778d17[] = { "adserver.71i.de^", NULL }; const char *mf779dd68[] = { "stat.sputnik.ru^", NULL }; const char *mf77a0777[] = { "witbankspurs.co.za/layout_images/sponsor.jpg", NULL }; +const char *mf77a0862[] = { "xlspkqpnnqj.com^", NULL }; const char *mf77b25b1[] = { "saymedia.com^", NULL }; const char *mf77b317e[] = { "patuarioahzaen.bid^", NULL }; const char *mf77c8b83[] = { "retadint.com^", NULL }; @@ -50629,6 +50693,7 @@ const char *mfb25d69c[] = { "o.addthis.com^", NULL }; const char *mfb269e98[] = { "msads.net^", NULL }; const char *mfb287088[] = { "euromillionairesystem.me^", NULL }; const char *mfb2881ab[] = { "kdtrdexby.com^", NULL }; +const char *mfb2aa17e[] = { "starbits.io/libs/check.js", NULL }; const char *mfb2ac87d[] = { "readcomiconline.to^", "^jquery17.min.js", NULL }; const char *mfb2b7a0e[] = { "ikxdpmnznk.bid^", NULL }; const char *mfb2b9b7d[] = { "pulsemgr.com^", NULL }; @@ -50766,6 +50831,7 @@ const char *mfbc651a1[] = { "joblet.jp/javascripts/", NULL }; const char *mfbc7effa[] = { "rxknixwwt.bid^", NULL }; const char *mfbc8240d[] = { "onlinecinemavideonow.com^", NULL }; const char *mfbc97d1a[] = { "e65ew88.com^", NULL }; +const char *mfbc9a79d[] = { "2an-hit-ren.com^", NULL }; const char *mfbca96e3[] = { "doubleclick.net/pfadx/ctv.muchmusic.com/", NULL }; const char *mfbcb68fc[] = { "illustriousoatmeal.com^", NULL }; const char *mfbcd94e2[] = { "&ad.vid=", NULL }; @@ -52007,7 +52073,6 @@ const char *d42cbe396[] = { "kapaza.be", NULL }; const char *d433b238a[] = { "xhamster.com", NULL }; const char *d433d1a8d[] = { "timesofindia.indiatimes.com", NULL }; const char *d4341ab02[] = { "750g.com", "alibabuy.com", "allocine.fr", "cap-cine.fr", "chartsinfrance.net", "cotecine.fr", "easyvols.fr", "easyvoyage.com", "get-the-look.fr", "jeuxactu.com", "jeuxvideo.com", "lestream.fr", "millenium.org", "musiquemag.com", "ouest-france.fr", "ozap.com", "purebreak.com", "purepeople.com", "puretrend.com", "shopoon.fr", "terrafemina.com", NULL }; -const char *d434fc682[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d435cca54[] = { "daisuki.net", NULL }; const char *d43be7848[] = { "oralb.de", NULL }; const char *d43cec321[] = { "twer.info", NULL }; @@ -52065,7 +52130,6 @@ const char *d4cbba7bb[] = { "winfuture.de", NULL }; const char *d4cdde2f2[] = { "9anime.is", NULL }; const char *d4d13c4b9[] = { "empireonline.com", NULL }; const char *d4d1ce910[] = { "casinobonus24.se", "top5casinosites.co.uk", NULL }; -const char *d4d1f93b6[] = { "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d4d21e4b5[] = { "audiforums.com", NULL }; const char *d4d5705f0[] = { "allmusic.com", "sidereel.com", NULL }; const char *d4d5ae822[] = { "cc.com", NULL }; @@ -52142,6 +52206,7 @@ const char *d58883de8[] = { "di.se", NULL }; const char *d59158744[] = { "pinflix.com", NULL }; const char *d596f4997[] = { "nyandcompany.com", NULL }; const char *d59751bef[] = { "usps.com", NULL }; +const char *d59a4a430[] = { "thoptv.world", NULL }; const char *d59ac1380[] = { "inspirationfeed.com", NULL }; const char *d59c167cf[] = { "rosemaryconley.tv", NULL }; const char *d59e22eda[] = { "vidbox.net", NULL }; @@ -52215,6 +52280,7 @@ const char *d64bd54e1[] = { "4players.de", "brigitte.de", "buffed.de", "erdbeerl const char *d651febf6[] = { "intoday.in", NULL }; const char *d65852b80[] = { "iltalehti.fi", NULL }; const char *d65a1d254[] = { "games.yahoo.com", "onescreen.net", NULL }; +const char *d65e3f99c[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "americasfreedomfighters.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "boredomtherapy.com", "breaking911.com", "breakingnews.ie", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "faithit.com", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "intellectualconservative.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "lifebuzz.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "supercheats.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "universityherald.com", "urbantabloid.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d6648eb9a[] = { "allmusic.com", "phoronix.com", NULL }; const char *d664ddef0[] = { "gentside.com", "gentside.com.br", "maxisciences.com", "ohmymag.com", "ohmymag.com.br", NULL }; const char *d667639eb[] = { "autoblog.com", "dailyfinance.com", NULL }; @@ -52301,7 +52367,6 @@ const char *d733b411b[] = { "blastingnews.com", "eurogamer.net", "nintendolife.c const char *d736c7a10[] = { "marca.com", NULL }; const char *d73af20e0[] = { "funimation.com", NULL }; const char *d73d995c2[] = { "se.no", NULL }; -const char *d73f87e8c[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "americasfreedomfighters.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "boredomtherapy.com", "breaking911.com", "breakingnews.ie", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "faithit.com", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "intellectualconservative.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "lifebuzz.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "supercheats.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "universityherald.com", "urbantabloid.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "winningdemocrats.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d741273e3[] = { "everydayhealth.com", NULL }; const char *d742f9f19[] = { "casinobonus24.se", "casinosonline.co.uk", "onlinecasinos.co.uk", NULL }; const char *d7435822c[] = { "jamo.tv", NULL }; @@ -52556,11 +52621,11 @@ const char *d994a79f9[] = { "bexio.com", NULL }; const char *d9958e9c1[] = { "gamefly.com", NULL }; const char *d996a69bd[] = { "ardmediathek.de", NULL }; const char *d997ff562[] = { "cinemablend.com", "thesimsresource.com", NULL }; -const char *d99e68605[] = { "wnd.com", NULL }; const char *d9a00ede [] = { "travelocity.com", NULL }; const char *d9a18413b[] = { "skidrowreloaded.com", NULL }; const char *d9a232b03[] = { "atlanticcitywebcam.com", "ftlauderdalebeachcam.com", "ftlauderdalewebcam.com", "keywestharborwebcam.com", "morganhillwebcam.com", "nyharborwebcam.com", "portarubawebcam.com", "portbermudawebcam.com", "portcanaveralwebcam.com", "portevergladeswebcam.com", "portmiamiwebcam.com", "portnywebcam.com", NULL }; const char *d9a76b788[] = { "snagfilms.com", NULL }; +const char *d9a8549d6[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *d9abbbc69[] = { "oascentral.feedroom.com", NULL }; const char *d9ad79af8[] = { "support.google.com", NULL }; const char *d9af1130 [] = { "mecox.com", NULL }; @@ -52682,7 +52747,6 @@ const char *dac3b13de[] = { "robinwidget.com", "space.com", "techworld.com", "th const char *dac9dc7e4[] = { "comicbook.com", "multiup.org", NULL }; const char *daca89cbe[] = { "hardforum.com", NULL }; const char *dacaee0fc[] = { "economist.com", "feedroom.com", "stanford.edu", NULL }; -const char *dacca6ed4[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bighealthreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativetribune.com", "conservativevideos.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomforce.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.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", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "wnd.com", "xtribune.com", NULL }; const char *dad65c43e[] = { "superfilm.pl", NULL }; const char *dad7289aa[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotnewswire.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *dad8fc6d4[] = { "ca.weather.yahoo.com", NULL }; @@ -52749,7 +52813,6 @@ const char *db5834647[] = { "asianmommy.com", "filmcrave.com", NULL }; const char *db5899b98[] = { "visitpa.com", NULL }; const char *db5ed7249[] = { "tvnwarszawa.pl", NULL }; const char *db612fae1[] = { "thepoke.co.uk", NULL }; -const char *db64c789c[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "boredomtherapy.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "intellectualconservative.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "o4anews.com", "oddee.com", "opednews.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicalcowboy.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "supercheats.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "urbantabloid.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "westernjournalism.com", "winningdemocrats.com", "wnd.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *db66e839b[] = { "runnersworld.de", NULL }; const char *db6b09415[] = { "thevideo.me", "vidup.me", NULL }; const char *db6d6cdba[] = { "everycarlisted.com", NULL }; @@ -52784,7 +52847,6 @@ const char *dbb6deeb3[] = { "readersdigest.co.uk", NULL }; const char *dbb7ce997[] = { "dl.go4up.com", NULL }; const char *dbbca1792[] = { "7daysindubai.com", NULL }; const char *dbc00704d[] = { "support.amd.com", NULL }; -const char *dbc473401[] = { "disqus.com", NULL }; const char *dbc740880[] = { "amateurdumper.com", NULL }; const char *dbc9d23d8[] = { "cnettv.cnet.com", NULL }; const char *dbcac8241[] = { "nba.com", NULL }; @@ -52836,6 +52898,7 @@ const char *dc2e1edea[] = { "hotwire.com", NULL }; const char *dc2e4f62e[] = { "cbsnews.com", "colbertlateshow.com", NULL }; const char *dc320d8b [] = { "sporza.be", NULL }; const char *dc3d43063[] = { "ojogo.pt", NULL }; +const char *dc3f5128c[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "boredomtherapy.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "girlsjustwannahaveguns.com", "glitch.news", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "intellectualconservative.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "o4anews.com", "oddee.com", "opednews.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicalcowboy.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "supercheats.com", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "urbantabloid.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "westernjournalism.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *dc4276cbc[] = { "social.economico.pt", NULL }; const char *dc43fdea3[] = { "efukt.com", NULL }; const char *dc493ef8a[] = { "olweb.tv", NULL }; @@ -53070,11 +53133,11 @@ const char *de9683dfc[] = { "player.radio.com", NULL }; const char *de9c87fb7[] = { "evestment.com", NULL }; const char *de9ca9ae9[] = { "viafree.dk", "viafree.no", NULL }; const char *de9d10838[] = { "filecloud.io", NULL }; +const char *de9f4f6c0[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bighealthreport.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativetribune.com", "conservativevideos.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomforce.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.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", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "xtribune.com", NULL }; const char *dea036b39[] = { "cleodesktop.com", "mugiwaranofansub.blogspot.com.ar", "musicacelestial.net", NULL }; const char *dea4fbb00[] = { "www.tlc.com", NULL }; const char *dead6aa4d[] = { "gramfeed.com", NULL }; const char *deb07ce9a[] = { "sankakucomplex.com", NULL }; -const char *deb253f4a[] = { "multi-evolution.tech", NULL }; const char *deb88d964[] = { "tvmuse.com", NULL }; const char *deba8d171[] = { "leparisien.fr", NULL }; const char *debc9c66a[] = { "bebo.com", NULL }; @@ -53100,6 +53163,7 @@ const char *def7f9973[] = { "blastro.com", NULL }; const char *def8053ab[] = { "memoryholeblog.com", NULL }; const char *def81a856[] = { "physorg.com", NULL }; const char *def9158b7[] = { "indiatvnews.com", "intoday.in", NULL }; +const char *defc57163[] = { "holavid.com", NULL }; const char *df0112354[] = { "technobuffalo.com", NULL }; const char *df0749e43[] = { "lazada.co.id", NULL }; const char *df077acb8[] = { "sotumblry.com", "walkhighlands.co.uk", NULL }; @@ -53118,6 +53182,7 @@ const char *df34a0970[] = { "tvcatchup.com", NULL }; const char *df388bf6b[] = { "amypink.de", "biznews.com", "cryptospot.me", "dailycaller.com", "droid-life.com", "forwardprogressives.com", "fpif.org", "fullpotentialma.com", "geekzone.co.nz", "goldsday.com", "hoyentec.com", "imageupload.co.uk", "is-arquitectura.es", "lazygamer.net", "lingholic.com", "mmanews.com", "nehandaradio.com", "nmac.to", "orain.org", "tvunblock.com", "unilad.co.uk", "xrussianteens.com", "youngcons.com", NULL }; const char *df3fe3bb0[] = { "video.epicurious.com", "video.gq.com", "video.wired.com", NULL }; const char *df401282f[] = { "100percentfedup.com", "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "boredomtherapy.com", "breaking911.com", "breathecast.com", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailydot.com", "dailyfeed.co.uk", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "damnlol.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "faithit.com", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "gamerant.com", "girlsjustwannahaveguns.com", "glitch.news", "godfatherpolitics.com", "gosocial.co", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "headcramp.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "janmorganmedia.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "o4anews.com", "oddee.com", "opednews.com", "parentherald.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicalcowboy.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "reverbpress.com", "reviveusa.com", "rightwingnews.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "theboredmind.com", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tinypic.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "universityherald.com", "usherald.com", "valuewalk.com", "vcpost.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "westernjournalism.com", "winningdemocrats.com", "xtribune.com", "youthhealthmag.com", NULL }; +const char *df406ebca[] = { "activistpost.com", "addictinginfo.com", "alfonzorachel.com", "allenwestrepublic.com", "allthingsvegas.com", "americansublime.com", "askmefast.com", "auntyacid.com", "barbwire.com", "bestfunnyjokes4u.com", "bighealthreport.com", "bipartisanreport.com", "breaking911.com", "breathecast.com", "bugout.news", "bulletsfirst.net", "celebrity-gossip.net", "clashdaily.com", "classicalite.com", "collapse.news", "comicallyincorrect.com", "conservativebyte.com", "conservativeintel.com", "conservativevideos.com", "constitution.com", "coviral.com", "craigjames.com", "creepybasement.com", "crossmap.com", "cyberwar.news", "dailyheadlines.net", "dailyhealthpost.com", "dailysurge.com", "dccrimestories.com", "deneenborelli.com", "digitaljournal.com", "eaglerising.com", "earnthenecklace.com", "enstarz.com", "evil.news", "fitnessconnoisseur.com", "foreverymom.com", "freedom.news", "freedomdaily.com", "freedomforce.com", "freedomoutpost.com", "freewarefiles.com", "gamerant.com", "gamersheroes.com", "girlsjustwannahaveguns.com", "godfatherpolitics.com", "groopspeak.com", "guardianlv.com", "guns.news", "gymflow100.com", "hallels.com", "hautereport.com", "healthstatus.com", "hispolitica.com", "hngn.com", "honesttopaws.com", "ifyouonlynews.com", "infowars.com", "instigatornews.com", "jobsnhire.com", "joeforamerica.com", "juicerhead.com", "justdiy.com", "kdramastars.com", "keepandbear.com", "kpopstarz.com", "lastresistance.com", "latinpost.com", "legalinsurrection.com", "liberty.news", "libertyalliance.com", "libertyunyielding.com", "lidblog.com", "medicine.news", "mentalflare.com", "minutemennews.com", "musictimes.com", "myscienceacademy.org", "natural.news", "naturalblaze.com", "naturalnews.com", "naturalsociety.com", "natureworldnews.com", "newser.com", "newseveryday.com", "newsthump.com", "oddee.com", "patriotoutdoornews.com", "patriottribune.com", "pickthebrain.com", "politicaloutcast.com", "politichicks.com", "practicallyviral.com", "quirlycues.com", "rantlifestyle.com", "realfarmacy.com", "realmomsrealreviews.com", "realtytoday.com", "redhotchacha.com", "redmaryland.com", "returnofkings.com", "robotics.news", "shark-tank.com", "shedthoselbs.com", "slender.news", "sonsoflibertymedia.com", "spectator.org", "stevedeace.com", "stupid.news", "techconsumer.com", "techtimes.com", "theblacksphere.net", "thefreethoughtproject.com", "thegatewaypundit.com", "thehayride.com", "thelibertarianrepublic.com", "themattwalshblog.com", "thepoke.co.uk", "therealside.com", "theviralmob.com", "tosavealife.com", "traileraddict.com", "truththeory.com", "twisted.news", "usherald.com", "valuewalk.com", "vcpost.com", "vgpie.com", "victoriajackson.com", "videogamesblogger.com", "viralnova.com", "viralthread.com", "visiontoamerica.com", "wakingtimes.com", "xtribune.com", "youthhealthmag.com", NULL }; const char *df40e3c13[] = { "etsy.com", NULL }; const char *df436ca6b[] = { "fiberupload.net", NULL }; const char *df45478a8[] = { "washingtonpost.com", NULL }; @@ -53200,10 +53265,10 @@ const char *dn18ef5f93[] = { "adnetwork.ai", "adnetwork.ie", NULL }; const char *dn1994283d[] = { "yobt.com.ip", NULL }; const char *dn19a7309a[] = { "adultfriendfinder.co.uk", "adultfriendfinder.com", NULL }; const char *dn19b777b [] = { "motortrader.com.my", NULL }; +const char *dn19dcaab5[] = { "webtracking.girard-agediss.com", NULL }; const char *dn1a0e0218[] = { "wordpress.org", NULL }; const char *dn1aa44576[] = { "apps.su.ip", NULL }; const char *dn1aabec54[] = { "t-ads.org", NULL }; -const char *dn1c848290[] = { "adfox.hu", NULL }; const char *dn1d9cecea[] = { "abramarketing.com", "advertising-direct.com", "advertising-factory.de", "microsoft.com", "outbrain.com", "yellowimages.com", NULL }; const char *dn1e314cf2[] = { "search-news-cn.ip", NULL }; const char *dn1ed3c9e1[] = { "netaffiliation.com", NULL }; @@ -53299,6 +53364,7 @@ const char *dn72df9ef6[] = { "e-goi.com.br", "e-goi.pt", NULL }; const char *dn72fc9597[] = { "adweb.clarkson.edu", "adweb.com.au", "adweb.cz", NULL }; const char *dn73be1710[] = { "adbar.fi", "adbar.io", NULL }; const char *dn745fe9ba[] = { "keen.github.io", "keen.io", NULL }; +const char *dn756b2edb[] = { "adfox.de", "adfox.hu", NULL }; const char *dn75f2a601[] = { "admedia.co.il", NULL }; const char *dn76486df7[] = { "advert-technology.com", "advert-technology.ru", NULL }; const char *dn76f02054[] = { "bpaww.com.ip", NULL }; @@ -53369,8 +53435,8 @@ const char *dnaffec99c[] = { "ynet-il.ip", NULL }; const char *dnb077e75c[] = { "github.com", "matomo.org", "piwik.org", NULL }; const char *dnb1c5e36d[] = { "adline.co.il", NULL }; const char *dnb337d652[] = { "smartpixel.tv", NULL }; -const char *dnb459878 [] = { "freelance-adwords.com", "freelance-adwords.fr", NULL }; const char *dnb4cb6bf4[] = { "crosspixelmedia.ip", NULL }; +const char *dnb5588f68[] = { "consultant-adwords.fr", "freelance-adwords.com", "freelance-adwords.fr", NULL }; const char *dnb55be48f[] = { "mydirtyhobby.com", "mydirtyhobby.de", NULL }; const char *dnb5e497d5[] = { "conad.it", NULL }; const char *dnb6331674[] = { "adman-industries.com", NULL }; @@ -53725,7 +53791,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8da702cf, 0, NULL, NULL }, {m891698af, 0, NULL, NULL }, {m48759f83, 0, NULL, NULL }, - {mae2143c0, 0, NULL, dnb459878 }, + {mae2143c0, 0, NULL, dnb5588f68 }, {mc648ce6a, 0, NULL, NULL }, {m92908431, 0, NULL, NULL }, {m266455e, 0, NULL, NULL }, @@ -53800,6 +53866,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m64744a37, 0, NULL, NULL }, {m757c6147, 0, NULL, NULL }, {m36f55d9d, 0, NULL, NULL }, + {m35ecf91c, 0, NULL, NULL }, {m9d5a61d, 0, NULL, NULL }, {m45d84328, 0, NULL, NULL }, {mc75442e5, 0, NULL, NULL }, @@ -54608,6 +54675,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf1202c74, 0, NULL, NULL }, {mffa6c2b4, 0, NULL, NULL }, {m1f618ff7, 0, NULL, NULL }, + {m6ffe0f14, 0, NULL, NULL }, {mf9a369b1, 0, NULL, NULL }, {m8d041458, 0, NULL, NULL }, {maff8472f, 0, NULL, NULL }, @@ -55183,7 +55251,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m6228e452, 0, NULL, NULL }, {m32ace24a, 0, NULL, NULL }, {m701180a8, 0, NULL, NULL }, - {m67d80666, 0, NULL, dn1c848290 }, + {m67d80666, 0, NULL, dn756b2edb }, {m63d5c183, 0, NULL, NULL }, {me08cca38, 0, NULL, NULL }, {ma0bd3f5b, 0, NULL, NULL }, @@ -55676,6 +55744,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m342f097e, 0, NULL, NULL }, {m4d252905, 0, NULL, NULL }, {mf7e808ca, 0, NULL, NULL }, + {m2e1a628, 0, NULL, NULL }, {mbd3e0732, 0, NULL, NULL }, {mfd225f1a, 0, NULL, NULL }, {mb6c1f2c2, 0, NULL, NULL }, @@ -56172,6 +56241,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m74a0e178, 0, NULL, NULL }, {m34525dd8, 0, NULL, dnfed7ab09 }, {m2df1b819, 0, NULL, NULL }, + {mdc554f30, 0, NULL, NULL }, {mf639e2ac, 0, NULL, NULL }, {m8d1b8e52, 0, NULL, NULL }, {mc91c54e4, 0, NULL, NULL }, @@ -56241,6 +56311,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m52504b78, 0, NULL, NULL }, {m51d9b7cc, 0, NULL, NULL }, {m74af360c, 0, NULL, NULL }, + {m78acfdc1, 0, NULL, NULL }, {md486a3c0, 0, NULL, dnc0db9961 }, {md8846b75, 0, NULL, dn46503939 }, {mb3a5166f, 0, NULL, NULL }, @@ -56511,6 +56582,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m12259f33, 0, NULL, NULL }, {m6662a6b7, 0, NULL, NULL }, {m3d8f9dc6, 0, NULL, NULL }, + {m996b7f57, 0, NULL, NULL }, {m9973ce1c, 0, NULL, NULL }, {m3162d78f, 0, NULL, NULL }, {mbba86646, 0, NULL, NULL }, @@ -56522,6 +56594,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb955bb22, 0, NULL, NULL }, {mebb28f3, 0, NULL, NULL }, {m7e305e8c, 0, NULL, NULL }, + {m36a7f3dd, 0, NULL, NULL }, {mced7bca0, 0, NULL, NULL }, {m8ed09c1b, 0, NULL, NULL }, {m2876054b, 0, NULL, NULL }, @@ -57601,6 +57674,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mbe78a597, 0, NULL, NULL }, {m65610c95, 0, NULL, NULL }, {m2ac53512, 0, NULL, NULL }, + {m26c2f02f, 0, NULL, NULL }, {mc1ee5af5, 0, NULL, NULL }, {m4fd0081e, 0, NULL, NULL }, {mfd374f5, 0, NULL, NULL }, @@ -57800,6 +57874,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3543649, 0, NULL, NULL }, {ma2018f9b, 0, NULL, NULL }, {mb7286b72, 0, NULL, NULL }, + {mb0ae1c26, 0, NULL, NULL }, {m46c9a9db, 0, NULL, NULL }, {mf3b5f608, 0, NULL, NULL }, {m2febb92a, 0, NULL, NULL }, @@ -60551,6 +60626,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3b495971, 0, NULL, NULL }, {mba64d831, 0, NULL, NULL }, {m8990872b, 0, NULL, NULL }, + {m599960c2, 0, NULL, NULL }, {m641c3203, 0, NULL, NULL }, {m3710dfac, 0, NULL, NULL }, {mf709bf27, 0, NULL, NULL }, @@ -61012,7 +61088,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mc9c8bb6e, ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6cb3be1a, ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m62b9a254, ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m77f92d65, 0, NULL, NULL }, {mcbdd4fda, 0, NULL, NULL }, {m4ff85720, 0, NULL, NULL }, {m1a822994, 0, NULL, NULL }, @@ -62006,7 +62081,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m917e1d3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma4fdb027, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb0858715, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {m9afc2385, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf7cc1b56, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m39754bcb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5473e14d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -64781,7 +64855,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m379e341b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md969a8d7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5757d3a4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mc9d3d89d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbded8a14, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me07d4fb8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m24ebd6e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -65502,7 +65575,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m47214995, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m42c73a12, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1664aa77, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, - {mb180426f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1ac52cfd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, dn9b8587f6 }, {mdaa1ef83, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbc530d50, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67455,11 +67527,15 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m32756e7c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mccae357c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m83827c7d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc449f508, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1b8c4dd3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mfbc9a79d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma4c26f4a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {maeadb94c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m5ecea101, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4c0548d4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9b26e807, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m9afc2385, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md4471ff7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m61b14818, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m42ced6cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67475,6 +67551,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md82ba26a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1f459a47, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8bc8a2ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb53e8d92, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m90f9077a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mee515ac9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m44b38264, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67493,6 +67570,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m54931476, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me2357be7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf20be3f0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m56cc0e8a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m2f2528a6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m290a591d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mf69259ed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma31d9c42, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67501,6 +67580,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb124b01a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4e6b0f7d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc893c8e5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc9d3d89d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbe38e27a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc75bcf7c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2aa5e5bd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67538,6 +67618,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mec1785ce, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m30f647a8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2ac693c9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {md0fea909, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m49a092d2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mac0d2ffb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7a552fff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67653,8 +67734,10 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m3daa345, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4ec385be, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2f4e394e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m4b8db0eb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9760907b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m113e7069, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m9a33b940, 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 }, {meeac3b7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67668,9 +67751,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m486d5cfc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m13dab28c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5824f4db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc7379969, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc696038, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma3e271b9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m51267f0c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m17c51fc6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m65716c7a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m43b47b6e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2d5a7c32, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m76bf6f69, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67686,6 +67772,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5d61a9e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3348c2cf, 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 }, + {m5d382b0b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m1751600f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1b1bfd9c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2f06adc1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m911e6915, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67717,20 +67805,24 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m41f9c7b2, 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 }, {m12229eaa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mc5143b4c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6c57db0a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md9537d22, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mec18563b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m295cbdd2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6e8cf432, 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 }, {m15eb112d, 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 }, + {m4e0eb3b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m39adbe3a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2ec4a500, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8a570d04, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6ea5c1d3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6d01dc41, 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 }, + {m5d8e7e3a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mbd937ac5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mff7ef157, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m625defa6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67745,13 +67837,16 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m37daf4a0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6b8af9e8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc5aea2a7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m37a772e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb72d7426, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m38c72922, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4ceaa3cb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mdfb15bcf, 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 }, {m5b13c453, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc9920600, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m17de82db, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb00a914b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mc42192e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md1d2b83d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6165c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67764,7 +67859,9 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m992138af, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb4148f49, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me095ca3f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m838977fa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m60289f3c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m60625544, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m326f841b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meee55096, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7c92bf95, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67776,14 +67873,17 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m37a5e790, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2e460f2b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m15e0e7b1, 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 }, {m16df2925, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m53c47064, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7a05270a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma0d1ee4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m55d68710, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me9681a5e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m96855ada, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m89fca81e, 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 }, + {m912d6d4b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3f35b450, 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 }, {m4fd2479b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67794,10 +67894,12 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mec645a87, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9de4a95e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m11d86188, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {ma4f74768, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me0f8e4f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me0b53ad8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mccb0efbd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4562850, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m22c05fe9, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mef71fce2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me82d6e0d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma39ec6b3, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67812,6 +67914,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m46825f93, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mad0081fd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m4dcadd4c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mab20e525, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m80185941, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m2d114ffd, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m7ffb3329, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -67820,6 +67923,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {ma2fcf88, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb30b3eb2, 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 }, + {m75057145, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mf77a0862, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m1af7578e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m3a564e1f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m6f3525b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -77207,6 +77312,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m766b4f2d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m95a6ec1b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mccd6d903, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {me1c8c76, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m79a85359, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m91287114, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8cd4ce95, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -78021,6 +78127,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m5ac197f4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m77492b65, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9d2b8949, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {md66641ef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3b6a5eef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7bdd6df5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5e4bf6b1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -84295,7 +84402,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9a9d6683, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d5aacedfc, NULL }, {mc4a9ee1e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, da0187f1b, NULL }, {m3d30a93a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d5f4b38f2, NULL }, - {md395f263, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d99e68605, NULL }, {m9632f084, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, df834abc1, NULL }, {m4c3a562a, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5fd8114, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -84307,8 +84413,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maf4f8b94, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, dcd1e0332, NULL }, {macf1d3ae, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d98576519, NULL }, {m5b0a0388, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d992a21d8, NULL }, - {mc00f1e0f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d4d1f93b6, NULL }, - {m6b40fc66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d434fc682, NULL }, + {mc00f1e0f, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, df406ebca, NULL }, + {m6b40fc66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d9a8549d6, NULL }, {m617d0c96, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, de867256e, NULL }, {mfcd3ea66, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d70569de8, NULL }, {m8ad1de74, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, df6efc399, NULL }, @@ -84320,7 +84426,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m404e2c27, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mb374fbf8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m4ce79253, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, dabb2f3c1, NULL }, - {m5bb2b6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d73f87e8c, NULL }, + {m5bb2b6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d65e3f99c, NULL }, {m2eb54804, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9b622f5d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, d530ea27a, NULL }, {m807a2b3e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, d992a21d8, NULL }, @@ -84331,7 +84437,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m17339eca, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, d39dfaf97, NULL }, {mb7686720, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8455d9ab, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, d21883ec5, NULL }, - {m3aaa901, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, dacca6ed4, NULL }, + {m3aaa901, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, de9f4f6c0, NULL }, {mfbfba0e8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, da0187f1b, NULL }, {mc1b6efc0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, d7bfefe9e, NULL }, {mc87096ce, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, dd6db0df1, NULL }, @@ -84371,7 +84477,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mff0aeab8, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m4bc9855e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma31f3d93, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, df75086, NULL }, - {ma0d5bdf3, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, db64c789c, NULL }, + {ma0d5bdf3, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, dc3f5128c, NULL }, {m102c0c52, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m29926463, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, dadda8398, NULL }, {m6e0aabf7, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -84429,6 +84535,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4f59fdb9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb383b388, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mb0a4a717, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {m7c3d8c27, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m43582a8e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m6a10e5cf, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m54d58dc0, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -88561,11 +88668,13 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m36e7e555, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {maae234e, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dd9e6a333, NULL }, {m791d99dc, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dd9e6a333, NULL }, - {m9076182a, ADBLOCK_FLAG_MATCH_DOMAIN, d2aa66467, NULL }, + {maaa024e6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d2aa66467, NULL }, + {m64943f12, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, d2aa66467, NULL }, {m2b141ff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, dadab6169, NULL }, {m447b95f3, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma1745502, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbcfb3a67, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m104f04ee, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mb29f7b0f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me389c08e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md8fcb777, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -88979,7 +89088,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {maa7a907f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dfa868bc, NULL }, {meff685f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mec367ab6, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, - {m824a8ca4, ADBLOCK_FLAG_MATCH_DOMAIN, deb253f4a, NULL }, {mf1ea514d, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, dd05b1c73, NULL }, {mb6aff7f2, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {mcafc8e37, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, @@ -89006,6 +89114,11 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m8d4a8664, 0, NULL, NULL }, {m5d0f3e9, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, da3eeae13, NULL }, {mdb68e8eb, ADBLOCK_FLAG_EXCEPTION | ADBLOCK_FLAG_MATCH_DOMAIN, da3eeae13, NULL }, + {m824a8ca4, ADBLOCK_FLAG_MATCH_DOMAIN, d59a4a430, NULL }, + {me1697027, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mf56889b0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, defc57163, NULL }, + {ma3a52afd, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, + {mfb2aa17e, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_FIRST_PARTY, NULL, NULL }, {m959374f7, 0, NULL, NULL }, {m69eee246, 0, NULL, NULL }, {m480a1f0f, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -89052,6 +89165,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2f0731bf, 0, NULL, NULL }, {mb3a2f31, 0, NULL, NULL }, {me4bbbd5e, 0, NULL, NULL }, + {m10383fc3, 0, NULL, NULL }, {mc2203e8b, 0, NULL, NULL }, {m621609db, 0, NULL, NULL }, {md7ae4a00, 0, NULL, NULL }, @@ -89732,6 +89846,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m72d60e44, 0, NULL, NULL }, {ma7dc3764, 0, NULL, NULL }, {m75927e96, 0, NULL, NULL }, + {me02900cd, 0, NULL, NULL }, {m7fa4db62, 0, NULL, NULL }, {m8e96ea8b, 0, NULL, NULL }, {meb2c6f86, 0, NULL, NULL }, @@ -90892,6 +91007,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m17bec0fd, 0, NULL, NULL }, {mc9dae2e, 0, NULL, NULL }, {m72fb77e4, 0, NULL, NULL }, + {m6f6d0cc, 0, NULL, NULL }, + {maf49881, 0, NULL, NULL }, {m874ba722, 0, NULL, NULL }, {m72a0ec0c, 0, NULL, NULL }, {m9e09ebd3, 0, NULL, NULL }, @@ -91034,6 +91151,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m20df85f5, 0, NULL, NULL }, {ma50a5f11, 0, NULL, NULL }, {me682c40e, 0, NULL, NULL }, + {m7b73d411, 0, NULL, NULL }, {mb0163acc, 0, NULL, NULL }, {mb0ae6012, 0, NULL, NULL }, {m395fca20, 0, NULL, NULL }, @@ -92178,6 +92296,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m4b5ed0db, 0, NULL, NULL }, {m9707598, ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m521c04d3, 0, NULL, NULL }, + {md68f664, 0, NULL, NULL }, {me9d2922b, 0, NULL, NULL }, {mf2714206, 0, NULL, NULL }, {m7cf00c06, 0, NULL, NULL }, @@ -92375,6 +92494,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1341a065, 0, NULL, NULL }, {mb1e57207, 0, NULL, NULL }, {m86876d2d, 0, NULL, NULL }, + {m4ae0351a, 0, NULL, NULL }, {mb0b138c3, 0, NULL, NULL }, {mac445ab9, 0, NULL, NULL }, {mf3feecc3, 0, NULL, NULL }, @@ -92408,6 +92528,8 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md3f5dbe1, 0, NULL, NULL }, {m8f55fc81, 0, NULL, NULL }, {m3c54fb32, 0, NULL, NULL }, + {m81d645de, 0, NULL, NULL }, + {m7dd400fb, 0, NULL, NULL }, {m849d8017, 0, NULL, NULL }, {m8edd2f47, 0, NULL, NULL }, {mbe32f89d, ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -92645,6 +92767,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcae8bdbd, 0, NULL, NULL }, {m7a243da0, 0, NULL, NULL }, {mafff0483, 0, NULL, NULL }, + {m57d84071, 0, NULL, NULL }, {mdf275ea3, 0, NULL, NULL }, {mf3a401f4, 0, NULL, NULL }, {m85a2f489, 0, NULL, NULL }, @@ -92660,7 +92783,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m2a665891, 0, NULL, NULL }, {mea022997, 0, NULL, NULL }, {m968dd2e8, 0, NULL, NULL }, - {m3ece726b, 0, NULL, NULL }, + {m3ece726b, 0, NULL, dn19dcaab5 }, {md61c472e, 0, NULL, NULL }, {m41b45a13, 0, NULL, NULL }, {m21178978, 0, NULL, NULL }, @@ -92955,6 +93078,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mcfa3f9c8, 0, NULL, NULL }, {mfb36b8c7, 0, NULL, NULL }, {me871a8bb, 0, NULL, NULL }, + {me907de45, 0, NULL, NULL }, {m4523e547, 0, NULL, NULL }, {ma36237f7, 0, NULL, NULL }, {mebfdff, 0, NULL, dn702542c8 }, @@ -94841,6 +94965,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m1b1bffff, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8bd74226, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m922dd763, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {mb180426f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {me86c829a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m96cf7381, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m9bd3aa40, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -94988,6 +95113,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m9ccf0a62, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md2274a90, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md342cffe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {md710b663, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m57158cdc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {ma4fb83f6, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meb175e99, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -96560,6 +96686,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf2c2e315, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {mae90465a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {meba8bbda, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, + {m620fc12a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m5ab79b18, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m8e7972fb, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {m52f313f5, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, @@ -97037,6 +97164,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m827598fc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mc932e95e, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m67e019e2, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m33ea2a19, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mab1d2fe5, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {ma8cdc602, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, {m4fa7a58f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -98520,6 +98648,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mde8f5908, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_THIRD_PARTY, NULL, NULL }, {md5222ba1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9cb69500, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {ma2125c3c, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m899f51a1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3542f8b7, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2f97b721, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_WILDCARD, NULL, NULL }, @@ -100913,7 +101042,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m15dd927d, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {mfd6468d8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m53243903, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, - {mb589cf94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m513bad03, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma309af4b, ADBLOCK_FLAG_MATCH_DOMAIN, NULL, NULL }, {m3f026c4d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -101846,7 +101974,6 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mb0346efe, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7bcbf8f0, NULL }, {me7f713ea, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7d80923c, NULL }, {m87570536, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dc9a1ff2b, NULL }, - {m71cbae27, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, dbc473401, NULL }, {ma5eda26b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d7bcbf8f0, NULL }, {mce4add4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d25eaf46d, NULL }, {mcebc9eed, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, d291d7854, NULL }, @@ -104671,6 +104798,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {md95bdbf8, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9c3c675, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3189c029, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m3294b6ce, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m986ac7cc, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m66838a35, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m7bf7c36b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -105533,6 +105661,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m58451e25, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mbc737b8f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1074c50, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m230275c4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {me9d60802, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {med765995, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mae595997, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -105546,6 +105675,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {mf14dd46b, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1128581, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m2c531379, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m71cbae27, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m1d2b77a4, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m26ff225, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md546e6ac, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -105708,6 +105838,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {m462df124, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m13a0510a, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mfa72d4ef, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {mb589cf94, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {mf210982f, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m54d76495, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m739837c1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, @@ -106079,6 +106210,7 @@ struct adblock_entry ADBLOCK_ENTRIES[ADBLOCK_ENTRY_COUNT] = { {me8a06fa0, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {md922e971, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m9f41e80d, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, + {m5825b0aa, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m3121bad1, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {ma776b274, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, {m4eb2d00c, ADBLOCK_FLAG_MATCH_DOMAIN | ADBLOCK_FLAG_HAS_SEPARATOR, NULL, NULL }, diff --git a/patches/BRM000_Disable-third-party-cookies-by-default.patch b/patches/BRM000_Disable-third-party-cookies-by-default.patch index 9ca55a08..5dbd32eb 100644 --- a/patches/BRM000_Disable-third-party-cookies-by-default.patch +++ b/patches/BRM000_Disable-third-party-cookies-by-default.patch @@ -10,7 +10,7 @@ author: Chad Miller diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc --- a/components/content_settings/core/browser/cookie_settings.cc +++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings( +@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings( void CookieSettings::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/BRM004_google-cloud-messaging-disable-experiment-status-check.patch b/patches/BRM004_google-cloud-messaging-disable-experiment-status-check.patch index 62ac2de3..d3ea67d4 100644 --- a/patches/BRM004_google-cloud-messaging-disable-experiment-status-check.patch +++ b/patches/BRM004_google-cloud-messaging-disable-experiment-status-check.patch @@ -10,7 +10,7 @@ This avoids trk:263 from triggering. diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc --- a/components/gcm_driver/gcm_channel_status_request.cc +++ b/components/gcm_driver/gcm_channel_status_request.cc -@@ -23,8 +23,10 @@ namespace gcm { +@@ -24,8 +24,10 @@ namespace gcm { namespace { @@ -21,24 +21,24 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes. const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes. -@@ -57,6 +59,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() { - } +@@ -58,6 +60,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() { void GCMChannelStatusRequest::Start() { + // url_loader_factory_ can be null for tests. +#if 0 - DCHECK(!url_fetcher_); + if (!url_loader_factory_) + return; - GURL request_url(channel_status_request_url_); -@@ -112,6 +115,9 @@ void GCMChannelStatusRequest::Start() { - url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | - net::LOAD_DO_NOT_SAVE_COOKIES); - url_fetcher_->Start(); +@@ -113,6 +116,9 @@ void GCMChannelStatusRequest::Start() { + net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES; + resource_request->method = "POST"; + resource_request->headers.SetHeader(net::HttpRequestHeaders::kUserAgent, +#endif + // Simulate an empty response and disable GCM. + callback_.Run(false, false, 0); - } - - void GCMChannelStatusRequest::OnURLFetchComplete( + user_agent_); + // TODO(https://crbug.com/808498): Re-add data use measurement once + // SimpleURLLoader supports it. -- 2.7.4 diff --git a/patches/BRM005_updater-disable-updater-pings.patch b/patches/BRM005_updater-disable-updater-pings.patch index bd5141c5..c49b2b89 100644 --- a/patches/BRM005_updater-disable-updater-pings.patch +++ b/patches/BRM005_updater-disable-updater-pings.patch @@ -36,10 +36,10 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp - pings_enabled_(config_policy.PingsEnabled()), - require_encryption_(require_encryption), + pings_enabled_(false), - url_source_override_(config_policy.UrlSourceOverride()) { + url_source_override_(config_policy.UrlSourceOverride()), + initial_delay_(config_policy.InitialDelay()) { if (config_policy.TestRequest()) - extra_info_ += "testrequest=\"1\""; -@@ -70,8 +69,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { +@@ -73,8 +72,6 @@ std::vector ConfiguratorImpl::UpdateUrl() const { } std::vector urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)}; @@ -51,14 +51,14 @@ diff --git a/components/component_updater/configurator_impl.cc b/components/comp diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h --- a/components/component_updater/configurator_impl.h +++ b/components/component_updater/configurator_impl.h -@@ -91,7 +91,6 @@ class ConfiguratorImpl { - bool deltas_enabled_; - bool fast_update_; - bool pings_enabled_; -- bool require_encryption_; - GURL url_source_override_; +@@ -95,7 +95,6 @@ class ConfiguratorImpl { + const bool deltas_enabled_; + const bool fast_update_; + const bool pings_enabled_; +- const bool require_encryption_; + const GURL url_source_override_; + const int initial_delay_; - DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl); -- 2.7.4 diff --git a/patches/BRM006_prefs-only-keep-cookies-until-exit.patch b/patches/BRM006_prefs-only-keep-cookies-until-exit.patch index 26282846..e33fcf8a 100644 --- a/patches/BRM006_prefs-only-keep-cookies-until-exit.patch +++ b/patches/BRM006_prefs-only-keep-cookies-until-exit.patch @@ -10,7 +10,7 @@ Out with all those tracking cookies! diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() { +@@ -119,7 +119,7 @@ void ContentSettingsRegistry::Init() { // WARNING: The string names of the permissions passed in below are used to // generate preference names and should never be changed! diff --git a/patches/BRM008_promo-disable-Google-promotion-fetching.patch b/patches/BRM008_promo-disable-Google-promotion-fetching.patch index 59f54e05..ce25ac15 100644 --- a/patches/BRM008_promo-disable-Google-promotion-fetching.patch +++ b/patches/BRM008_promo-disable-Google-promotion-fetching.patch @@ -22,7 +22,7 @@ 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 -@@ -130,6 +130,7 @@ namespace signin { +@@ -140,6 +140,7 @@ const char kSigninPromoLandingURLSuccessPage[] = "success.html"; bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) { DCHECK(profile); diff --git a/patches/BRM010_Modify-default-preferences.patch b/patches/BRM010_Modify-default-preferences.patch index 358b42a7..be72351a 100644 --- a/patches/BRM010_Modify-default-preferences.patch +++ b/patches/BRM010_Modify-default-preferences.patch @@ -5,7 +5,6 @@ Subject: Modify default preferences --- chrome/browser/background/background_mode_manager.cc | 2 +- chrome/browser/chrome_content_browser_client.cc | 2 +- - chrome/browser/io_thread.cc | 2 +- chrome/browser/net/prediction_options.cc | 2 +- chrome/browser/net/prediction_options.h | 2 +- chrome/browser/profiles/profile.cc | 2 +- @@ -19,12 +18,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, 18 insertions(+), 30 deletions(-) + 15 files changed, 17 insertions(+), 29 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 -@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { +@@ -351,7 +351,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); #endif @@ -36,7 +35,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 -@@ -1015,7 +1015,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( +@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); @@ -45,18 +44,6 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures); // Register user prefs for mapping SitePerProcess and IsolateOrigins in // user policy in addition to the same named ones in Local State (which are -diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc ---- a/chrome/browser/io_thread.cc -+++ b/chrome/browser/io_thread.cc -@@ -569,7 +569,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { - std::string()); - registry->RegisterBooleanPref(prefs::kEnableReferrers, true); - data_reduction_proxy::RegisterPrefs(registry); -- registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); -+ registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false); - registry->RegisterListPref(prefs::kDnsOverHttpsServers); - registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods); - #if defined(OS_POSIX) diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc --- a/chrome/browser/net/prediction_options.cc +++ b/chrome/browser/net/prediction_options.cc @@ -84,7 +71,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 -@@ -137,7 +137,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; +@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kSearchSuggestEnabled, @@ -108,7 +95,7 @@ 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 -@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) { +@@ -385,8 +385,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) { void RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0); @@ -177,19 +164,19 @@ 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 -@@ -210,7 +210,7 @@ void AutofillManager::RegisterProfilePrefs( +@@ -189,7 +189,7 @@ void AutofillManager::RegisterProfilePrefs( registry->RegisterIntegerPref( prefs::kAutofillCreditCardSigninPromoImpressionCount, 0); registry->RegisterBooleanPref( - prefs::kAutofillEnabled, true, + prefs::kAutofillEnabled, false, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterIntegerPref( - prefs::kAutofillLastVersionDeduped, 0, + registry->RegisterBooleanPref( + prefs::kAutofillProfileEnabled, true, diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc --- a/components/bookmarks/browser/bookmark_utils.cc +++ b/components/bookmarks/browser/bookmark_utils.cc -@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model, +@@ -443,12 +443,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model, void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( prefs::kShowBookmarkBar, @@ -207,7 +194,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc --- a/components/safe_browsing/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/common/safe_browsing_prefs.cc -@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { +@@ -278,9 +278,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) { registry->RegisterBooleanPref( prefs::kSafeBrowsingSawInterstitialScoutReporting, false); registry->RegisterBooleanPref( @@ -222,7 +209,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -365,14 +365,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const { +@@ -366,14 +366,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const { if (is_theme()) return false; diff --git a/patches/BRM012_Do-not-store-passwords-by-default.patch b/patches/BRM012_Do-not-store-passwords-by-default.patch index 76370d08..105731eb 100644 --- a/patches/BRM012_Do-not-store-passwords-by-default.patch +++ b/patches/BRM012_Do-not-store-passwords-by-default.patch @@ -9,7 +9,7 @@ Subject: Do not store passwords by default diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc -@@ -228,10 +228,10 @@ PasswordFormManager* FindMatchedManager( +@@ -278,10 +278,10 @@ bool ShouldPromptUserToSavePassword(const PasswordFormManager& manager) { void PasswordManager::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { registry->RegisterBooleanPref( diff --git a/patches/BRM013_Disable-NTP-remote-suggestions-by-default.patch b/patches/BRM013_Disable-NTP-remote-suggestions-by-default.patch index 97f71637..d61d3908 100644 --- a/patches/BRM013_Disable-NTP-remote-suggestions-by-default.patch +++ b/patches/BRM013_Disable-NTP-remote-suggestions-by-default.patch @@ -10,7 +10,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu --- a/components/ntp_snippets/features.cc +++ b/components/ntp_snippets/features.cc @@ -38,13 +38,13 @@ const base::Feature kArticleSuggestionsExpandableHeader{ - "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT}; + "NTPArticleSuggestionsExpandableHeader", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kArticleSuggestionsFeature{ - "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/patches/BRM017_Skip-the-first-run-and-metrics.patch b/patches/BRM017_Skip-the-first-run-and-metrics.patch index 3fa1888d..cc2d5a59 100644 --- a/patches/BRM017_Skip-the-first-run-and-metrics.patch +++ b/patches/BRM017_Skip-the-first-run-and-metrics.patch @@ -3,10 +3,10 @@ Date: Sun, 26 Nov 2017 22:51:43 +0100 Subject: Skip the first run and metrics --- - .../chrome/browser/firstrun/FirstRunStatus.java | 8 ++++---- - .../chrome/browser/firstrun/FirstRunUtils.java | 16 ++++++---------- - .../browser/firstrun/ToSAndUMAFirstRunFragment.java | 18 ++++++------------ - 3 files changed, 16 insertions(+), 26 deletions(-) + .../chromium/chrome/browser/firstrun/FirstRunStatus.java | 8 ++++---- + .../chromium/chrome/browser/firstrun/FirstRunUtils.java | 16 ++++++---------- + .../browser/firstrun/ToSAndUMAFirstRunFragment.java | 6 ++++-- + 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java @@ -56,30 +56,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java -@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm +@@ -74,7 +74,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm } }); - if (ChromeVersionInfo.isOfficialBuild()) { -- int paddingStart = getResources().getDimensionPixelSize( -- R.dimen.fre_tos_checkbox_padding); -- ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox, -- ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart, -- mSendReportCheckBox.getPaddingTop(), -- ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox), -- mSendReportCheckBox.getPaddingBottom()); -- -- mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING); -- } else { -- mSendReportCheckBox.setVisibility(View.GONE); -+ int paddingStart = getResources().getDimensionPixelSize(R.dimen.fre_tos_checkbox_padding); -+ if (paddingStart != 0) { -+ mSendReportCheckBox.setChecked(false); - } ++/* if (ChromeVersionInfo.isOfficialBuild()) { + int paddingStart = getResources().getDimensionPixelSize( + R.dimen.fre_tos_checkbox_padding); + ViewCompat.setPaddingRelative(mSendReportCheckBox, +@@ -86,8 +86,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm + mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING); + } else { + mSendReportCheckBox.setVisibility(View.GONE); +- } ++ }*/ + mSendReportCheckBox.setChecked(false); + mSendReportCheckBox.setVisibility(View.GONE); -+ mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance()); NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> { diff --git a/patches/BRM018_Disable-signin-and-data-saver-preferences.patch b/patches/BRM018_Disable-signin-and-data-saver-preferences.patch index 2c9b919c..d085fa9c 100644 --- a/patches/BRM018_Disable-signin-and-data-saver-preferences.patch +++ b/patches/BRM018_Disable-signin-and-data-saver-preferences.patch @@ -4,36 +4,36 @@ Subject: Disable signin and data saver preferences Never show the data saver promo snackbar --- - chrome/android/java/res/xml/main_preferences.xml | 8 +++--- + chrome/android/java/res/xml/main_preferences.xml | 8 ++--- .../chromium/chrome/browser/ChromeActivity.java | 6 ++-- - .../browser/preferences/MainPreferences.java | 32 ++++++++++++---------- - 3 files changed, 26 insertions(+), 20 deletions(-) + .../browser/preferences/MainPreferences.java | 42 ++++++++++++---------- + 3 files changed, 31 insertions(+), 25 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 +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -6,10 +6,10 @@ - - +@@ -10,10 +10,10 @@ + android:key="account_section" + android:order="0" + android:title="@string/prefs_section_account"/> - + android:title="@string/sign_in_to_chrome"/--> - - - + android:title="@string/data_reduction_title"/--> mAllPreferences = new HashMap<>(); - private SignInPreference mSignInPreference; -+ //private SignInPreference mSignInPreference; ++// private SignInPreference mSignInPreference; public MainPreferences() { setHasOptionsMenu(true); -@@ -64,25 +64,29 @@ public class MainPreferences extends PreferenceFragment +@@ -65,25 +65,29 @@ public class MainPreferences extends PreferenceFragment @Override public void onDestroy() { super.onDestroy(); @@ -146,7 +147,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } @Override -@@ -98,7 +102,7 @@ public class MainPreferences extends PreferenceFragment +@@ -96,9 +100,9 @@ public class MainPreferences extends PreferenceFragment + PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences); + cachePreferences(); + +- if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) { ++/* if (ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) { + mSignInPreference.setOnStateChangedCallback(this::onSignInPreferenceStateChanged); +- } else { ++ } else */{ + getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION)); + getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES)); + } +@@ -106,7 +110,7 @@ public class MainPreferences extends PreferenceFragment setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE); setManagedPreferenceDelegateForPreference(PREF_AUTOFILL_SETTINGS); setManagedPreferenceDelegateForPreference(PREF_SAVED_PASSWORDS); @@ -155,7 +168,7 @@ 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 -@@ -154,7 +158,7 @@ public class MainPreferences extends PreferenceFragment +@@ -162,7 +166,7 @@ public class MainPreferences extends PreferenceFragment Preference preference = getPreferenceScreen().getPreference(index); mAllPreferences.put(preference.getKey(), preference); } @@ -164,7 +177,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } private void setManagedPreferenceDelegateForPreference(String key) { -@@ -163,12 +167,6 @@ public class MainPreferences extends PreferenceFragment +@@ -171,12 +175,6 @@ public class MainPreferences extends PreferenceFragment } private void updatePreferences() { @@ -177,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai updateSearchEnginePreference(); if (HomepageManager.shouldShowHomepageSetting()) { -@@ -190,9 +188,11 @@ public class MainPreferences extends PreferenceFragment +@@ -197,9 +195,11 @@ public class MainPreferences extends PreferenceFragment removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS); } @@ -189,7 +202,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai } private Preference addPreferenceIfAbsent(String key) { -@@ -263,9 +263,11 @@ public class MainPreferences extends PreferenceFragment +@@ -250,11 +250,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); +- } ++ }*/ + } + + // TemplateUrlService.LoadListener implementation. +@@ -279,9 +279,11 @@ public class MainPreferences extends PreferenceFragment if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) { return PrefServiceBridge.getInstance().isRememberPasswordsManaged(); } @@ -201,7 +229,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(); } -@@ -283,11 +285,13 @@ public class MainPreferences extends PreferenceFragment +@@ -299,11 +301,13 @@ public class MainPreferences extends PreferenceFragment return prefs.isRememberPasswordsManaged() && !prefs.isRememberPasswordsEnabled(); } diff --git a/patches/BRM019_Disable-signin-data-reduction-promos.patch b/patches/BRM019_Disable-signin-data-reduction-promos.patch index b7cb685f..9ec9ff4f 100644 --- a/patches/BRM019_Disable-signin-data-reduction-promos.patch +++ b/patches/BRM019_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 -@@ -554,7 +554,7 @@ public class ChromeTabbedActivity +@@ -575,7 +575,7 @@ public class ChromeTabbedActivity // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks // might not have completed at this point and we could show multiple // promos. @@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696 boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this); if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete() -@@ -574,7 +574,7 @@ public class ChromeTabbedActivity +@@ -595,7 +595,7 @@ public class ChromeTabbedActivity preferenceManager.setPromosSkippedOnFirstStart(true); } diff --git a/patches/BRM020_Remove-Sync-and-Translate-menu.patch b/patches/BRM020_Remove-Sync-and-Translate-menu.patch new file mode 100644 index 00000000..b1db7563 --- /dev/null +++ b/patches/BRM020_Remove-Sync-and-Translate-menu.patch @@ -0,0 +1,92 @@ +From: Serg +Date: Wed, 22 Mar 2017 19:10:30 -0400 +Subject: Remove Sync and Translate menu + +--- + .../java/res/drawable-hdpi/settings_translate.png | Bin 399 -> 0 bytes + .../java/res/drawable-mdpi/settings_translate.png | Bin 284 -> 0 bytes + .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes + .../java/res/drawable-xxhdpi/settings_translate.png | Bin 793 -> 0 bytes + .../java/res/drawable-xxxhdpi/settings_translate.png | Bin 1038 -> 0 bytes + .../android/java/res/xml/site_settings_preferences.xml | 4 ++-- + .../preferences/website/SiteSettingsPreferences.java | 12 ++++++------ + 7 files changed, 8 insertions(+), 8 deletions(-) + delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png + delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png + delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png + delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png + delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png + +diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png +deleted file mode 100644 +index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000 +diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png +deleted file mode 100644 +index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000 +diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png +deleted file mode 100644 +index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000 +diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png +deleted file mode 100644 +index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000 +diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png +deleted file mode 100644 +index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000 +diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml +index 8165826..346cdce 100644 +--- a/chrome/android/java/res/xml/site_settings_preferences.xml ++++ b/chrome/android/java/res/xml/site_settings_preferences.xml +@@ -73,11 +73,11 @@ + android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences" + android:key="sound" /> + +- ++ android:icon="@drawable/settings_translate" /--> + + + websitePrefs = new ArrayList(); +@@ -149,7 +149,7 @@ public class SiteSettingsPreferences extends PreferenceFragment + if (!mProtectedContentMenuAvailable) { + websitePrefs.add(SiteSettingsCategory.Type.AUTOPLAY); + } +- websitePrefs.add(SiteSettingsCategory.Type.BACKGROUND_SYNC); ++ //websitePrefs.add(SiteSettingsCategory.Type.BACKGROUND_SYNC); + websitePrefs.add(SiteSettingsCategory.Type.CAMERA); + if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) { + websitePrefs.add(SiteSettingsCategory.Type.CLIPBOARD); +-- +2.7.4 + diff --git a/patches/BRM020_Removed-Sync-and-Translate-menu.patch b/patches/BRM020_Removed-Sync-and-Translate-menu.patch deleted file mode 100644 index f23b079f..00000000 --- a/patches/BRM020_Removed-Sync-and-Translate-menu.patch +++ /dev/null @@ -1,177 +0,0 @@ -From: Serg -Date: Wed, 22 Mar 2017 19:10:30 -0400 -Subject: Removed Sync and Translate menu - ---- - .../java/res/drawable-hdpi/settings_translate.png | Bin 399 -> 0 bytes - .../java/res/drawable-mdpi/settings_translate.png | Bin 284 -> 0 bytes - .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes - .../res/drawable-xxhdpi/settings_translate.png | Bin 793 -> 0 bytes - .../res/drawable-xxxhdpi/settings_translate.png | Bin 1038 -> 0 bytes - .../java/res/xml/site_settings_preferences.xml | 8 +++---- - .../website/SiteSettingsPreferences.java | 26 ++++++++++----------- - headless/lib/browser/protocol/browser_handler.cc | 2 +- - 8 files changed, 18 insertions(+), 18 deletions(-) - delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png - delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png - delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png - delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png - delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png - -diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png -deleted file mode 100644 -index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000 -diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png -deleted file mode 100644 -index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000 -diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png -deleted file mode 100644 -index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000 -diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png -deleted file mode 100644 -index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000 -diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png -deleted file mode 100644 -index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000 -diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml -index 1159fd1..4a13a36 100644 ---- a/chrome/android/java/res/xml/site_settings_preferences.xml -+++ b/chrome/android/java/res/xml/site_settings_preferences.xml -@@ -44,9 +44,9 @@ - android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences" - android:key="ads" /> - -- -+ android:key="background_sync" />--> - - - -- -+ android:icon="@drawable/settings_translate" />--> - - - websitePrefs = new ArrayList(); -@@ -192,7 +192,7 @@ public class SiteSettingsPreferences extends PreferenceFragment - // When showing the main menu, if Protected Content is not available, only Autoplay - // will be visible. - if (!mProtectedContentMenuAvailable) websitePrefs.add(AUTOPLAY_KEY); -- websitePrefs.add(BACKGROUND_SYNC_KEY); -+ //websitePrefs.add(BACKGROUND_SYNC_KEY); - websitePrefs.add(CAMERA_KEY); - if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) { - websitePrefs.add(CLIPBOARD_KEY); -@@ -218,8 +218,8 @@ public class SiteSettingsPreferences extends PreferenceFragment - checked = PrefServiceBridge.getInstance().adsEnabled(); - } else if (AUTOPLAY_KEY.equals(prefName)) { - checked = PrefServiceBridge.getInstance().isAutoplayEnabled(); -- } else if (BACKGROUND_SYNC_KEY.equals(prefName)) { -- checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed(); -+ /*} else if (BACKGROUND_SYNC_KEY.equals(prefName)) { -+ checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();*/ - } else if (CAMERA_KEY.equals(prefName)) { - checked = PrefServiceBridge.getInstance().isCameraEnabled(); - } else if (CLIPBOARD_KEY.equals(prefName)) { -diff --git a/headless/lib/browser/protocol/browser_handler.cc b/headless/lib/browser/protocol/browser_handler.cc -index 97ec5f5..955b233 100644 ---- a/headless/lib/browser/protocol/browser_handler.cc -+++ b/headless/lib/browser/protocol/browser_handler.cc -@@ -71,7 +71,7 @@ Response BrowserHandler::Close() { - Response BrowserHandler::SetWindowBounds( - int window_id, - std::unique_ptr window_bounds) { -- HeadlessWebContentsImpl* web_contents = web_contents = -+ HeadlessWebContentsImpl* web_contents = - browser()->GetWebContentsForWindowId(window_id); - if (!web_contents) - return Response::Error("Browser window not found"); --- -2.7.4 - diff --git a/patches/BRM022_Hide-Send-reports-to-Google.patch b/patches/BRM022_Hide-Send-reports-to-Google.patch index 55648ba4..8e065604 100644 --- a/patches/BRM022_Hide-Send-reports-to-Google.patch +++ b/patches/BRM022_Hide-Send-reports-to-Google.patch @@ -9,7 +9,7 @@ Subject: Hide "Send reports to Google" diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml +++ b/chrome/android/java/res/layout/fre_tosanduma.xml -@@ -70,7 +70,7 @@ +@@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:lineSpacingMultiplier="1.4" android:text="@string/fre_send_report_check" diff --git a/patches/BRM024_ungoogled-chromium-Disable-signin.patch b/patches/BRM024_ungoogled-chromium-Disable-signin.patch index 787e05ef..4a1b4f6f 100644 --- a/patches/BRM024_ungoogled-chromium-Disable-signin.patch +++ b/patches/BRM024_ungoogled-chromium-Disable-signin.patch @@ -10,7 +10,7 @@ Subject: ungoogled-chromium: Disable signin diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) { +@@ -72,12 +72,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) { ShowSingletonTabOverwritingNTP(browser, std::move(params)); } @@ -23,7 +23,7 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. // Shows either the help app or the appropriate help page for |source|. If // |browser| is NULL and the help page is used (vs the app), the help page is // shown in the last active browser. If there is no such browser, a new browser -@@ -396,6 +390,7 @@ void ShowSearchEngineSettings(Browser* browser) { +@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* browser) { #if !defined(OS_ANDROID) void ShowBrowserSignin(Browser* browser, signin_metrics::AccessPoint access_point) { @@ -31,8 +31,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages. Profile* original_profile = browser->profile()->GetOriginalProfile(); SigninManagerBase* manager = SigninManagerFactory::GetForProfile(original_profile); -@@ -444,6 +439,7 @@ void ShowBrowserSignin(Browser* browser, - profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN, browser, access_point); +@@ -435,6 +430,7 @@ void ShowBrowserSignin(Browser* browser, + access_point); #endif } +#endif diff --git a/patches/BRM025_ungoogled-chromium-Disable-webRTC-log-uploader.patch b/patches/BRM025_ungoogled-chromium-Disable-webRTC-log-uploader.patch index bd9b87aa..caf0f77e 100644 --- a/patches/BRM025_ungoogled-chromium-Disable-webRTC-log-uploader.patch +++ b/patches/BRM025_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 -@@ -114,30 +114,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( +@@ -117,30 +117,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload( DCHECK(meta_data.get()); DCHECK(!upload_done_data.log_path.empty()); @@ -41,7 +41,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser } void WebRtcLogUploader::PrepareMultipartPostData( -@@ -148,6 +125,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( +@@ -151,6 +128,9 @@ void WebRtcLogUploader::PrepareMultipartPostData( DCHECK(!compressed_log.empty()); DCHECK(meta_data.get()); diff --git a/patches/BRM026_ungoogled-chromium-Disable-untraceable-URLs.patch b/patches/BRM026_ungoogled-chromium-Disable-untraceable-URLs.patch index 4c71c52b..3383fb56 100644 --- a/patches/BRM026_ungoogled-chromium-Disable-untraceable-URLs.patch +++ b/patches/BRM026_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 -@@ -73,7 +73,7 @@ void RlzPingHandler::Ping( +@@ -75,7 +75,7 @@ void RlzPingHandler::Ping( DCHECK_EQ(id.length(), 50u); GURL request_url(base::StringPrintf( @@ -28,7 +28,7 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc --- a/chrome/browser/plugins/plugins_resource_service.cc +++ b/chrome/browser/plugins/plugins_resource_service.cc -@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000; +@@ -53,9 +53,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000; // Delay between calls to update the cache 1 day and 2 minutes in testing mode. const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000; @@ -38,7 +38,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser GURL GetPluginsServerURL() { std::string filename; #if defined(OS_WIN) -@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() { +@@ -70,7 +67,7 @@ GURL GetPluginsServerURL() { #error Unknown platform #endif diff --git a/patches/BRM027_ungoogled-chromium-Disable-translate-integration.patch b/patches/BRM027_ungoogled-chromium-Disable-translate-integration.patch index 7f32f450..e6815207 100644 --- a/patches/BRM027_ungoogled-chromium-Disable-translate-integration.patch +++ b/patches/BRM027_ungoogled-chromium-Disable-translate-integration.patch @@ -4,9 +4,9 @@ Subject: ungoogled-chromium: Disable translate integration --- components/translate/content/renderer/translate_helper.cc | 4 +++- - components/translate/core/browser/translate_manager.cc | 2 +- + components/translate/core/browser/translate_manager.cc | 5 +++-- components/translate/core/browser/translate_script.cc | 3 +-- - 3 files changed, 5 insertions(+), 4 deletions(-) + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc --- a/components/translate/content/renderer/translate_helper.cc @@ -25,19 +25,22 @@ diff --git a/components/translate/content/renderer/translate_helper.cc b/compone 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 -@@ -131,7 +131,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) { +@@ -133,8 +133,9 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) { if (net::NetworkChangeNotifier::IsOffline()) return; -- if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) { -+ if (true) { +- if (!ignore_missing_key_for_testing_ && +- !::google_apis::HasAPIKeyConfigured()) { ++// if (!ignore_missing_key_for_testing_ && ++// !::google_apis::HasAPIKeyConfigured()) { ++ if (true) { // Without an API key, translate won't work, so don't offer to translate in // the first place. Leave prefs::kOfferTranslateEnabled on, though, because // that settings syncs and we don't want to turn off translate everywhere diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc -@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchComplete( +@@ -152,9 +152,8 @@ void TranslateScript::OnScriptFetchComplete(bool success, base::StringAppendF(&data_, "var serverParams = '%s';\n", server_params.c_str()); diff --git a/patches/BRM029_ungoogled-chromium-Disable-intranet-redirect-detector.patch b/patches/BRM029_ungoogled-chromium-Disable-intranet-redirect-detector.patch index 64547d0a..60a48430 100644 --- a/patches/BRM029_ungoogled-chromium-Disable-intranet-redirect-detector.patch +++ b/patches/BRM029_ungoogled-chromium-Disable-intranet-redirect-detector.patch @@ -12,7 +12,7 @@ See this page for more information: https://mikewest.org/2012/02/chrome-connects diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc -@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() { +@@ -77,9 +77,7 @@ void IntranetRedirectDetector::FinishSleep() { simple_loaders_.clear(); resulting_origins_.clear(); diff --git a/patches/BRM030_ungoogled-chromium-Disable-Google-host-detection.patch b/patches/BRM030_ungoogled-chromium-Disable-Google-host-detection.patch index dcc5c14d..da5cc887 100644 --- a/patches/BRM030_ungoogled-chromium-Disable-Google-host-detection.patch +++ b/patches/BRM030_ungoogled-chromium-Disable-Google-host-detection.patch @@ -309,7 +309,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c 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 -@@ -498,11 +498,7 @@ base::string16 TemplateURLRef::SearchTermToString16( +@@ -499,11 +499,7 @@ base::string16 TemplateURLRef::SearchTermToString16( bool TemplateURLRef::HasGoogleBaseURLs( const SearchTermsData& search_terms_data) const { ParseIfNecessary(search_terms_data); diff --git a/patches/BRM031_ungoogled-chromium-Disable-GCM.patch b/patches/BRM031_ungoogled-chromium-Disable-GCM.patch index faafddd1..9019a35e 100644 --- a/patches/BRM031_ungoogled-chromium-Disable-GCM.patch +++ b/patches/BRM031_ungoogled-chromium-Disable-GCM.patch @@ -10,7 +10,7 @@ Disable Google Cloud Messaging (GCM) client diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc --- a/components/gcm_driver/gcm_client_impl.cc +++ b/components/gcm_driver/gcm_client_impl.cc -@@ -502,6 +502,7 @@ void GCMClientImpl::StartGCM() { +@@ -491,6 +491,7 @@ void GCMClientImpl::StartGCM() { } void GCMClientImpl::InitializeMCSClient() { @@ -18,7 +18,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc std::vector endpoints; endpoints.push_back(gservices_settings_.GetMCSMainEndpoint()); GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint(); -@@ -699,6 +700,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { +@@ -684,6 +685,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) { } void GCMClientImpl::StartCheckin() { @@ -26,7 +26,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc // Make sure no checkin is in progress. if (checkin_request_) return; -@@ -777,6 +779,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { +@@ -759,6 +761,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) { } void GCMClientImpl::SchedulePeriodicCheckin() { diff --git a/patches/BRM032_ungoogled-chromium-Disable-Gaia.patch b/patches/BRM032_ungoogled-chromium-Disable-Gaia.patch index 0d09d95e..f613dca5 100644 --- a/patches/BRM032_ungoogled-chromium-Disable-Gaia.patch +++ b/patches/BRM032_ungoogled-chromium-Disable-Gaia.patch @@ -7,18 +7,18 @@ Somehow it is still being activated even without being signed-in. See also: https://github.com/Eloston/ungoogled-chromium/issues/104 --- - chrome/browser/browser_resources.grd | 2 -- - .../component_extensions_whitelist/whitelist.cc | 1 - - .../signin/gaia_auth_extension_loader.cc | 7 ------ - .../resources/component_extension_resources.grd | 2 -- - chrome/browser/ui/webui/signin/inline_login_ui.cc | 1 - - google_apis/gaia/gaia_auth_fetcher.cc | 29 ---------------------- - 6 files changed, 42 deletions(-) + chrome/browser/browser_resources.grd | 2 -- + chrome/browser/extensions/component_extensions_whitelist/whitelist.cc | 1 - + chrome/browser/extensions/signin/gaia_auth_extension_loader.cc | 3 ++- + chrome/browser/resources/component_extension_resources.grd | 2 -- + chrome/browser/ui/webui/signin/inline_login_ui.cc | 1 - + google_apis/gaia/gaia_auth_fetcher.cc | 4 +++- + 6 files changed, 5 insertions(+), 8 deletions(-) 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 -@@ -296,7 +296,6 @@ +@@ -303,7 +303,6 @@ @@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou -@@ -431,7 +430,6 @@ +@@ -444,7 +443,6 @@ @@ -48,22 +48,20 @@ 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,18 +42,11 @@ extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) { +@@ -42,7 +42,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) { + void LoadGaiaAuthExtension(BrowserContext* context) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - -- extensions::ComponentLoader* component_loader = GetComponentLoader(context); +- ++/* + ComponentLoader* component_loader = GetComponentLoader(context); const base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(switches::kAuthExtensionPath)) { -- base::FilePath auth_extension_path = -- command_line->GetSwitchValuePath(switches::kAuthExtensionPath); -- component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path); - return; - } -- -- component_loader->Add(IDR_GAIA_AUTH_MANIFEST, -- base::FilePath(FILE_PATH_LITERAL("gaia_auth"))); +@@ -55,6 +55,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) { + + component_loader->Add(IDR_GAIA_AUTH_MANIFEST, + base::FilePath(FILE_PATH_LITERAL("gaia_auth"))); ++*/ } void UnloadGaiaAuthExtension(BrowserContext* context) { @@ -82,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 -@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { +@@ -49,7 +49,6 @@ content::WebUIDataSource* CreateWebUIDataSource() { source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS); source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS); @@ -93,39 +91,28 @@ 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 -@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( - int load_flags, +@@ -39,7 +39,7 @@ namespace { + const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES | + net::LOAD_DO_NOT_SAVE_COOKIES; + +-const size_t kMaxMessageSize = 1024 * 1024; // 1MB ++//const size_t kMaxMessageSize = 1024 * 1024; // 1MB + + static bool CookiePartsContains(const std::vector& parts, + const char* part) { +@@ -251,6 +251,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( const net::NetworkTrafficAnnotationTag& traffic_annotation) { DCHECK(!fetch_pending_) << "Tried to fetch two things at once!"; -- fetcher_ = net::URLFetcher::Create( -- 0, gaia_gurl, body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST, -- this, traffic_annotation); -- fetcher_->SetRequestContext(getter_); -- fetcher_->SetUploadData("application/x-www-form-urlencoded", body); -- gaia::MarkURLFetcherAsGaia(fetcher_.get()); -- -- VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec(); -- VLOG(2) << "Gaia fetcher headers: " << headers; -- VLOG(2) << "Gaia fetcher body: " << body; -- -- // The Gaia token exchange requests do not require any cookie-based -- // identification as part of requests. We suppress sending any cookies to -- // maintain a separation between the user's browsing and Chrome's internal -- // services. Where such mixing is desired (MergeSession or OAuthLogin), it -- // will be done explicitly. -- fetcher_->SetLoadFlags(load_flags); -- -- // Fetchers are sometimes cancelled because a network change was detected, -- // especially at startup and after sign-in on ChromeOS. Retrying once should -- // be enough in those cases; let the fetcher retry up to 3 times just in case. -- // http://crbug.com/163710 -- fetcher_->SetAutomaticallyRetryOnNetworkChanges(3); -- -- if (!headers.empty()) -- fetcher_->SetExtraRequestHeaders(headers); -- -- fetch_pending_ = true; -- fetcher_->Start(); + ++/* + auto resource_request = std::make_unique(); + resource_request->url = gaia_gurl; + original_url_ = gaia_gurl; +@@ -299,6 +300,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher( + base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete, + base::Unretained(this)), + kMaxMessageSize); ++*/ } // static diff --git a/patches/BRM033_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch b/patches/BRM033_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch deleted file mode 100644 index 16f3b867..00000000 --- a/patches/BRM033_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch +++ /dev/null @@ -1,165 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 12 Feb 2018 21:45:21 +0100 -Subject: ungoogled-chromium: Clear HTTP cache menu item - -Adds a menu item under "More tools" to clear the HTTP authentication cache on demand ---- - chrome/app/chrome_command_ids.h | 1 + - chrome/app/generated_resources.grd | 6 ++++++ - chrome/browser/ui/browser_command_controller.cc | 7 +++++++ - chrome/browser/ui/toolbar/app_menu_model.cc | 8 ++++++++ - chrome/browser/ui/toolbar/app_menu_model.h | 1 + - chrome/browser/ui/views/frame/global_menu_bar_x11.cc | 1 + - net/http/http_auth_cache.cc | 1 + - tools/metrics/histograms/enums.xml | 1 + - tools/metrics/histograms/histograms.xml | 1 + - 9 files changed, 27 insertions(+) - -diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h ---- a/chrome/app/chrome_command_ids.h -+++ b/chrome/app/chrome_command_ids.h -@@ -152,6 +152,7 @@ - #define IDC_DEV_TOOLS_INSPECT 40023 - #define IDC_UPGRADE_DIALOG 40024 - #define IDC_VIEW_INCOMPATIBILITIES 40025 -+#define IDC_CLEAR_HTTP_AUTH_CACHE 40026 - #define IDC_SHOW_KEYBOARD_OVERLAY 40027 - #define IDC_PROFILING_ENABLED 40028 - #define IDC_BOOKMARKS_MENU 40029 -diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd ---- a/chrome/app/generated_resources.grd -+++ b/chrome/app/generated_resources.grd -@@ -1058,6 +1058,9 @@ are declared in build/common.gypi. - - &Clear browsing data... - -+ -+ Clear &HTTP auth cache -+ - - &Downloads - -@@ -1096,6 +1099,9 @@ are declared in build/common.gypi. - - &Clear Browsing Data... - -+ -+ Clear &HTTP Auth Cache -+ - - &Downloads - -diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc ---- a/chrome/browser/ui/browser_command_controller.cc -+++ b/chrome/browser/ui/browser_command_controller.cc -@@ -61,6 +61,9 @@ - #include "extensions/browser/extension_system.h" - #include "printing/buildflags/buildflags.h" - #include "ui/events/keycodes/keyboard_codes.h" -+#include "net/url_request/url_request_context.h" -+#include "net/url_request/url_request_context_getter.h" -+#include "net/http/http_transaction_factory.h" - - #if defined(OS_MACOSX) - #include "chrome/browser/ui/browser_commands_mac.h" -@@ -630,6 +633,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( - case IDC_CLEAR_BROWSING_DATA: - ShowClearBrowsingDataDialog(browser_); - break; -+ case IDC_CLEAR_HTTP_AUTH_CACHE: -+ profile()->GetRequestContext()->GetURLRequestContext()->http_transaction_factory()->GetSession()->http_auth_cache()->ClearAllEntries(); -+ break; - case IDC_IMPORT_SETTINGS: - ShowImportDialog(browser_); - break; -@@ -874,6 +880,7 @@ void BrowserCommandController::InitCommandState() { - !profile()->IsOffTheRecord()); - command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, - !guest_session); -+ command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true); - #if defined(OS_CHROMEOS) - command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true); - #else -diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc ---- a/chrome/browser/ui/toolbar/app_menu_model.cc -+++ b/chrome/browser/ui/toolbar/app_menu_model.cc -@@ -215,6 +215,7 @@ void ToolsMenuModel::Build(Browser* browser) { - - AddSeparator(ui::NORMAL_SEPARATOR); - AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA); -+ AddItemWithStringId(IDC_CLEAR_HTTP_AUTH_CACHE, IDS_CLEAR_HTTP_AUTH_CACHE); - AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); - if (chrome::CanOpenTaskManager()) - AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); -@@ -475,6 +476,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) { - } - LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA); - break; -+ case IDC_CLEAR_HTTP_AUTH_CACHE: -+ if (!uma_action_recorded_) { -+ UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ClearHttpAuthCache", -+ delta); -+ } -+ LogMenuAction(MENU_ACTION_CLEAR_HTTP_AUTH_CACHE); -+ break; - case IDC_VIEW_SOURCE: - if (!uma_action_recorded_) - UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta); -diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h ---- a/chrome/browser/ui/toolbar/app_menu_model.h -+++ b/chrome/browser/ui/toolbar/app_menu_model.h -@@ -76,6 +76,7 @@ enum AppMenuAction { - MENU_ACTION_OPEN_IN_CHROME = 48, - MENU_ACTION_SITE_SETTINGS = 49, - MENU_ACTION_APP_INFO = 50, -+ MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 51, - LIMIT_MENU_ACTION - }; - -diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc ---- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc -+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc -@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = { - - {IDS_TASK_MANAGER, IDC_TASK_MANAGER}, - {IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA}, -+ {IDS_CLEAR_HTTP_AUTH_CACHE, IDC_CLEAR_HTTP_AUTH_CACHE}, - - {MENU_SEPARATOR, MENU_SEPARATOR}, - -diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc ---- a/net/http/http_auth_cache.cc -+++ b/net/http/http_auth_cache.cc -@@ -250,6 +250,7 @@ bool HttpAuthCache::Remove(const GURL& origin, - return false; - } - } -+ - return false; - } - -diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml ---- a/tools/metrics/histograms/enums.xml -+++ b/tools/metrics/histograms/enums.xml -@@ -49525,6 +49525,7 @@ Full version information for the fingerprint enum values: - - - -+ - - - -diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml ---- a/tools/metrics/histograms/histograms.xml -+++ b/tools/metrics/histograms/histograms.xml -@@ -111352,6 +111352,7 @@ uploading your change for review. - -+ - --- -2.7.4 - diff --git a/patches/BRM034_ungoogled-chromium-Disable-domain-reliability.patch b/patches/BRM033_ungoogled-chromium-Disable-domain-reliability.patch similarity index 100% rename from patches/BRM034_ungoogled-chromium-Disable-domain-reliability.patch rename to patches/BRM033_ungoogled-chromium-Disable-domain-reliability.patch diff --git a/patches/BRM035_Disable-Omaha-update-checks.patch b/patches/BRM034_Disable-Omaha-update-checks.patch similarity index 94% rename from patches/BRM035_Disable-Omaha-update-checks.patch rename to patches/BRM034_Disable-Omaha-update-checks.patch index 4c2d5feb..d4824720 100644 --- a/patches/BRM035_Disable-Omaha-update-checks.patch +++ b/patches/BRM034_Disable-Omaha-update-checks.patch @@ -9,7 +9,7 @@ Subject: Disable Omaha update checks diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java -@@ -132,7 +132,7 @@ public class OmahaBase { +@@ -134,7 +134,7 @@ public class OmahaBase { /** See {@link #sIsDisabled}. */ static boolean isDisabled() { diff --git a/patches/BRM036_Add-DuckDuckGo-search-engine.patch b/patches/BRM035_Add-DuckDuckGo-search-engine.patch similarity index 100% rename from patches/BRM036_Add-DuckDuckGo-search-engine.patch rename to patches/BRM035_Add-DuckDuckGo-search-engine.patch diff --git a/patches/BRM037_Add-StartPage-search-engine.patch b/patches/BRM036_Add-StartPage-search-engine.patch similarity index 99% rename from patches/BRM037_Add-StartPage-search-engine.patch rename to patches/BRM036_Add-StartPage-search-engine.patch index 4975f0cb..829d2078 100644 --- a/patches/BRM037_Add-StartPage-search-engine.patch +++ b/patches/BRM036_Add-StartPage-search-engine.patch @@ -15,12 +15,12 @@ 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. -- "kCurrentDataVersion": 102 -+ "kCurrentDataVersion": 103 +- "kCurrentDataVersion": 103 ++ "kCurrentDataVersion": 104 }, // The following engines are included in country lists and are added to the -@@ -232,6 +232,16 @@ +@@ -247,6 +247,16 @@ "id": 56 }, diff --git a/patches/BRM038_Add-Google-English-only-engine.patch b/patches/BRM037_Add-Google-English-only-engine.patch similarity index 99% rename from patches/BRM038_Add-Google-English-only-engine.patch rename to patches/BRM037_Add-Google-English-only-engine.patch index ff7d9118..8e9af3c0 100644 --- a/patches/BRM038_Add-Google-English-only-engine.patch +++ b/patches/BRM037_Add-Google-English-only-engine.patch @@ -17,12 +17,12 @@ 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. -- "kCurrentDataVersion": 103 -+ "kCurrentDataVersion": 104 +- "kCurrentDataVersion": 104 ++ "kCurrentDataVersion": 105 }, // The following engines are included in country lists and are added to the -@@ -154,6 +154,27 @@ +@@ -159,6 +159,27 @@ "id": 1 }, diff --git a/patches/BRM039_Add-Qwant-search-engine.patch b/patches/BRM038_Add-Qwant-search-engine.patch similarity index 97% rename from patches/BRM039_Add-Qwant-search-engine.patch rename to patches/BRM038_Add-Qwant-search-engine.patch index d19155bd..b7c0d850 100644 --- a/patches/BRM039_Add-Qwant-search-engine.patch +++ b/patches/BRM038_Add-Qwant-search-engine.patch @@ -3,10 +3,10 @@ Date: Mon, 12 Mar 2018 20:31:44 +0100 Subject: Add Qwant search engine --- - .../search_engines/prepopulated_engines.json | 13 +- + .../search_engines/prepopulated_engines.json | 24 ++- components/search_engines/search_engine_type.h | 1 + .../template_url_prepopulate_data.cc | 218 ++++++++++----------- - 3 files changed, 122 insertions(+), 110 deletions(-) + 3 files changed, 133 insertions(+), 110 deletions(-) diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json --- a/components/search_engines/prepopulated_engines.json @@ -15,15 +15,26 @@ 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. -- "kCurrentDataVersion": 104 -+ "kCurrentDataVersion": 105 +- "kCurrentDataVersion": 105 ++ "kCurrentDataVersion": 106 }, // The following engines are included in country lists and are added to the -@@ -939,6 +939,17 @@ +@@ -954,6 +954,28 @@ "id": 6 }, ++ "qwant": { ++ "name": "Qwant", ++ "keyword": "qwant.com", ++ "favicon_url": "https://www.qwant.com/favicon.ico", ++ "search_url": "https://www.qwant.com/?client=opensearch&q={searchTerms}", ++ "suggest_url": "https://api.qwant.com/api/suggest/?client=opensearch&q={searchTerms}", ++ "image_url": "https://www.qwant.com/?t=images&q={searchTerms}", ++ "type": "SEARCH_ENGINE_QWANT", ++ "id": 14 ++ }, ++ + "qwant": { + "name": "Qwant", + "keyword": "qwant.com", diff --git a/patches/BRM040_Fix-crash-when-accessing-page-info-site-settings.patch b/patches/BRM039_Fix-crash-when-accessing-page-info-site-settings.patch similarity index 93% rename from patches/BRM040_Fix-crash-when-accessing-page-info-site-settings.patch rename to patches/BRM039_Fix-crash-when-accessing-page-info-site-settings.patch index 65a5f9e7..56ac46b7 100644 --- a/patches/BRM040_Fix-crash-when-accessing-page-info-site-settings.patch +++ b/patches/BRM039_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 -@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( +@@ -633,6 +633,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper( GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin, embedding_origin); PermissionContextBase* context = GetPermissionContext(permission); diff --git a/patches/BRM041_openH264-enable-ARM-ARM64-optimizations.patch b/patches/BRM040_openH264-enable-ARM-ARM64-optimizations.patch similarity index 96% rename from patches/BRM041_openH264-enable-ARM-ARM64-optimizations.patch rename to patches/BRM040_openH264-enable-ARM-ARM64-optimizations.patch index b7341c30..2f3eb482 100644 --- a/patches/BRM041_openH264-enable-ARM-ARM64-optimizations.patch +++ b/patches/BRM040_openH264-enable-ARM-ARM64-optimizations.patch @@ -59,7 +59,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags. if (!is_win || is_clang) { cflags += [ -@@ -128,6 +143,14 @@ source_set("common") { +@@ -129,6 +144,14 @@ source_set("common") { } include_dirs = openh264_common_include_dirs @@ -74,7 +74,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":config" ] -@@ -154,6 +177,14 @@ source_set("processing") { +@@ -155,6 +178,14 @@ source_set("processing") { } include_dirs = openh264_processing_include_dirs @@ -89,7 +89,7 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":config" ] -@@ -173,6 +204,14 @@ source_set("encoder") { +@@ -174,6 +205,14 @@ source_set("encoder") { } include_dirs = openh264_encoder_include_dirs diff --git a/patches/BRM042_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch b/patches/BRM041_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch similarity index 95% rename from patches/BRM042_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch rename to patches/BRM041_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch index 1acd0667..e2b0e970 100644 --- a/patches/BRM042_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch +++ b/patches/BRM041_Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch @@ -18,26 +18,26 @@ diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/re --- a/third_party/blink/renderer/core/dom/BUILD.gn +++ b/third_party/blink/renderer/core/dom/BUILD.gn @@ -147,6 +147,8 @@ blink_core_sources("dom") { - "events/tree_scope_event_context.h", - "events/window_event_context.cc", - "events/window_event_context.h", + "global_event_handlers.h", + "icon_url.cc", + "icon_url.h", + "extensions/dont-track-me.h", + "extensions/video-bg-play.h", - "exception_code.h", - "first_letter_pseudo_element.cc", - "first_letter_pseudo_element.h", + "id_target_observer.cc", + "id_target_observer.h", + "id_target_observer_registry.cc", 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 -@@ -222,6 +222,7 @@ +@@ -223,6 +223,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" +#include "extensions/video_bg_play.h" #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_scrollable_area.h" -@@ -277,6 +278,8 @@ + #include "third_party/blink/renderer/core/paint/paint_layer.h" +@@ -282,6 +283,8 @@ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h" #include "third_party/blink/renderer/platform/wtf/time.h" @@ -46,7 +46,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink #ifndef NDEBUG using WeakDocumentSet = blink::PersistentHeapHashSet>; -@@ -5882,8 +5885,31 @@ void Document::FinishedParsing() { +@@ -5926,8 +5929,31 @@ void Document::FinishedParsing() { fetcher_->ClearResourcesFromPreviousFetcher(); } diff --git a/patches/BRM043_Allow-playing-audio-in-background.patch b/patches/BRM042_Allow-playing-audio-in-background.patch similarity index 93% rename from patches/BRM043_Allow-playing-audio-in-background.patch rename to patches/BRM042_Allow-playing-audio-in-background.patch index a69fcf76..fefd6526 100644 --- a/patches/BRM043_Allow-playing-audio-in-background.patch +++ b/patches/BRM042_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 -@@ -871,6 +871,12 @@ bool WebMediaPlayerImpl::HasAudio() const { +@@ -862,6 +862,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()); -@@ -2940,7 +2946,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const { +@@ -2953,7 +2959,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 (IsBackgroundedSuspendEnabled()) { diff --git a/patches/BRM044_Open-YouTube-links-in-Bromite.patch b/patches/BRM043_Open-YouTube-links-in-Bromite.patch similarity index 95% rename from patches/BRM044_Open-YouTube-links-in-Bromite.patch rename to patches/BRM043_Open-YouTube-links-in-Bromite.patch index b2bd8e6d..9baae65c 100644 --- a/patches/BRM044_Open-YouTube-links-in-Bromite.patch +++ b/patches/BRM043_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 -@@ -363,6 +363,13 @@ public class ExternalNavigationHandler { +@@ -384,6 +384,13 @@ public class ExternalNavigationHandler { return OverrideUrlLoadingResult.NO_OVERRIDE; } diff --git a/patches/BRM045_Add-exit-menu-item.patch b/patches/BRM044_Add-exit-menu-item.patch similarity index 96% rename from patches/BRM045_Add-exit-menu-item.patch rename to patches/BRM044_Add-exit-menu-item.patch index 16946b48..c6492bf2 100644 --- a/patches/BRM045_Add-exit-menu-item.patch +++ b/patches/BRM044_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 -@@ -1986,6 +1986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2022,6 +2022,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity 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 -@@ -2678,6 +2678,9 @@ To obtain new licenses, connect to the internet and play your downloaded content +@@ -2837,6 +2837,9 @@ To obtain new licenses, connect to the internet and play your downloaded content Settings diff --git a/patches/BRM046_Remove-help-menu-item.patch b/patches/BRM045_Remove-help-menu-item.patch similarity index 96% rename from patches/BRM046_Remove-help-menu-item.patch rename to patches/BRM045_Remove-help-menu-item.patch index 5bcfedf1..d93ebaba 100644 --- a/patches/BRM046_Remove-help-menu-item.patch +++ b/patches/BRM045_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 -@@ -2010,15 +2010,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2046,15 +2046,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity 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 -@@ -1038,7 +1038,7 @@ public class CustomTabActivity extends ChromeActivity { +@@ -1219,7 +1219,7 @@ public class CustomTabActivity extends ChromeActivity { public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) { // Disable creating new tabs, bookmark, history, print, help, focus_url, etc. if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id diff --git a/patches/BRM047_Add-menu-option-to-toggle-global-Javascript-preference.patch b/patches/BRM046_Add-menu-option-to-toggle-global-Javascript-preference.patch similarity index 85% rename from patches/BRM047_Add-menu-option-to-toggle-global-Javascript-preference.patch rename to patches/BRM046_Add-menu-option-to-toggle-global-Javascript-preference.patch index 62c7b572..d7a3fc94 100644 --- a/patches/BRM047_Add-menu-option-to-toggle-global-Javascript-preference.patch +++ b/patches/BRM046_Add-menu-option-to-toggle-global-Javascript-preference.patch @@ -7,10 +7,10 @@ Subject: Add menu option to toggle global Javascript preference chrome/android/java/res/menu/main_menu.xml | 13 ++++++++ .../chromium/chrome/browser/ChromeActivity.java | 8 +++++ .../chrome/browser/ChromeTabbedActivity.java | 8 +++++ - .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++ + .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++++++++++++++++++++++ .../CustomTabAppMenuPropertiesDelegate.java | 1 + .../java/strings/android_chrome_strings.grd | 11 +++++++ - 7 files changed, 91 insertions(+) + 7 files changed, 92 insertions(+) diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml --- a/chrome/android/java/res/menu/custom_tabs_menu.xml @@ -75,17 +75,17 @@ 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 -@@ -2079,6 +2079,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2114,6 +2114,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent(); currentTab.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(); -+ final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled(); -+ PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled); ++ final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT); ++ PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled); + if (reloadOnChange) { -+ currentTab.reload(); -+ } ++ currentTab.reload(); ++ } + RecordUserAction.record("MobileMenuRequestEnableJavascript"); } else if (id == R.id.reader_mode_prefs_id) { DomDistillerUIUtils.openSettings(currentTab.getWebContents()); @@ -93,17 +93,17 @@ 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 -@@ -1644,6 +1644,14 @@ public class ChromeTabbedActivity +@@ -1707,6 +1707,14 @@ public class ChromeTabbedActivity NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER); } RecordUserAction.record("MobileMenuDownloadManager"); + } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) { + final boolean reloadOnChange = !currentTab.isNativePage(); -+ final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled(); -+ PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled); ++ final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT); ++ PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled); + if (reloadOnChange) { -+ currentTab.reload(); -+ } ++ currentTab.reload(); ++ } + RecordUserAction.record("MobileMenuRequestEnableJavascript"); } else if (id == R.id.open_recently_closed_tab) { TabModel currentModel = mTabModelSelectorImpl.getCurrentModel(); @@ -111,7 +111,15 @@ 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 -@@ -192,6 +192,8 @@ public class AppMenuPropertiesDelegate { +@@ -24,6 +24,7 @@ import org.chromium.base.metrics.RecordHistogram; + import org.chromium.chrome.R; + import org.chromium.chrome.browser.ChromeActivity; + import org.chromium.chrome.browser.ChromeSwitches; ++import org.chromium.chrome.browser.ContentSettingsType; + import org.chromium.chrome.browser.ShortcutHelper; + import org.chromium.chrome.browser.UrlConstants; + import org.chromium.chrome.browser.banners.AppBannerManager; +@@ -196,6 +197,8 @@ public class AppMenuPropertiesDelegate { updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); @@ -120,12 +128,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu // Only display reader mode settings menu option if the current page is in reader mode. menu.findItem(R.id.reader_mode_prefs_id) .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl())); -@@ -412,4 +414,39 @@ public class AppMenuPropertiesDelegate { - ? mActivity.getString(R.string.menu_request_desktop_site_on) - : mActivity.getString(R.string.menu_request_desktop_site_off)); +@@ -418,6 +421,41 @@ public class AppMenuPropertiesDelegate { } -+ -+ /** + + /** + * Updates the enable JavaScript item's state. + * + * @param menu {@link Menu} for enable javascript @@ -148,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + enableMenuRow.setVisible(itemVisible); + if (!itemVisible) return; + -+ boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled(); ++ boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT); + + // Mark the checkbox if Javascript is activated on this tab. + enableMenuCheck.setChecked(jsEnabled); @@ -159,11 +165,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + ? mActivity.getString(R.string.menu_enable_javascript_on) + : mActivity.getString(R.string.menu_enable_javascript_off)); + } - } ++ ++ /** + * A notification that the header view has finished inflating. + * @param view The view that was inflated. + * @param appMenu The menu the view is inside of. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -165,6 +165,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat } updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible); @@ -174,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 -@@ -2663,6 +2663,17 @@ To obtain new licenses, connect to the internet and play your downloaded content +@@ -2822,6 +2822,17 @@ To obtain new licenses, connect to the internet and play your downloaded content Find in page diff --git a/patches/BRM048_Bromite-adblock-engine.patch b/patches/BRM047_Bromite-adblock-engine.patch similarity index 86% rename from patches/BRM048_Bromite-adblock-engine.patch rename to patches/BRM047_Bromite-adblock-engine.patch index 329f8e89..66b56f3e 100644 --- a/patches/BRM048_Bromite-adblock-engine.patch +++ b/patches/BRM047_Bromite-adblock-engine.patch @@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 +++ .../CustomTabAppMenuPropertiesDelegate.java | 2 + .../java/strings/android_chrome_strings.grd | 11 + - chrome/browser/net/chrome_network_delegate.cc | 55 ++++ - .../subresource_filter_content_settings_manager.cc | 3 + + chrome/browser/net/chrome_network_delegate.cc | 58 ++++ + .../subresource_filter_content_settings_manager.cc | 1 + net/BUILD.gn | 7 + - net/url_request/adblock_intercept.cc | 323 +++++++++++++++++++++ - net/url_request/adblock_intercept.h | 19 ++ - 12 files changed, 497 insertions(+) + net/url_request/adblock_intercept.cc | 321 +++++++++++++++++++++ + net/url_request/adblock_intercept.h | 17 ++ + 12 files changed, 494 insertions(+) create mode 100644 net/url_request/adblock_intercept.cc create mode 100644 net/url_request/adblock_intercept.h @@ -73,14 +73,14 @@ 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 -@@ -2089,6 +2089,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -2124,6 +2124,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity RecordUserAction.record("MobileMenuRequestEnableJavascript"); } else if (id == R.id.reader_mode_prefs_id) { DomDistillerUIUtils.openSettings(currentTab.getWebContents()); + } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) { + final boolean reloadOnChange = !currentTab.isNativePage(); -+ final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled(); -+ PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled); ++ final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS); ++ PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled); + if (reloadOnChange) { + currentTab.reload(); + } @@ -91,25 +91,25 @@ 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 -@@ -1658,6 +1658,14 @@ public class ChromeTabbedActivity - RecordUserAction.record("MobileTabClosedUndoShortCut"); - } else if (id == R.id.enter_vr_id) { - VrShellDelegate.enterVrIfNecessary(); +@@ -1665,6 +1665,14 @@ public class ChromeTabbedActivity + reportNewTabShortcutUsed(true); + getTabCreator(true).launchNTP(); + } + } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) { + final boolean reloadOnChange = !currentTab.isNativePage(); -+ final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled(); -+ PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled); ++ final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS); ++ PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled); + if (reloadOnChange) { -+ currentTab.reload(); ++ currentTab.reload(); + } + RecordUserAction.record("MobileMenuRequestEnableAdBlock"); - } else { - return super.onMenuOrKeyboardAction(id, fromMenu); - } + } else if (id == R.id.all_bookmarks_menu_id) { + if (currentTab != null) { + getCompositorViewHolder().hideKeyboard(() -> { 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 -@@ -190,6 +190,8 @@ public class AppMenuPropertiesDelegate { +@@ -195,6 +195,8 @@ public class AppMenuPropertiesDelegate { && !TextUtils.isEmpty(url); prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem); @@ -118,12 +118,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */); updateEnableJavascriptMenuItem(menu, currentTab); -@@ -449,4 +451,40 @@ public class AppMenuPropertiesDelegate { - ? mActivity.getString(R.string.menu_enable_javascript_on) - : mActivity.getString(R.string.menu_enable_javascript_off)); +@@ -456,6 +458,42 @@ public class AppMenuPropertiesDelegate { } -+ -+ /** + + /** + * Updates the enable AdBlock item's state. + * + * @param menu {@link Menu} for enable adblock @@ -147,7 +145,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + enableMenuRow.setVisible(itemVisible); + if (!itemVisible) return; + -+ boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled(); ++ boolean adBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS); + + // Mark the checkbox if adblock is globally activate. + enableMenuCheck.setChecked(adBlockEnabled); @@ -158,11 +156,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + ? mActivity.getString(R.string.menu_enable_adblock_on) + : mActivity.getString(R.string.menu_enable_adblock_off)); + } - } ++ ++ /** + * A notification that the header view has finished inflating. + * @param view The view that was inflated. + * @param appMenu The menu the view is inside of. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java -@@ -170,6 +170,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat +@@ -164,6 +164,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat } } @@ -174,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd --- a/chrome/android/java/strings/android_chrome_strings.grd +++ b/chrome/android/java/strings/android_chrome_strings.grd -@@ -2683,6 +2683,17 @@ To obtain new licenses, connect to the internet and play your downloaded content +@@ -2842,6 +2842,17 @@ To obtain new licenses, connect to the internet and play your downloaded content Turn on Request desktop site @@ -195,7 +197,15 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and 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 -@@ -62,6 +62,7 @@ +@@ -24,6 +24,7 @@ + #include "build/build_config.h" + #include "chrome/browser/browser_process.h" + #include "chrome/browser/content_settings/cookie_settings_factory.h" ++#include "chrome/browser/content_settings/host_content_settings_map_factory.h" + #include "chrome/browser/content_settings/tab_specific_content_settings.h" + #include "chrome/browser/custom_handlers/protocol_handler_registry.h" + #include "chrome/browser/net/chrome_extensions_network_delegate.h" +@@ -59,6 +60,7 @@ #if defined(OS_ANDROID) #include "base/android/path_utils.h" #include "chrome/browser/io_thread.h" @@ -203,7 +213,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ #endif #if defined(OS_CHROMEOS) -@@ -269,11 +270,63 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread( +@@ -215,10 +217,64 @@ void ChromeNetworkDelegate::InitializePrefsOnUIThread( } } @@ -211,14 +221,13 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + int ChromeNetworkDelegate::OnBeforeURLRequest( net::URLRequest* request, - const net::CompletionCallback& callback, + net::CompletionOnceCallback callback, GURL* new_url) { - ++ +#if defined(OS_ANDROID) + if (request) { + bool block = false, isValidUrl; + -+ //LOG(INFO) << "OnBeforeURLRequest " << request->url(); + isValidUrl = request->url().is_valid(); + std::string scheme = request->url().scheme(); + if (isValidUrl && scheme.length()) { @@ -229,25 +238,27 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + } + const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); + ++ bool adblock_enabled = false; + if (isValidUrl && info) { -+#if 0 -+ // not working + const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter = info->GetWebContentsGetterForRequest(); + content::WebContents* web_contents = web_contents_getter.Run(); + if (web_contents) { -+ TabSpecificContentSettings* content_settings = -+ TabSpecificContentSettings::FromWebContents(web_contents); -+ if (content_settings) { -+ bool adblock_enabled = content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_ADS); -+ LOG(INFO) << "adblock_enabled from tab: " << adblock_enabled; ++ Profile* profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); ++ const HostContentSettingsMap* content_settings = HostContentSettingsMapFactory::GetForProfile(profile); ++ ++ // check global value first ++ adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetDefaultContentSetting(ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS, NULL); ++ ++ if (!adblock_enabled) { ++ adblock_enabled = CONTENT_SETTING_BLOCK == content_settings->GetContentSetting(request->url(), GURL(), ContentSettingsType::CONTENT_SETTINGS_TYPE_ADS, ++ std::string()); + } + } -+#endif + -+ if (net::adblock_enabled ++ if (adblock_enabled + && content::RESOURCE_TYPE_MAIN_FRAME != info->GetResourceType() + && net::adblock_intercept(request->url(), -+ request->site_for_cookies().host(), ++ request->initiator()->host(), + info->GetResourceType())) { + block = true; + } @@ -266,8 +277,8 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + extensions_delegate_->ForwardStartRequestStatus(request); - if (!enable_referrers_->GetValue()) -@@ -307,6 +360,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( + bool force_safe_search = +@@ -248,6 +304,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest( return rv; } @@ -275,35 +286,23 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/ + int ChromeNetworkDelegate::OnBeforeStartTransaction( net::URLRequest* request, - const net::CompletionCallback& callback, + net::CompletionOnceCallback callback, diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc --- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc +++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc -@@ -22,6 +22,7 @@ +@@ -19,6 +19,7 @@ + #include "components/history/core/browser/history_service.h" #include "components/keyed_service/core/service_access_type.h" - #include "components/subresource_filter/core/browser/subresource_filter_features.h" #include "url/gurl.h" +#include "net/url_request/adblock_intercept.h" namespace { -@@ -160,9 +161,11 @@ void SubresourceFilterContentSettingsManager::OnContentSettingChanged( - if (global_setting == CONTENT_SETTING_ALLOW) { - ChromeSubresourceFilterClient::LogAction( - kActionContentSettingsAllowedGlobal); -+ net::adblock_enabled = false; - } else if (global_setting == CONTENT_SETTING_BLOCK) { - ChromeSubresourceFilterClient::LogAction( - kActionContentSettingsBlockedGlobal); -+ net::adblock_enabled = true; - } else { - NOTREACHED(); - } diff --git a/net/BUILD.gn b/net/BUILD.gn --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1791,6 +1791,13 @@ component("net") { - "//third_party/zlib", +@@ -1715,6 +1715,13 @@ component("net") { + "url_request/websocket_handshake_userdata_key.h", ] + if (is_android) { @@ -320,7 +319,7 @@ diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_inte new file mode 100644 --- /dev/null +++ b/net/url_request/adblock_intercept.cc -@@ -0,0 +1,323 @@ +@@ -0,0 +1,321 @@ +#include "url/gurl.h" +#include "content/public/common/resource_type.h" + @@ -343,8 +342,6 @@ new file mode 100644 + +namespace net { + -+bool adblock_enabled = true; -+ +const char *LOG_TAG = "Bromite"; + +#ifdef ADB_TESTER @@ -648,7 +645,7 @@ diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_inter new file mode 100644 --- /dev/null +++ b/net/url_request/adblock_intercept.h -@@ -0,0 +1,19 @@ +@@ -0,0 +1,17 @@ +#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_ +#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_ + @@ -663,8 +660,6 @@ new file mode 100644 + +int adblock_intercept(const GURL &url, const std::string &origin_host, content::ResourceType resource_type); + -+extern bool adblock_enabled; -+ +} // namespace net + +#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_ diff --git a/patches/BRM049_User-Agent-anonymize.patch b/patches/BRM048_User-Agent-anonymize.patch similarity index 100% rename from patches/BRM049_User-Agent-anonymize.patch rename to patches/BRM048_User-Agent-anonymize.patch diff --git a/patches/BRM050_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch b/patches/BRM049_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch similarity index 89% rename from patches/BRM050_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch rename to patches/BRM049_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch index 9ee92641..5632a1b2 100644 --- a/patches/BRM050_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch +++ b/patches/BRM049_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch @@ -6,8 +6,8 @@ Return fixed base latency --- third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++---- third_party/blink/renderer/modules/webaudio/audio_buffer.idl | 4 ++-- - third_party/blink/renderer/modules/webaudio/audio_context.cc | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) + third_party/blink/renderer/modules/webaudio/audio_context.cc | 1 + + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl @@ -43,15 +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 -@@ -271,7 +271,7 @@ void AudioContext::StopRendering() { - } - +@@ -314,6 +314,7 @@ void AudioContext::StopRendering() { double AudioContext::baseLatency() const { -- return FramesPerBuffer() / static_cast(sampleRate()); + DCHECK(IsMainThread()); + DCHECK(destination()); + return 0.04; - } - } // namespace blink + // TODO(hongchan): Due to the incompatible constructor between + // AudioDestinationNode and DefaultAudioDestinationNode, casting directly from -- 2.7.4 diff --git a/patches/BRM051_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch b/patches/BRM050_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch similarity index 98% rename from patches/BRM051_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch rename to patches/BRM050_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch index 2df337e5..8da8bfec 100644 --- a/patches/BRM051_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch +++ b/patches/BRM050_Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch @@ -64,9 +64,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc +#include "base/rand_util.h" +#include "base/logging.h" + #include "base/numerics/checked_math.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h" - #include "third_party/blink/renderer/platform/graphics/graphics_context.h" @@ -15,6 +17,7 @@ #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkImage.h" @@ -75,7 +75,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc #include "third_party/skia/include/gpu/GrContext.h" namespace blink { -@@ -161,10 +164,161 @@ bool StaticBitmapImage::ConvertToArrayBufferContents( +@@ -154,10 +157,161 @@ bool StaticBitmapImage::ConvertToArrayBufferContents( DCHECK(read_pixels_successful || !sk_image->bounds().intersect(SkIRect::MakeXYWH( rect.X(), rect.Y(), info.width(), info.height()))); diff --git a/patches/BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch b/patches/BRM051_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch similarity index 93% rename from patches/BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch rename to patches/BRM051_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch index 4a67fcc7..4c15972f 100644 --- a/patches/BRM052_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch +++ b/patches/BRM051_getClientRects-getBoundingClientRect-measureText-add-fingerprinting-mitigation.patch @@ -31,7 +31,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ #include "third_party/blink/public/platform/web_scroll_into_view_params.h" #include "third_party/blink/renderer/bindings/core/v8/dictionary.h" -@@ -1356,6 +1357,15 @@ DOMRectList* Element::getClientRects() { +@@ -1382,6 +1383,15 @@ DOMRectList* Element::getClientRects() { DCHECK(element_layout_object); GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom( quads, *element_layout_object); @@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/ return DOMRectList::Create(quads); } -@@ -1373,6 +1383,13 @@ DOMRect* Element::getBoundingClientRect() { +@@ -1399,6 +1409,13 @@ DOMRect* Element::getBoundingClientRect() { DCHECK(element_layout_object); GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result, *element_layout_object); @@ -70,10 +70,10 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re +#include "base/rand_util.h" + - #include "third_party/blink/renderer/bindings/core/v8/exception_state.h" + #include "third_party/blink/renderer/bindings/core/v8/string_or_trusted_html.h" #include "third_party/blink/renderer/core/dom/character_data.h" #include "third_party/blink/renderer/core/dom/container_node.h" -@@ -1575,11 +1577,27 @@ DOMRectList* Range::getClientRects() const { +@@ -1604,11 +1606,27 @@ DOMRectList* Range::getClientRects() const { Vector quads; GetBorderAndTextQuads(quads); @@ -105,7 +105,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc -@@ -47,6 +47,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline, +@@ -48,6 +48,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline, return 0; } @@ -133,7 +133,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h --- a/third_party/blink/renderer/core/html/canvas/text_metrics.h +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h -@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { +@@ -68,6 +68,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable { static float GetFontBaseline(const TextBaseline&, const FontMetrics&); @@ -154,7 +154,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/public/platform/web_scroll_into_view_params.h" -@@ -776,8 +778,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -775,8 +777,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { else direction = ToTextDirection(GetState().GetDirection(), canvas()); diff --git a/patches/BRM053_Punt-the-Widevine-version-string.patch b/patches/BRM052_Punt-the-Widevine-version-string.patch similarity index 72% rename from patches/BRM053_Punt-the-Widevine-version-string.patch rename to patches/BRM052_Punt-the-Widevine-version-string.patch index c1f39e03..c1082c87 100644 --- a/patches/BRM053_Punt-the-Widevine-version-string.patch +++ b/patches/BRM052_Punt-the-Widevine-version-string.patch @@ -10,15 +10,15 @@ 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 -@@ -536,7 +536,7 @@ void ChromeContentClient::AddContentDecryptionModules( - if (IsWidevineAvailable(&cdm_path, &video_codecs_supported, - &supports_persistent_license, - &encryption_modes_supported)) { +@@ -532,7 +532,7 @@ void ChromeContentClient::AddContentDecryptionModules( + base::FilePath cdm_path; + content::CdmCapability capability; + if (IsWidevineAvailable(&cdm_path, &capability)) { - const base::Version version(WIDEVINE_CDM_VERSION_STRING); + const base::Version version("1.0.123.456"); DCHECK(version.IsValid()); - cdms->push_back(content::CdmInfo( + cdms->push_back( -- 2.7.4 diff --git a/patches/BRM054_Disable-metrics-on-all-I-O-threads.patch b/patches/BRM053_Disable-metrics-on-all-I-O-threads.patch similarity index 91% rename from patches/BRM054_Disable-metrics-on-all-I-O-threads.patch rename to patches/BRM053_Disable-metrics-on-all-I-O-threads.patch index f12f969f..a336207d 100644 --- a/patches/BRM054_Disable-metrics-on-all-I-O-threads.patch +++ b/patches/BRM053_Disable-metrics-on-all-I-O-threads.patch @@ -9,7 +9,7 @@ Subject: Disable metrics on all I/O threads 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 -@@ -949,7 +949,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() { +@@ -922,7 +922,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() { bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const { DCHECK_CURRENTLY_ON(BrowserThread::IO); diff --git a/patches/BRM055_Add-a-flag-for-DNS-over-HTTPS.patch b/patches/BRM054_Add-a-flag-for-DNS-over-HTTPS.patch similarity index 83% rename from patches/BRM055_Add-a-flag-for-DNS-over-HTTPS.patch rename to patches/BRM054_Add-a-flag-for-DNS-over-HTTPS.patch index 36e1765b..8a0be323 100644 --- a/patches/BRM055_Add-a-flag-for-DNS-over-HTTPS.patch +++ b/patches/BRM054_Add-a-flag-for-DNS-over-HTTPS.patch @@ -11,19 +11,19 @@ See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt chrome/browser/about_flags.cc | 12 +++++++++ chrome/browser/flag_descriptions.cc | 3 +++ chrome/browser/flag_descriptions.h | 3 +++ - chrome/browser/io_thread.cc | 14 +++++++---- + .../browser/net/system_network_context_manager.cc | 12 +++++---- .../common/network_features.cc | 5 ++-- .../common/network_features.h | 5 ++-- .../common/network_switch_list.h | 4 +++ net/base/load_flags_list.h | 6 +++++ net/dns/dns_transaction.cc | 29 +++------------------- - net/url_request/url_request_http_job.cc | 28 +++++++++++++-------- - 10 files changed, 64 insertions(+), 45 deletions(-) + net/url_request/url_request_http_job.cc | 26 +++++++++++-------- + 10 files changed, 61 insertions(+), 44 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 -@@ -400,6 +400,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = { +@@ -421,6 +421,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = { switches::kChromeHomeSwipeLogicType, "velocity"}, }; @@ -36,7 +36,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #endif // OS_ANDROID const FeatureEntry::Choice kNumRasterThreadsChoices[] = { -@@ -3489,6 +3495,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3517,6 +3523,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kAsyncDns)}, #endif // defined(OS_ANDROID) @@ -52,7 +52,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 -@@ -1952,6 +1952,9 @@ const char kAndroidPaymentAppsDescription[] = +@@ -2112,6 +2112,9 @@ const char kAndroidPaymentAppsDescription[] = const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; @@ -65,7 +65,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 -@@ -1188,6 +1188,9 @@ extern const char kAndroidPaymentAppsDescription[]; +@@ -1284,6 +1284,9 @@ extern const char kAppNotificationStatusMessagingDescription[]; extern const char kAsyncDnsName[]; extern const char kAsyncDnsDescription[]; @@ -75,39 +75,35 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio extern const char kAutofillAccessoryViewName[]; extern const char kAutofillAccessoryViewDescription[]; -diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc ---- a/chrome/browser/io_thread.cc -+++ b/chrome/browser/io_thread.cc -@@ -50,6 +50,7 @@ - #include "components/metrics/metrics_service.h" - #include "components/net_log/chrome_net_log.h" +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 +@@ -23,6 +23,7 @@ + #include "chrome/common/chrome_features.h" + #include "chrome/common/pref_names.h" #include "components/network_session_configurator/common/network_features.h" +#include "components/network_session_configurator/common/network_switches.h" + #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_service.h" #include "components/policy/policy_constants.h" - #include "components/prefs/pref_registry_simple.h" -@@ -373,13 +374,16 @@ IOThread::IOThread( - base::Unretained(this))); - dns_client_enabled_.MoveToThread(io_thread_proxy); - +@@ -370,11 +371,12 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) { + std::make_unique(); + std::unique_ptr default_doh_server_methods = + std::make_unique(); - if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) { +- base::Value server(variations::GetVariationParamValueByFeature( +- features::kDnsOverHttps, "server")); +- base::Value method(variations::GetVariationParamValueByFeature( +- features::kDnsOverHttps, "method")); + std::string dnsOverHttpsServer = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kDnsOverHttpsServer); + if (!dnsOverHttpsServer.empty()) { - base::Value specs(base::Value::Type::LIST); - base::Value methods(base::Value::Type::LIST); -- base::Value spec(variations::GetVariationParamValueByFeature( -- features::kDnsOverHttps, "server")); -- base::Value method(variations::GetVariationParamValueByFeature( -- features::kDnsOverHttps, "method")); -+ -+ base::Value spec(dnsOverHttpsServer); ++ base::Value server(dnsOverHttpsServer); + base::Value method("POST"); -+ - if (spec.GetString().size() > 0) { - specs.GetList().push_back(std::move(spec)); - methods.GetList().push_back(std::move(method)); + if (!server.GetString().empty()) { + default_doh_servers->GetList().push_back(std::move(server)); + default_doh_server_methods->GetList().push_back(std::move(method)); diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc --- a/components/network_session_configurator/common/network_features.cc +++ b/components/network_session_configurator/common/network_features.cc @@ -155,20 +151,23 @@ diff --git a/components/network_session_configurator/common/network_switch_list. diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h --- a/net/base/load_flags_list.h +++ b/net/base/load_flags_list.h -@@ -92,3 +92,9 @@ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION, 1 << 16) - // Indicates that the cache should not check that the request matches the - // response's vary header. - LOAD_FLAG(SKIP_VARY_CHECK, 1 << 17) +@@ -92,6 +92,12 @@ LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 14) + LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 15) + + // Indicates that this request is not to be migrated to a cellular network when + +// This load will not send Accept-Language or User-Agent headers, and not +// advertise brotli encoding. +// Used to comply with IETF (draft) DNS-over-HTTPS: +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests." +LOAD_FLAG(MINIMAL_HEADERS, 1 << 18) + // QUIC connection migration is enabled. + LOAD_FLAG(DISABLE_CONNECTION_MIGRATION_TO_CELLULAR, 1 << 16) + 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 -@@ -390,30 +390,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -389,30 +389,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { HttpRequestHeaders extra_request_headers; extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType); @@ -201,7 +200,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc net_log_ = request_->net_log(); if (use_post) { -@@ -431,6 +409,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { +@@ -430,6 +408,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate { request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE | LOAD_BYPASS_PROXY | LOAD_DO_NOT_SEND_COOKIES | LOAD_DO_NOT_SAVE_COOKIES | @@ -209,7 +208,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc LOAD_DO_NOT_SEND_AUTH_DATA); } -@@ -850,7 +829,7 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -849,7 +828,7 @@ class DnsTransactionImpl : public DnsTransaction, had_tcp_attempt_(false), doh_attempt_(false), first_server_index_(0), @@ -221,7 +220,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc -@@ -434,19 +434,23 @@ void URLRequestHttpJob::Start() { +@@ -434,21 +434,25 @@ void URLRequestHttpJob::Start() { // plugin could set a referrer although sending the referrer is inhibited. request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer); @@ -229,18 +228,19 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque - // instance WebCore::FrameLoader::HideReferrer. - if (referrer.is_valid()) { - request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer, -- referrer.spec()); + if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) { + // Our consumer should have made sure that this is a safe referrer. See for + // instance WebCore::FrameLoader::HideReferrer. + if (referrer.is_valid()) { + request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer, -+ referrer.spec()); + referrer.spec()); + } } request_info_.token_binding_referrer = request_->token_binding_referrer(); + // This should be kept in sync with the corresponding code in + // URLRequest::GetUserAgent. - request_info_.extra_headers.SetHeaderIfMissing( + if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) { + request_info_.extra_headers.SetHeaderIfMissing( @@ -251,7 +251,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque AddExtraHeaders(); AddCookieHeaderAndStart(); -@@ -663,10 +667,12 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -666,10 +670,12 @@ void URLRequestHttpJob::AddExtraHeaders() { HttpRequestHeaders::kAcceptEncoding)) { // Advertise "br" encoding only if transferred data is opaque to proxy. bool advertise_brotli = false; @@ -268,7 +268,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque } } -@@ -683,7 +689,7 @@ void URLRequestHttpJob::AddExtraHeaders() { +@@ -686,7 +692,7 @@ void URLRequestHttpJob::AddExtraHeaders() { advertised_encodings); } diff --git a/patches/BRM056_Always-respect-async-dns-flag-regardless-of-SDK-version.patch b/patches/BRM055_Always-respect-async-dns-flag-regardless-of-SDK-version.patch similarity index 52% rename from patches/BRM056_Always-respect-async-dns-flag-regardless-of-SDK-version.patch rename to patches/BRM055_Always-respect-async-dns-flag-regardless-of-SDK-version.patch index c073ecce..a94b9dae 100644 --- a/patches/BRM056_Always-respect-async-dns-flag-regardless-of-SDK-version.patch +++ b/patches/BRM055_Always-respect-async-dns-flag-regardless-of-SDK-version.patch @@ -4,34 +4,26 @@ Subject: Always respect async dns flag (regardless of SDK version) Do not read experiment value for cronet async DNS configuration --- - chrome/browser/io_thread.cc | 10 +--------- - components/cronet/url_request_context_config.cc | 3 ++- - 2 files changed, 3 insertions(+), 10 deletions(-) + chrome/browser/net/system_network_context_manager.cc | 2 +- + components/cronet/url_request_context_config.cc | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc ---- a/chrome/browser/io_thread.cc -+++ b/chrome/browser/io_thread.cc -@@ -252,15 +252,7 @@ void UpdateMetricsUsagePrefsOnUIThread(const std::string& service_name, - // Check the AsyncDns field trial and return true if it should be enabled. On +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 +@@ -180,7 +180,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) { // Android this includes checking the Android version in the field trial. bool ShouldEnableAsyncDns() { -- bool feature_can_be_enabled = true; + bool feature_can_be_enabled = true; -#if defined(OS_ANDROID) -- int min_sdk = -- base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0); -- if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk) -- feature_can_be_enabled = false; --#endif -- return feature_can_be_enabled && -- base::FeatureList::IsEnabled(features::kAsyncDns); -+ return base::FeatureList::IsEnabled(features::kAsyncDns); - } - - } // namespace ++#if 0 + int min_sdk = + base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0); + if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk) 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 -@@ -366,7 +366,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( +@@ -390,7 +390,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions( effective_experimental_options->Remove(it.key(), nullptr); continue; } diff --git a/patches/BRM057_Add-flag-to-configure-maximum-connections-per-host.patch b/patches/BRM056_Add-flag-to-configure-maximum-connections-per-host.patch similarity index 96% rename from patches/BRM057_Add-flag-to-configure-maximum-connections-per-host.patch rename to patches/BRM056_Add-flag-to-configure-maximum-connections-per-host.patch index 0af47605..748983dc 100644 --- a/patches/BRM057_Add-flag-to-configure-maximum-connections-per-host.patch +++ b/patches/BRM056_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 -@@ -798,6 +798,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { +@@ -839,6 +839,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = { net::kEffectiveConnectionType4G}, }; @@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -2398,6 +2403,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2432,6 +2437,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMaterialDesignIncognitoNTPName, flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)}, @@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -975,6 +975,10 @@ const char kMaterialDesignIncognitoNTPDescription[] = +@@ -1065,6 +1065,10 @@ const char kMaterialDesignIncognitoNTPDescription[] = "If enabled, the Incognito New Tab page uses the new material design with " "a better readable text."; @@ -57,7 +57,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -613,6 +613,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; +@@ -667,6 +667,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[]; extern const char kMaterialDesignIncognitoNTPName[]; extern const char kMaterialDesignIncognitoNTPDescription[]; diff --git a/patches/BRM058_Add-flag-to-show-hide-NTP-tiles.patch b/patches/BRM057_Add-flag-to-show-hide-NTP-tiles.patch similarity index 86% rename from patches/BRM058_Add-flag-to-show-hide-NTP-tiles.patch rename to patches/BRM057_Add-flag-to-show-hide-NTP-tiles.patch index 3986e814..95908cb7 100644 --- a/patches/BRM058_Add-flag-to-show-hide-NTP-tiles.patch +++ b/patches/BRM057_Add-flag-to-show-hide-NTP-tiles.patch @@ -14,17 +14,17 @@ Subject: Add flag to show/hide NTP tiles 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 -@@ -1915,6 +1915,10 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kChromeModernAlternateCardLayoutName, - flag_descriptions::kChromeModernAlternateCardLayoutDescription, kOsAndroid, - FEATURE_VALUE_TYPE(chrome::android::kChromeModernAlternateCardLayout)}, +@@ -1902,6 +1902,10 @@ const FeatureEntry kFeatureEntries[] = { + SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, + #endif // OS_MACOSX + #if defined(OS_ANDROID) + {"hide-ntp-tiles", + flag_descriptions::kHideNTPTilesName, + flag_descriptions::kHideNTPTilesDescription, kOsAndroid, + SINGLE_VALUE_TYPE(switches::kHideNTPTiles)}, - {"force-enable-home-page-button", flag_descriptions::kHomePageButtonName, - flag_descriptions::kHomePageButtonDescription, kOsAndroid, - FEATURE_VALUE_TYPE(chrome::android::kHomePageButtonForceEnabled)}, + {"disable-pull-to-refresh-effect", + flag_descriptions::kPullToRefreshEffectName, + flag_descriptions::kPullToRefreshEffectDescription, kOsAndroid, 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 @@ -40,7 +40,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h" #include "chrome/browser/profiles/profile.h" -@@ -167,6 +169,10 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable( +@@ -162,6 +164,10 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable( std::vector sources; std::vector section_types; std::vector data_generation_times; @@ -51,7 +51,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br for (const auto& section : sections) { const NTPTilesVector& tiles = section.second; section_types.resize(section_types.size() + tiles.size(), -@@ -181,6 +187,8 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable( +@@ -176,6 +182,8 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable( tile.data_generation_time.ToJavaTime()); } } @@ -63,7 +63,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br 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 -@@ -106,6 +106,10 @@ const char kBackgroundVideoTrackOptimizationDescription[] = +@@ -141,6 +141,10 @@ const char kBackgroundVideoTrackOptimizationDescription[] = "Disable video tracks when the video is played in the background to " "optimize performance."; @@ -77,7 +77,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -92,6 +92,9 @@ extern const char kAv1DecoderDescription[]; +@@ -113,6 +113,9 @@ extern const char kAv1DecoderDescription[]; extern const char kBackgroundVideoTrackOptimizationName[]; extern const char kBackgroundVideoTrackOptimizationDescription[]; diff --git a/patches/BRM059_Add-custom-tab-intents-privacy-option.patch b/patches/BRM058_Add-custom-tab-intents-privacy-option.patch similarity index 84% rename from patches/BRM059_Add-custom-tab-intents-privacy-option.patch rename to patches/BRM058_Add-custom-tab-intents-privacy-option.patch index 6f9c43ea..2c83a15a 100644 --- a/patches/BRM059_Add-custom-tab-intents-privacy-option.patch +++ b/patches/BRM058_Add-custom-tab-intents-privacy-option.patch @@ -5,10 +5,10 @@ Subject: Add custom tab intents privacy option --- chrome/android/java/res/values/values.xml | 3 +++ chrome/android/java/res/xml/privacy_preferences.xml | 5 +++++ - .../org/chromium/chrome/browser/LaunchIntentDispatcher.java | 9 +++++++-- + .../org/chromium/chrome/browser/LaunchIntentDispatcher.java | 2 ++ .../chrome/browser/preferences/privacy/PrivacyPreferences.java | 10 ++++++++++ chrome/android/java/strings/android_chrome_strings.grd | 7 +++++++ - 5 files changed, 32 insertions(+), 2 deletions(-) + 5 files changed, 27 insertions(+) diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml @@ -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 -@@ -52,4 +52,9 @@ +@@ -52,6 +52,11 @@ android:title="@string/clear_browsing_data_title" android:summary="@string/clear_browsing_data_summary" android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" /> @@ -35,11 +35,13 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi + android:title="@string/allow_custom_tab_intents_title" + android:summary="@string/allow_custom_tab_intents_summary" + android:defaultValue="false" /> - + diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java -@@ -37,6 +37,7 @@ import org.chromium.chrome.browser.metrics.MediaNotificationUma; +@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.metrics.MediaNotificationUma; import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; import org.chromium.chrome.browser.notifications.NotificationPlatformBridge; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; @@ -47,26 +49,18 @@ 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; -@@ -149,9 +150,13 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega - recordIntentMetrics(); - - mIsVrIntent = VrIntentUtils.isVrIntent(mIntent); -- boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent)) -+ -+ if (ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) { -+ mIsCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent)) - || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent)); -- mIsCustomTabIntent = isCustomTabIntent; -+ } else { -+ mIsCustomTabIntent = false; -+ } - } - - /** +@@ -274,6 +275,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega + */ + public static boolean isCustomTabIntent(Intent intent) { + if (intent == null) return false; ++ if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) return false; + if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent) + || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) { + return false; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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 -@@ -37,6 +37,7 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -41,6 +41,7 @@ public class PrivacyPreferences extends PreferenceFragment "safe_browsing_extended_reporting"; private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING = "safe_browsing_scout_reporting"; @@ -74,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri private static final String PREF_SAFE_BROWSING = "safe_browsing"; private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search"; -@@ -100,6 +101,11 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -134,6 +135,11 @@ public class PrivacyPreferences extends PreferenceFragment ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING; preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove)); @@ -86,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri ChromeBaseCheckBoxPreference safeBrowsingPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING); safeBrowsingPref.setOnPreferenceChangeListener(this); -@@ -123,6 +129,10 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -153,6 +159,10 @@ public class PrivacyPreferences extends PreferenceFragment || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) { PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled( (boolean) newValue); @@ -100,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 -@@ -3423,6 +3423,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr +@@ -3615,6 +3615,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr Browse diff --git a/patches/BRM060_Add-privacy-option-to-keep-cookies-until-session-exit.patch b/patches/BRM059_Add-privacy-option-to-keep-cookies-until-session-exit.patch similarity index 86% rename from patches/BRM060_Add-privacy-option-to-keep-cookies-until-session-exit.patch rename to patches/BRM059_Add-privacy-option-to-keep-cookies-until-session-exit.patch index ab3db207..9caf570a 100644 --- a/patches/BRM060_Add-privacy-option-to-keep-cookies-until-session-exit.patch +++ b/patches/BRM059_Add-privacy-option-to-keep-cookies-until-session-exit.patch @@ -5,11 +5,11 @@ Subject: Add privacy option to keep cookies until session exit --- chrome/android/java/res/values/values.xml | 3 +++ .../android/java/res/xml/website_preferences.xml | 7 +++++++ - .../browser/preferences/PrefServiceBridge.java | 10 +++++++++ - .../website/SingleCategoryPreferences.java | 24 ++++++++++++++++++++++ + .../browser/preferences/PrefServiceBridge.java | 10 ++++++++++ + .../website/SingleCategoryPreferences.java | 23 ++++++++++++++++++++++ .../java/strings/android_chrome_strings.grd | 6 ++++++ - .../android/preferences/pref_service_bridge.cc | 19 +++++++++++++++++ - 6 files changed, 69 insertions(+) + .../android/preferences/pref_service_bridge.cc | 19 ++++++++++++++++++ + 6 files changed, 68 insertions(+) diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml --- a/chrome/android/java/res/values/values.xml @@ -44,7 +44,7 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java -@@ -256,6 +256,10 @@ public class PrefServiceBridge { +@@ -245,6 +245,10 @@ public class PrefServiceBridge { return nativeGetBlockThirdPartyCookiesEnabled(); } @@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre /** * @return Whether third-party cookie blocking is configured by policy */ -@@ -722,6 +726,10 @@ public class PrefServiceBridge { +@@ -630,6 +634,10 @@ public class PrefServiceBridge { nativeSetBlockThirdPartyCookiesEnabled(enabled); } @@ -63,10 +63,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre + nativeSetCookiesSessionOnlyEnabled(enabled); + } + - public void setClipboardEnabled(boolean allow) { - nativeSetClipboardEnabled(allow); + public void setDoNotTrackEnabled(boolean enabled) { + nativeSetDoNotTrackEnabled(enabled); } -@@ -1107,6 +1115,7 @@ public class PrefServiceBridge { +@@ -1026,6 +1034,7 @@ public class PrefServiceBridge { private native boolean nativeGetAutoplayEnabled(); private native boolean nativeGetBackgroundSyncEnabled(); private native boolean nativeGetBlockThirdPartyCookiesEnabled(); @@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre private native boolean nativeGetBlockThirdPartyCookiesManaged(); private native boolean nativeGetRememberPasswordsEnabled(); private native boolean nativeGetPasswordManagerAutoSigninEnabled(); -@@ -1153,6 +1162,7 @@ public class PrefServiceBridge { +@@ -1073,6 +1082,7 @@ public class PrefServiceBridge { private native void nativeSetAllowCookiesEnabled(boolean allow); private native void nativeSetBackgroundSyncEnabled(boolean allow); private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled); @@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java -@@ -98,6 +98,7 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -104,6 +104,7 @@ public class SingleCategoryPreferences extends PreferenceFragment // Keys for individual preferences. public static final String READ_WRITE_TOGGLE_KEY = "read_write_toggle"; public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies"; @@ -93,14 +93,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate"; public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more"; private static final String ADD_EXCEPTION_KEY = "add_exception"; -@@ -447,6 +448,7 @@ public class SingleCategoryPreferences extends PreferenceFragment - } else if (mCategory.showCookiesSites()) { - PrefServiceBridge.getInstance().setAllowCookiesEnabled((boolean) newValue); - updateThirdPartyCookiesCheckBox(); -+ updateCookiesSessionOnlyCheckBox(); - } else if (mCategory.showGeolocationSites()) { - PrefServiceBridge.getInstance().setAllowLocationEnabled((boolean) newValue); - } else if (mCategory.showJavaScriptSites()) { +@@ -459,6 +460,7 @@ public class SingleCategoryPreferences extends PreferenceFragment + + if (type == SiteSettingsCategory.Type.COOKIES) { + updateThirdPartyCookiesCheckBox(); ++ updateCookiesSessionOnlyCheckBox(); + } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) { + updateNotificationsVibrateCheckBox(); + } @@ -491,6 +493,8 @@ public class SingleCategoryPreferences extends PreferenceFragment getInfoForOrigins(); } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) { @@ -110,14 +110,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) { PrefServiceBridge.getInstance().setNotificationsVibrateEnabled((boolean) newValue); } -@@ -726,6 +730,16 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -734,6 +738,16 @@ public class SingleCategoryPreferences extends PreferenceFragment getPreferenceScreen().removePreference(thirdPartyCookies); } + // Configure/hide the keep cookies until session is over toggle, as needed. + Preference cookiesSessionOnly = getPreferenceScreen().findPreference( + COOKIES_SESSION_ONLY_TOGGLE_KEY); -+ if (mCategory.showCookiesSites()) { ++ if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) { + cookiesSessionOnly.setOnPreferenceChangeListener(this); + updateCookiesSessionOnlyCheckBox(); + } else { @@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web // Configure/hide the notifications vibrate toggle, as needed. Preference notificationsVibrate = getPreferenceScreen().findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY); -@@ -859,6 +873,16 @@ public class SingleCategoryPreferences extends PreferenceFragment +@@ -847,6 +861,15 @@ public class SingleCategoryPreferences extends PreferenceFragment preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged()); } @@ -136,9 +136,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web + getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY); + cookiesSessionOnlyPref.setChecked( + !PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled()); -+ cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isAcceptCookiesEnabled()); -+// cookiesSessionOnlyPref.setManagedPreferenceDelegate( -+// preference -> PrefServiceBridge.getInstance().isCookiesSessionOnlyPrefManaged()); ++ cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isCategoryEnabled( ++ ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES)); + } + private void updateNotificationsVibrateCheckBox() { @@ -147,7 +146,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 -@@ -800,6 +800,12 @@ Your Google account may have other forms of browsing history like searches and a +@@ -861,6 +861,12 @@ Your Google account may have other forms of browsing history like searches and a Third-party websites can save and read cookie data @@ -163,7 +162,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 -@@ -276,6 +276,14 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled( +@@ -282,6 +282,14 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled( return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies); } @@ -178,7 +177,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged( JNIEnv* env, const JavaParamRef& obj) { -@@ -724,6 +732,17 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled( +@@ -741,6 +749,17 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled( GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled); } diff --git a/patches/BRM061_Always-allow-partner-customisation.patch b/patches/BRM060_Always-allow-partner-customisation.patch similarity index 100% rename from patches/BRM061_Always-allow-partner-customisation.patch rename to patches/BRM060_Always-allow-partner-customisation.patch diff --git a/patches/BRM062_Change-default-homepage-to-new-tab-page.patch b/patches/BRM061_Change-default-homepage-to-new-tab-page.patch similarity index 100% rename from patches/BRM062_Change-default-homepage-to-new-tab-page.patch rename to patches/BRM061_Change-default-homepage-to-new-tab-page.patch diff --git a/patches/BRM063_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch b/patches/BRM062_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch similarity index 98% rename from patches/BRM063_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch rename to patches/BRM062_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch index 39b5e415..bd06b1eb 100644 --- a/patches/BRM063_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch +++ b/patches/BRM062_Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch @@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import org.chromium.chrome.browser.favicon.LargeIconBridge; import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader; import org.chromium.chrome.browser.profiles.Profile; -@@ -30,6 +31,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout; +@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout; import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate; import org.chromium.chrome.browser.widget.selection.SelectionDelegate; import org.chromium.components.bookmarks.BookmarkId; @@ -222,7 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm import java.util.Stack; -@@ -53,6 +55,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, +@@ -55,6 +57,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, private Activity mActivity; private ViewGroup mMainView; private BookmarkModel mBookmarkModel; @@ -230,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm private BookmarkUndoController mUndoController; private final ObserverList mUIObservers = new ObserverList<>(); private BasicNativePage mNativePage; -@@ -269,6 +272,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, +@@ -267,6 +270,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, } /** @@ -244,7 +244,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm * @return Current URL representing the UI state of bookmark manager. If no state has been shown * yet in this session, on phone return last used state stored in preference; on tablet * return the url previously set by {@link #updateForUrl(String)}. -@@ -416,6 +426,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, +@@ -414,6 +424,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate, } @Override @@ -291,7 +291,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -135,6 +135,10 @@ jumbo_split_static_library("browser") { +@@ -137,6 +137,10 @@ jumbo_split_static_library("browser") { "bitmap_fetcher/bitmap_fetcher_service.h", "bitmap_fetcher/bitmap_fetcher_service_factory.cc", "bitmap_fetcher/bitmap_fetcher_service_factory.h", @@ -302,7 +302,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", -@@ -2422,8 +2426,6 @@ jumbo_split_static_library("browser") { +@@ -2479,8 +2483,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", @@ -311,7 +311,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", -@@ -2510,8 +2512,6 @@ jumbo_split_static_library("browser") { +@@ -2569,8 +2571,6 @@ jumbo_split_static_library("browser") { "importer/importer_uma.h", "importer/in_process_importer_bridge.cc", "importer/in_process_importer_bridge.h", @@ -672,7 +672,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -434,6 +434,9 @@ static_library("common") { +@@ -436,6 +436,9 @@ static_library("common") { sources += [ "media/chrome_media_drm_bridge_client.cc", "media/chrome_media_drm_bridge_client.h", @@ -694,7 +694,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", -@@ -160,6 +158,11 @@ static_library("utility") { +@@ -158,6 +156,11 @@ static_library("utility") { ] } diff --git a/patches/BRM064_Add-option-to-not-persist-tabs-across-sessions.patch b/patches/BRM063_Add-option-to-not-persist-tabs-across-sessions.patch similarity index 89% rename from patches/BRM064_Add-option-to-not-persist-tabs-across-sessions.patch rename to patches/BRM063_Add-option-to-not-persist-tabs-across-sessions.patch index 53dbc8be..f3922f31 100644 --- a/patches/BRM064_Add-option-to-not-persist-tabs-across-sessions.patch +++ b/patches/BRM063_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 -@@ -1004,8 +1004,10 @@ public class ChromeTabbedActivity +@@ -1037,8 +1037,10 @@ public class ChromeTabbedActivity boolean hadCipherData = CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); @@ -64,7 +64,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.Preference; -@@ -14,6 +15,7 @@ import android.view.Menu; +@@ -15,6 +16,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -72,17 +72,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri import org.chromium.base.metrics.RecordHistogram; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeFeatureList; -@@ -45,6 +47,7 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -46,6 +48,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"; ++ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; 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"; -+ private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit"; - - private ManagedPreferenceDelegate mManagedPreferenceDelegate; - -@@ -115,6 +118,11 @@ public class PrivacyPreferences extends PreferenceFragment - (ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT); - canMakePaymentPref.setOnPreferenceChangeListener(this); +@@ -145,6 +148,11 @@ public class PrivacyPreferences extends PreferenceFragment + safeBrowsingPref.setOnPreferenceChangeListener(this); + safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate); + 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 updateSummaries(); } -@@ -141,6 +149,12 @@ public class PrivacyPreferences extends PreferenceFragment +@@ -171,6 +179,12 @@ public class PrivacyPreferences extends PreferenceFragment } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) { PrefServiceBridge.getInstance().setBoolean( Pref.CAN_MAKE_PAYMENT_ENABLED, (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 -@@ -3463,6 +3463,12 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr +@@ -3655,6 +3655,12 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr Resume diff --git a/patches/BRM065_Add-an-always-incognito-mode.patch b/patches/BRM064_Add-an-always-incognito-mode.patch similarity index 94% rename from patches/BRM065_Add-an-always-incognito-mode.patch rename to patches/BRM064_Add-an-always-incognito-mode.patch index a74a7ffa..6f4cf0d9 100644 --- a/patches/BRM065_Add-an-always-incognito-mode.patch +++ b/patches/BRM064_Add-an-always-incognito-mode.patch @@ -111,7 +111,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java -@@ -243,6 +243,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -238,6 +238,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener; // Observes when sync becomes ready to create the mContextReporter. @@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity. private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener; private ChromeFullscreenManager mFullscreenManager; -@@ -1593,6 +1594,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -1630,6 +1631,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity throw new IllegalStateException( "Attempting to access TabCreator before initialization"); } @@ -150,9 +150,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu private AppMenu mAppMenu; private AppMenuDragHelper mAppMenuDragHelper; private Menu mMenu; -@@ -166,6 +170,14 @@ public class AppMenuHandler { +@@ -167,6 +171,14 @@ public class AppMenuHandler { if (mDelegate.shouldShowHeader(appRect.height())) { - headerView = mDelegate.getHeaderView(); + headerResourceId = mDelegate.getHeaderResourceId(); } + + if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)) { @@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu + } + mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y, - footerResourceId, headerView, mHighlightMenuId); + footerResourceId, headerResourceId, mHighlightMenuId, showFromBottom); mAppMenuDragHelper.onShow(startDragging); 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 @@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr private static final ShareContextMenuItem SHARE_IMAGE = new ShareContextMenuItem(R.drawable.ic_share_white_24dp, R.string.contextmenu_share_image, R.id.contextmenu_share_image, false); -@@ -463,6 +465,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { +@@ -479,6 +481,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { disabledOptions.add(ChromeContextMenuItem.OPEN_IN_INCOGNITO_TAB); } @@ -284,9 +284,9 @@ 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 -@@ -615,6 +615,12 @@ CHAR-LIMIT guidelines: - - Automatically send some system information and page content to Google to help detect dangerous apps and sites +@@ -676,6 +676,12 @@ CHAR-LIMIT guidelines: + + Sends some system information and page content to Google + + Open links in incognito tabs always @@ -300,8 +300,8 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -7,6 +7,7 @@ import("//components/offline_pages/buildflags/features.gni") - import("//device/vr/buildflags/buildflags.gni") +@@ -8,6 +8,7 @@ import("//device/vr/buildflags/buildflags.gni") + import("//chrome/android/feed/feed_java_sources.gni") chrome_java_sources = [ + "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java", diff --git a/patches/BRM066_Disable-fetching-of-all-field-trials.patch b/patches/BRM065_Disable-fetching-of-all-field-trials.patch similarity index 96% rename from patches/BRM066_Disable-fetching-of-all-field-trials.patch rename to patches/BRM065_Disable-fetching-of-all-field-trials.patch index b4050a95..b38d524a 100644 --- a/patches/BRM066_Disable-fetching-of-all-field-trials.patch +++ b/patches/BRM065_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 -@@ -224,6 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers, +@@ -225,6 +225,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() { @@ -54,7 +54,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va #if !defined(GOOGLE_CHROME_BUILD) if (!base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kVariationsServerURL) && -@@ -235,6 +236,9 @@ bool IsFetchingEnabled() { +@@ -236,6 +237,9 @@ bool IsFetchingEnabled() { } #endif return true; diff --git a/patches/BRM067_Disable-smooth-scrolling-on-Linux.patch b/patches/BRM066_Disable-smooth-scrolling-on-Linux.patch similarity index 100% rename from patches/BRM067_Disable-smooth-scrolling-on-Linux.patch rename to patches/BRM066_Disable-smooth-scrolling-on-Linux.patch diff --git a/patches/BRM068_Disable-plugins-enumeration.patch b/patches/BRM067_Disable-plugins-enumeration.patch similarity index 86% rename from patches/BRM068_Disable-plugins-enumeration.patch rename to patches/BRM067_Disable-plugins-enumeration.patch index 69bd6fde..cd3cb310 100644 --- a/patches/BRM068_Disable-plugins-enumeration.patch +++ b/patches/BRM067_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 -@@ -1239,10 +1239,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1262,10 +1262,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { } PluginData* LocalFrame::GetPluginData() const { @@ -21,7 +21,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/ + return nullptr; } - DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); + void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) { -- 2.7.4 diff --git a/patches/BRM069_Remove-google-account-access-permission-on-reboot.patch b/patches/BRM068_Remove-google-account-access-permission-on-reboot.patch similarity index 93% rename from patches/BRM069_Remove-google-account-access-permission-on-reboot.patch rename to patches/BRM068_Remove-google-account-access-permission-on-reboot.patch index 7d841f8a..0ea2b11f 100644 --- a/patches/BRM069_Remove-google-account-access-permission-on-reboot.patch +++ b/patches/BRM068_Remove-google-account-access-permission-on-reboot.patch @@ -10,7 +10,7 @@ Subject: Remove google account access permission on reboot diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -790,8 +790,7 @@ jinja_template_resources("chrome_public_apk_template_resources") { +@@ -869,8 +869,7 @@ jinja_template_resources("chrome_public_apk_template_resources") { resources = [ "java/res_template/xml/file_paths.xml", "java/res_template/xml/launchershortcuts.xml", @@ -23,7 +23,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -831,14 +831,14 @@ by a child template that "extends" this file. +@@ -837,14 +837,14 @@ by a child template that "extends" this file. diff --git a/patches/BRM070_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch b/patches/BRM069_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch similarity index 100% rename from patches/BRM070_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch rename to patches/BRM069_net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch diff --git a/patches/BRM071_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch b/patches/BRM070_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch similarity index 94% rename from patches/BRM071_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch rename to patches/BRM070_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch index 8d8370a2..a4e59b4b 100644 --- a/patches/BRM071_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch +++ b/patches/BRM070_dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather-than-Google.patch @@ -11,7 +11,7 @@ anyway), avoid sending to Google. diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc -@@ -107,10 +107,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; +@@ -108,10 +108,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds; // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/patches/BRM072_profile-resetter-do-not-tick-send-settings-by-default.patch b/patches/BRM071_profile-resetter-do-not-tick-send-settings-by-default.patch similarity index 100% rename from patches/BRM072_profile-resetter-do-not-tick-send-settings-by-default.patch rename to patches/BRM071_profile-resetter-do-not-tick-send-settings-by-default.patch diff --git a/patches/BRM073_browser-ui-disable-warning-about-missing-API-keys.patch b/patches/BRM072_browser-ui-disable-warning-about-missing-API-keys.patch similarity index 100% rename from patches/BRM073_browser-ui-disable-warning-about-missing-API-keys.patch rename to patches/BRM072_browser-ui-disable-warning-about-missing-API-keys.patch diff --git a/patches/BRM074_autofill-disable-autofill-download-manager.patch b/patches/BRM073_autofill-disable-autofill-download-manager.patch similarity index 60% rename from patches/BRM074_autofill-disable-autofill-download-manager.patch rename to patches/BRM073_autofill-disable-autofill-download-manager.patch index c7475b7d..8be631fd 100644 --- a/patches/BRM074_autofill-disable-autofill-download-manager.patch +++ b/patches/BRM073_autofill-disable-autofill-download-manager.patch @@ -4,14 +4,14 @@ Subject: autofill: disable autofill download manager Disables the autofill download manager (trk:158). --- - components/autofill/core/browser/autofill_download_manager.cc | 9 +++++++-- + components/autofill/core/browser/autofill_download_manager.cc | 6 +++++- components/autofill/core/browser/autofill_manager.cc | 2 ++ - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc --- a/components/autofill/core/browser/autofill_download_manager.cc +++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -39,7 +39,6 @@ namespace autofill { +@@ -41,7 +41,6 @@ namespace autofill { namespace { @@ -19,44 +19,29 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com const size_t kMaxFormCacheSize = 16; const size_t kMaxFieldsPerQueryRequest = 100; -@@ -69,11 +68,13 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = { - false, - }; +@@ -365,6 +364,7 @@ bool AutofillDownloadManager::StartUploadRequest( -+#if 0 - #if defined(GOOGLE_CHROME_BUILD) - const char kClientName[] = "Google+Chrome"; - #else - const char kClientName[] = "Chromium"; - #endif // defined(GOOGLE_CHROME_BUILD) -+#endif - - const char kDefaultAutofillServerURL[] = - "https://clients1.google.com/tbproxy/af/"; -@@ -371,7 +372,7 @@ bool AutofillDownloadManager::StartUploadRequest( - std::tuple - AutofillDownloadManager::GetRequestURLAndMethod( + std::tuple AutofillDownloadManager::GetRequestURLAndMethod( const FormRequestData& request_data) const { -- net::URLFetcher::RequestType method = net::URLFetcher::POST; +#if 0 - std::string query_str(base::StrCat({"client=", kClientName})); + std::string method("POST"); + std::string query_str; - if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) { -@@ -394,6 +395,10 @@ AutofillDownloadManager::GetRequestURLAndMethod( +@@ -387,6 +387,10 @@ std::tuple AutofillDownloadManager::GetRequestURLAndMethod( GURL url = autofill_server_url_ .Resolve(RequestTypeToString(request_data.request_type)) .ReplaceComponents(replacements); +#else -+ net::URLFetcher::RequestType method = net::URLFetcher::GET; ++ std::string method("GET"); + GURL url = GURL("about:blank"); +#endif - - return std::make_tuple(std::move(url), method); + return std::make_tuple(std::move(url), std::move(method)); } + 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 -@@ -1264,9 +1264,11 @@ AutofillManager::AutofillManager( +@@ -1183,9 +1183,11 @@ AutofillManager::AutofillManager( weak_ptr_factory_(this) { DCHECK(driver); DCHECK(client_); diff --git a/patches/BRM075_first_run-deactivate-autoupdate-globally.patch b/patches/BRM074_first_run-deactivate-autoupdate-globally.patch similarity index 94% rename from patches/BRM075_first_run-deactivate-autoupdate-globally.patch rename to patches/BRM074_first_run-deactivate-autoupdate-globally.patch index cf80b06d..6a8114e9 100644 --- a/patches/BRM075_first_run-deactivate-autoupdate-globally.patch +++ b/patches/BRM074_first_run-deactivate-autoupdate-globally.patch @@ -15,7 +15,7 @@ turn it back on. diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc -@@ -206,8 +206,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { +@@ -207,8 +207,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) { // ExtensionService depends on RuntimeData. runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_))); diff --git a/patches/BRM076_safe_browsing-disable-incident-reporting.patch b/patches/BRM075_safe_browsing-disable-incident-reporting.patch similarity index 100% rename from patches/BRM076_safe_browsing-disable-incident-reporting.patch rename to patches/BRM075_safe_browsing-disable-incident-reporting.patch diff --git a/patches/BRM077_safe_browsing-disable-reporting-of-safebrowsing-override.patch b/patches/BRM076_safe_browsing-disable-reporting-of-safebrowsing-override.patch similarity index 88% rename from patches/BRM077_safe_browsing-disable-reporting-of-safebrowsing-override.patch rename to patches/BRM076_safe_browsing-disable-reporting-of-safebrowsing-override.patch index 6197821e..6f98e3c3 100644 --- a/patches/BRM077_safe_browsing-disable-reporting-of-safebrowsing-override.patch +++ b/patches/BRM076_safe_browsing-disable-reporting-of-safebrowsing-override.patch @@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr } // namespace -@@ -285,6 +287,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -289,6 +291,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( return; } @@ -37,7 +37,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr // Fill in metadata about which model we used. if (is_extended_reporting) { request->set_model_filename(model_loader_extended_->name()); -@@ -367,6 +373,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -371,6 +377,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( // Record that we made a request phishing_report_times_.push(base::Time::Now()); @@ -45,7 +45,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr } void ClientSideDetectionService::StartClientReportMalwareRequest( -@@ -381,6 +388,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -385,6 +392,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( return; } @@ -56,7 +56,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr std::string request_data; if (!request->SerializeToString(&request_data)) { UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION); -@@ -450,6 +461,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -454,6 +465,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( // Record that we made a malware request malware_report_times_.push(base::Time::Now()); diff --git a/patches/BRM078_safe_browsing-disable-cookie-transmission.patch b/patches/BRM077_safe_browsing-disable-cookie-transmission.patch similarity index 97% rename from patches/BRM078_safe_browsing-disable-cookie-transmission.patch rename to patches/BRM077_safe_browsing-disable-cookie-transmission.patch index c85b3746..5e57be49 100644 --- a/patches/BRM078_safe_browsing-disable-cookie-transmission.patch +++ b/patches/BRM077_safe_browsing-disable-cookie-transmission.patch @@ -17,7 +17,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/37 diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc -@@ -354,7 +354,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( +@@ -358,7 +358,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( auto resource_request = std::make_unique(); resource_request->url = GetClientReportUrl(kClientReportPhishingUrl); resource_request->method = "POST"; @@ -26,7 +26,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr auto loader = network::SimpleURLLoader::Create(std::move(resource_request), traffic_annotation); loader->AttachStringForUpload(request_data, "application/octet-stream"); -@@ -436,7 +436,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( +@@ -440,7 +440,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest( auto resource_request = std::make_unique(); resource_request->url = GetClientReportUrl(kClientReportMalwareUrl); resource_request->method = "POST"; @@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc -@@ -1022,7 +1022,7 @@ void CheckClientDownloadRequest::SendRequest() { +@@ -1068,7 +1068,7 @@ void CheckClientDownloadRequest::SendRequest() { auto resource_request = std::make_unique(); resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl(); resource_request->method = "POST"; diff --git a/patches/BRM079_extensions-always-show-component-extensions-in-the-ext-list.patch b/patches/BRM078_extensions-always-show-component-extensions-in-the-ext-list.patch similarity index 94% rename from patches/BRM079_extensions-always-show-component-extensions-in-the-ext-list.patch rename to patches/BRM078_extensions-always-show-component-extensions-in-the-ext-list.patch index c2fa2e27..ed22b416 100644 --- a/patches/BRM079_extensions-always-show-component-extensions-in-the-ext-list.patch +++ b/patches/BRM078_extensions-always-show-component-extensions-in-the-ext-list.patch @@ -18,7 +18,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/28 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc --- a/extensions/common/extension.cc +++ b/extensions/common/extension.cc -@@ -377,9 +377,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const { +@@ -378,9 +378,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const { } bool Extension::ShouldExposeViaManagementAPI() const { diff --git a/patches/BRM080_translate-disable-fetching-of-translate-languages-from-server.patch b/patches/BRM079_translate-disable-fetching-of-translate-languages-from-server.patch similarity index 100% rename from patches/BRM080_translate-disable-fetching-of-translate-languages-from-server.patch rename to patches/BRM079_translate-disable-fetching-of-translate-languages-from-server.patch diff --git a/patches/BRM081_lint-suppress-hardcoded-text-warnings.patch b/patches/BRM080_lint-suppress-hardcoded-text-warnings.patch similarity index 96% rename from patches/BRM081_lint-suppress-hardcoded-text-warnings.patch rename to patches/BRM080_lint-suppress-hardcoded-text-warnings.patch index 82cedf7b..02653e45 100644 --- a/patches/BRM081_lint-suppress-hardcoded-text-warnings.patch +++ b/patches/BRM080_lint-suppress-hardcoded-text-warnings.patch @@ -9,7 +9,7 @@ Subject: lint: suppress hardcoded text warnings diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml --- a/build/android/lint/suppressions.xml +++ b/build/android/lint/suppressions.xml -@@ -94,10 +94,8 @@ Still reading? +@@ -92,10 +92,8 @@ Still reading? diff --git a/patches/BRM081_kill-Vision.patch b/patches/BRM081_kill-Vision.patch new file mode 100644 index 00000000..4708625d --- /dev/null +++ b/patches/BRM081_kill-Vision.patch @@ -0,0 +1,156 @@ +From: thermatk +Date: Fri, 22 Jun 2018 17:04:43 +0200 +Subject: kill Vision + +--- + .../org/chromium/shape_detection/BarcodeDetectionImpl.java | 6 +++--- + .../java/src/org/chromium/shape_detection/BitmapUtils.java | 12 ------------ + .../chromium/shape_detection/FaceDetectionImplGmsCore.java | 6 +++--- + .../chromium/shape_detection/FaceDetectionProviderImpl.java | 2 +- + .../src/org/chromium/shape_detection/InterfaceRegistrar.java | 10 +++++----- + .../src/org/chromium/shape_detection/TextDetectionImpl.java | 6 +++--- + 6 files changed, 15 insertions(+), 27 deletions(-) + +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java +@@ -43,11 +43,11 @@ public class BarcodeDetectionImpl implements BarcodeDetection { + // on the device; this happens "fast", but it might have not completed, + // bail in this case. Also, the API was disabled between and v.9.0 and + // v.9.2, see https://developers.google.com/android/guides/releases. +- if (!mBarcodeDetector.isOperational()) { ++// if (!mBarcodeDetector.isOperational()) { + Log.e(TAG, "BarcodeDetector is not operational"); + callback.call(new BarcodeDetectionResult[0]); + return; +- } ++/* } + + Frame frame = BitmapUtils.convertToFrame(bitmapData); + if (frame == null) { +@@ -77,7 +77,7 @@ public class BarcodeDetectionImpl implements BarcodeDetection { + barcodeArray[i].cornerPoints[j].y = corners[j].y; + } + } +- callback.call(barcodeArray); ++ callback.call(barcodeArray);*/ + } + + @Override +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java +@@ -6,8 +6,6 @@ package org.chromium.shape_detection; + + import android.graphics.Bitmap; + +-import com.google.android.gms.vision.Frame; +- + import org.chromium.mojo_base.BigBufferUtil; + import org.chromium.skia.mojom.ColorType; + +@@ -44,14 +42,4 @@ public class BitmapUtils { + + return bitmap; + } +- +- public static Frame convertToFrame(org.chromium.skia.mojom.Bitmap bitmapData) { +- Bitmap bitmap = convertToBitmap(bitmapData); +- if (bitmap == null) { +- return null; +- } +- +- // This constructor implies a pixel format conversion to YUV. +- return new Frame.Builder().setBitmap(bitmap).build(); +- } + } +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java +@@ -63,7 +63,7 @@ public class FaceDetectionImplGmsCore implements FaceDetection { + // The vision library will be downloaded the first time the API is used + // on the device; this happens "fast", but it might have not completed, + // bail in this case. +- if (!mFaceDetector.isOperational()) { ++// if (!mFaceDetector.isOperational()) { + Log.e(TAG, "FaceDetector is not operational"); + + // Fallback to Android's FaceDetectionImpl. +@@ -73,7 +73,7 @@ public class FaceDetectionImplGmsCore implements FaceDetection { + FaceDetectionImpl detector = new FaceDetectionImpl(options); + detector.detect(bitmapData, callback); + return; +- } ++/* } + + Frame frame = BitmapUtils.convertToFrame(bitmapData); + if (frame == null) { +@@ -157,7 +157,7 @@ public class FaceDetectionImplGmsCore implements FaceDetection { + faceArray[i].boundingBox.height = face.getHeight(); + } + } +- callback.call(faceArray); ++ callback.call(faceArray);*/ + } + + @Override +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java +@@ -30,7 +30,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider { + == ConnectionResult.SUCCESS; + + if (isGmsCoreSupported) { +- FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request); ++ //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request); + } else { + FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request); + } +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java +@@ -20,10 +20,10 @@ class InterfaceRegistrar { + // is not necessary to hold on to a reference to it explicitly. + InterfaceRegistry registry = InterfaceRegistry.create( + CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle()); +- registry.addInterface( +- BarcodeDetectionProvider.MANAGER, new BarcodeDetectionProviderImpl.Factory()); +- registry.addInterface( +- FaceDetectionProvider.MANAGER, new FaceDetectionProviderImpl.Factory()); +- registry.addInterface(TextDetection.MANAGER, new TextDetectionImpl.Factory()); ++// registry.addInterface( ++// BarcodeDetectionProvider.MANAGER, new BarcodeDetectionProviderImpl.Factory()); ++// registry.addInterface( ++// FaceDetectionProvider.MANAGER, new FaceDetectionProviderImpl.Factory()); ++// registry.addInterface(TextDetection.MANAGER, new TextDetectionImpl.Factory()); + } + } +diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java +--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java ++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java +@@ -42,11 +42,11 @@ public class TextDetectionImpl implements TextDetection { + // on the device; this happens "fast", but it might have not completed, + // bail in this case. Also, the API was disabled between and v.9.0 and + // v.9.2, see https://developers.google.com/android/guides/releases. +- if (!mTextRecognizer.isOperational()) { ++// if (!mTextRecognizer.isOperational()) { + Log.e(TAG, "TextDetector is not operational"); + callback.call(new TextDetectionResult[0]); + return; +- } ++/* } + + Frame frame = BitmapUtils.convertToFrame(bitmapData); + if (frame == null) { +@@ -76,7 +76,7 @@ public class TextDetectionImpl implements TextDetection { + detectedTextArray[i].cornerPoints[j].y = corners[j].y; + } + } +- callback.call(detectedTextArray); ++ callback.call(detectedTextArray); */ + } + + @Override +-- +2.7.4 + diff --git a/patches/BRM083_kill-GCM.patch b/patches/BRM082_kill-GCM.patch similarity index 95% rename from patches/BRM083_kill-GCM.patch rename to patches/BRM082_kill-GCM.patch index a8d8f28b..043b95ce 100644 --- a/patches/BRM083_kill-GCM.patch +++ b/patches/BRM082_kill-GCM.patch @@ -17,17 +17,17 @@ Subject: kill GCM .../BackgroundTaskSchedulerGcmNetworkManager.java | 30 ++++------- components/gcm_driver/android/BUILD.gn | 1 - components/gcm_driver/instance_id/android/BUILD.gn | 1 - - .../gcm_driver/instance_id/InstanceIDBridge.java | 29 ++-------- + .../gcm_driver/instance_id/InstanceIDBridge.java | 29 +++------- components/sync/android/BUILD.gn | 1 - third_party/cacheinvalidation/BUILD.gn | 6 --- .../client/contrib/MultiplexingGcmListener.java | 49 ++--------------- .../android2/channel/AndroidNetworkChannel.java | 18 +++---- - 19 files changed, 34 insertions(+), 252 deletions(-) + 19 files changed, 36 insertions(+), 250 deletions(-) diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn -@@ -43,8 +43,6 @@ if (enable_java_templates) { +@@ -64,8 +64,6 @@ if (enable_java_templates) { support_lib_alias("android_support_chromium_java") { testonly = true } @@ -54,7 +54,7 @@ diff --git a/build/secondary/third_party/android_tools/support/BUILD.gn b/build/ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -260,7 +260,6 @@ android_library("chrome_java") { +@@ -269,7 +269,6 @@ android_library("chrome_java") { "//third_party/android_swipe_refresh:android_swipe_refresh_java", "//third_party/android_tools:android_arch_lifecycle_common_java", "//third_party/android_tools:android_arch_lifecycle_runtime_java", @@ -65,7 +65,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -74,22 +74,17 @@ by a child template that "extends" this file. +@@ -77,22 +77,17 @@ by a child template that "extends" this file. @@ -88,7 +88,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -913,43 +908,6 @@ by a child template that "extends" this file. +@@ -919,43 +914,6 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" android:hardwareAccelerated="false" /> @@ -132,7 +132,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro -@@ -961,8 +919,6 @@ by a child template that "extends" this file. +@@ -967,8 +925,6 @@ by a child template that "extends" this file. @@ -141,7 +141,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro @@ -169,17 +169,17 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java --- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java -@@ -9,10 +9,6 @@ import android.content.SharedPreferences; - import android.os.AsyncTask; +@@ -8,10 +8,6 @@ import android.content.Context; + import android.content.SharedPreferences; import android.os.StrictMode; -import com.google.android.gms.gcm.GcmNetworkManager; -import com.google.android.gms.gcm.OneoffTask; -import com.google.android.gms.gcm.Task; - + import org.chromium.base.AsyncTask; import org.chromium.base.ContextUtils; import org.chromium.base.Log; - import org.chromium.base.VisibleForTesting; @@ -37,8 +33,6 @@ public class BackgroundSyncLauncher { // BackgroundSyncLauncherAndroid, if any. If it is non-null then the browser is running. private static BackgroundSyncLauncher sInstance; @@ -251,7 +251,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java --- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java -@@ -12,8 +12,6 @@ import android.os.Build; +@@ -11,8 +11,6 @@ import android.os.Build; import android.os.Handler; import android.os.SystemClock; @@ -259,7 +259,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/In - import org.chromium.base.ApplicationState; import org.chromium.base.ApplicationStatus; - import org.chromium.base.Log; + import org.chromium.base.AsyncTask; @@ -200,16 +198,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat * Registers for Google Cloud Messaging (GCM) for Invalidations. */ @@ -386,15 +386,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GC diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java --- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java -@@ -13,7 +13,6 @@ import android.os.Parcel; +@@ -12,7 +12,6 @@ import android.os.Parcel; import android.support.annotation.MainThread; import android.util.Log; -import com.google.android.gms.gcm.GoogleCloudMessaging; import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService; - import org.chromium.base.ThreadUtils; -@@ -92,6 +91,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { + import org.chromium.base.AsyncTask; +@@ -95,6 +94,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { * This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR. */ private void sendUpstreamMessage(String to, Bundle data, String token, Context context) { @@ -402,7 +402,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it. data.putString("Authorization", "Bearer " + token); if (!isMessageWithinLimit(data)) { -@@ -105,6 +105,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { +@@ -109,6 +109,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService { Log.w(TAG, "Send message failed"); GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED); } @@ -413,7 +413,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni --- a/chrome/android/java_sources.gni +++ b/chrome/android/java_sources.gni -@@ -25,7 +25,6 @@ chrome_java_sources = [ +@@ -27,7 +27,6 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/ChromeActivity.java", "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java", "java/src/org/chromium/chrome/browser/ChromeApplication.java", @@ -421,7 +421,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java", "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java", "java/src/org/chromium/chrome/browser/ChromeFeatureList.java", -@@ -1160,7 +1159,6 @@ chrome_java_sources = [ +@@ -1217,7 +1216,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", @@ -560,7 +560,7 @@ diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java --- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java +++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java -@@ -26,7 +26,6 @@ public class InstanceIDBridge { +@@ -25,7 +25,6 @@ public class InstanceIDBridge { * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be * initialized on a background thread. */ @@ -568,7 +568,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com private static boolean sBlockOnAsyncTasksForTesting; -@@ -71,7 +70,7 @@ public class InstanceIDBridge { +@@ -70,7 +69,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { @@ -577,7 +577,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(String id) { -@@ -86,7 +85,7 @@ public class InstanceIDBridge { +@@ -85,7 +84,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Long doBackgroundWork() { @@ -586,7 +586,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(Long creationTime) { -@@ -107,11 +106,7 @@ public class InstanceIDBridge { +@@ -106,11 +105,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected String doBackgroundWork() { @@ -599,7 +599,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(String token) { -@@ -127,12 +122,7 @@ public class InstanceIDBridge { +@@ -126,12 +121,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { @@ -613,7 +613,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(Boolean success) { -@@ -147,12 +137,7 @@ public class InstanceIDBridge { +@@ -146,12 +136,7 @@ public class InstanceIDBridge { new BridgeAsyncTask() { @Override protected Boolean doBackgroundWork() { @@ -627,17 +627,20 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com } @Override protected void sendResultToNative(Boolean success) { -@@ -192,10 +177,6 @@ public class InstanceIDBridge { +@@ -190,11 +175,11 @@ public class InstanceIDBridge { + @Override @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native. protected Result doInBackground(Void... params) { - synchronized (InstanceIDBridge.this) { -- if (mInstanceID == null) { -- mInstanceID = InstanceIDWithSubtype.getInstance( -- ContextUtils.getApplicationContext(), mSubtype); -- } - } +- synchronized (InstanceIDBridge.this) { ++/* synchronized (InstanceIDBridge.this) { + if (mInstanceID == null) { + mInstanceID = InstanceIDWithSubtype.getInstance(mSubtype); + } +- } ++ }*/ return doBackgroundWork(); } + @Override diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn --- a/components/sync/android/BUILD.gn +++ b/components/sync/android/BUILD.gn diff --git a/patches/BRM082_kill-Vision.patch b/patches/BRM082_kill-Vision.patch deleted file mode 100644 index 0959a9a4..00000000 --- a/patches/BRM082_kill-Vision.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: thermatk -Date: Fri, 22 Jun 2018 17:04:43 +0200 -Subject: kill Vision - ---- - services/shape_detection/BUILD.gn | 3 --- - .../java/src/org/chromium/shape_detection/BitmapUtils.java | 12 ------------ - .../chromium/shape_detection/FaceDetectionProviderImpl.java | 2 +- - .../src/org/chromium/shape_detection/InterfaceRegistrar.java | 2 -- - 4 files changed, 1 insertion(+), 18 deletions(-) - -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 -@@ -79,13 +79,10 @@ if (is_android) { - - android_library("shape_detection_java") { - java_files = [ -- "android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java", - "android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java", -- "android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java", - "android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java", - "android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java", - "android/java/src/org/chromium/shape_detection/BitmapUtils.java", -- "android/java/src/org/chromium/shape_detection/TextDetectionImpl.java", - ] - - deps = [ -diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java ---- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java -+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java -@@ -6,8 +6,6 @@ package org.chromium.shape_detection; - - import android.graphics.Bitmap; - --import com.google.android.gms.vision.Frame; -- - import org.chromium.mojo_base.BigBufferUtil; - import org.chromium.skia.mojom.ColorType; - -@@ -44,14 +42,4 @@ public class BitmapUtils { - - return bitmap; - } -- -- public static Frame convertToFrame(org.chromium.skia.mojom.Bitmap bitmapData) { -- Bitmap bitmap = convertToBitmap(bitmapData); -- if (bitmap == null) { -- return null; -- } -- -- // This constructor implies a pixel format conversion to YUV. -- return new Frame.Builder().setBitmap(bitmap).build(); -- } - } -diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java ---- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java -+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java -@@ -30,7 +30,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider { - == ConnectionResult.SUCCESS; - - if (isGmsCoreSupported) { -- FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request); -+ //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request); - } else { - FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request); - } -diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java ---- a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java -+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java -@@ -20,9 +20,7 @@ class InterfaceRegistrar { - // is not necessary to hold on to a reference to it explicitly. - InterfaceRegistry registry = InterfaceRegistry.create( - CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle()); -- registry.addInterface(BarcodeDetection.MANAGER, new BarcodeDetectionImpl.Factory()); - registry.addInterface( - FaceDetectionProvider.MANAGER, new FaceDetectionProviderImpl.Factory()); -- registry.addInterface(TextDetection.MANAGER, new TextDetectionImpl.Factory()); - } - } --- -2.7.4 - diff --git a/patches/BRM084_kill-Auth.patch b/patches/BRM083_kill-Auth.patch similarity index 92% rename from patches/BRM084_kill-Auth.patch rename to patches/BRM083_kill-Auth.patch index 8368b64b..dc7459a9 100644 --- a/patches/BRM084_kill-Auth.patch +++ b/patches/BRM083_kill-Auth.patch @@ -11,17 +11,17 @@ Subject: kill Auth diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java -@@ -9,10 +9,6 @@ import android.annotation.SuppressLint; +@@ -8,10 +8,6 @@ import android.accounts.Account; + import android.annotation.SuppressLint; import android.content.Context; - import android.os.AsyncTask; -import com.google.android.gms.auth.AccountChangeEvent; -import com.google.android.gms.auth.GoogleAuthException; -import com.google.android.gms.auth.GoogleAuthUtil; - + import org.chromium.base.AsyncTask; import org.chromium.base.ContextUtils; import org.chromium.base.Log; - import org.chromium.base.VisibleForTesting; @@ -71,6 +67,7 @@ public class SigninHelper { @Override public List getAccountChangeEvents( @@ -67,7 +67,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -23,9 +23,6 @@ import android.os.PatternMatcher; +@@ -24,9 +24,6 @@ import android.os.PatternMatcher; import android.os.Process; import android.os.SystemClock; @@ -77,7 +77,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -@@ -116,9 +113,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -117,9 +114,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { // so don't report any accounts if Google Play Services are out of date. checkCanUseGooglePlayServices(); @@ -90,7 +90,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon long now = SystemClock.elapsedRealtime(); Account[] accounts = mAccountManager.getAccountsByType(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE); long elapsed = SystemClock.elapsedRealtime() - now; -@@ -128,12 +125,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -129,12 +126,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { "Signin.AndroidGetAccountsTimeUiThread_AccountManager", elapsed); } return accounts; @@ -106,7 +106,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon try { return GoogleAuthUtil.getTokenWithNotification( ContextUtils.getApplicationContext(), account, authTokenScope, null); -@@ -145,10 +145,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -146,10 +146,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { } catch (IOException ex) { throw new AuthException(AuthException.TRANSIENT, ex); } @@ -119,7 +119,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon try { GoogleAuthUtil.clearToken(ContextUtils.getApplicationContext(), authToken); } catch (GooglePlayServicesAvailabilityException ex) { -@@ -158,6 +160,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -159,6 +161,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { } catch (IOException ex) { throw new AuthException(AuthException.TRANSIENT, ex); } diff --git a/patches/BRM085_kill-remaining-Play-Services-checks.patch b/patches/BRM084_kill-remaining-Play-Services-checks.patch similarity index 84% rename from patches/BRM085_kill-remaining-Play-Services-checks.patch rename to patches/BRM084_kill-remaining-Play-Services-checks.patch index 59a82f6d..6903eca2 100644 --- a/patches/BRM085_kill-remaining-Play-Services-checks.patch +++ b/patches/BRM084_kill-remaining-Play-Services-checks.patch @@ -3,16 +3,16 @@ Date: Fri, 22 Jun 2018 17:13:38 +0200 Subject: kill remaining Play Services checks --- - .../chromium/chrome/browser/ChromeVersionInfo.java | 10 +----- - .../browser/externalauth/ExternalAuthUtils.java | 41 ++-------------------- - .../externalauth/UserRecoverableErrorHandler.java | 10 ------ - .../chrome/browser/omaha/UpdateMenuItemHelper.java | 10 +----- - chrome/android/java_sources.gni | 3 -- - .../components/signin/AccountIdProvider.java | 10 +----- - .../signin/GmsAvailabilityException.java | 4 +-- - .../signin/SystemAccountManagerDelegate.java | 18 ++-------- - .../shape_detection/FaceDetectionProviderImpl.java | 8 +---- - 9 files changed, 11 insertions(+), 103 deletions(-) + .../chromium/chrome/browser/ChromeVersionInfo.java | 10 +------- + .../browser/externalauth/ExternalAuthUtils.java | 28 +++++++--------------- + .../externalauth/UserRecoverableErrorHandler.java | 10 -------- + .../chrome/browser/omaha/UpdateMenuItemHelper.java | 10 +------- + chrome/android/java_sources.gni | 3 --- + .../components/signin/AccountIdProvider.java | 10 +------- + .../signin/GmsAvailabilityException.java | 4 +--- + .../signin/SystemAccountManagerDelegate.java | 18 +++----------- + .../shape_detection/FaceDetectionProviderImpl.java | 8 +------ + 9 files changed, 16 insertions(+), 85 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java @@ -61,44 +61,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; -@@ -164,12 +161,7 @@ public class ExternalAuthUtils { +@@ -164,9 +161,10 @@ public class ExternalAuthUtils { * when it is updating. */ public boolean isGooglePlayServicesMissing(final Context context) { - final int resultCode = checkGooglePlayServicesAvailable(context); -- if (resultCode == ConnectionResult.SERVICE_MISSING -- || resultCode == ConnectionResult.SERVICE_INVALID) { - return true; -- } -- return false; ++/* final int resultCode = checkGooglePlayServicesAvailable(context); + return (resultCode == ConnectionResult.SERVICE_MISSING +- || resultCode == ConnectionResult.SERVICE_INVALID); ++ || resultCode == ConnectionResult.SERVICE_INVALID); */ ++ return true; } /** -@@ -184,23 +176,6 @@ public class ExternalAuthUtils { +@@ -181,7 +179,7 @@ public class ExternalAuthUtils { * @return true if and only if Google Play Services can be used */ public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) { - Context context = ContextUtils.getApplicationContext(); -- final int resultCode = checkGooglePlayServicesAvailable(context); -- recordConnectionResult(resultCode); -- if (resultCode == ConnectionResult.SUCCESS) { -- return true; -- } -- // resultCode is some kind of error. -- Log.v(TAG, "Unable to use Google Play Services: %s", describeError(resultCode)); -- if (isUserRecoverableError(resultCode)) { -- Runnable errorHandlerTask = new Runnable() { -- @Override -- public void run() { -- errorHandler.handleError(context, resultCode); -- } -- }; -- ThreadUtils.runOnUiThread(errorHandlerTask); ++/* Context context = ContextUtils.getApplicationContext(); + final int resultCode = checkGooglePlayServicesAvailable(context); + recordConnectionResult(resultCode); + if (resultCode == ConnectionResult.SUCCESS) return true; +@@ -195,7 +193,7 @@ public class ExternalAuthUtils { + } + }; + ThreadUtils.runOnUiThread(errorHandlerTask); - } ++ } */ return false; } -@@ -262,17 +237,7 @@ public class ExternalAuthUtils { +@@ -257,17 +255,7 @@ public class ExternalAuthUtils { * @return The code produced by calling the external code */ protected int checkGooglePlayServicesAvailable(final Context context) { @@ -117,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex } /** -@@ -283,7 +248,7 @@ public class ExternalAuthUtils { +@@ -278,7 +266,7 @@ public class ExternalAuthUtils { * @return true If the code represents a user-recoverable error */ protected boolean isUserRecoverableError(final int errorCode) { @@ -126,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex } /** -@@ -293,6 +258,6 @@ public class ExternalAuthUtils { +@@ -288,6 +276,6 @@ public class ExternalAuthUtils { * @return a textual description of the error code */ protected String describeError(final int errorCode) { @@ -137,24 +131,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Ex diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java --- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java -@@ -9,8 +9,6 @@ import android.app.Dialog; - import android.content.Context; +@@ -10,8 +10,6 @@ import android.content.Context; import android.content.DialogInterface; + import android.support.annotation.IntDef; -import com.google.android.gms.common.GoogleApiAvailability; - import org.chromium.base.ThreadUtils; import org.chromium.base.metrics.CachedMetrics.ActionEvent; import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample; -@@ -113,7 +111,6 @@ public abstract class UserRecoverableErrorHandler { - .record(ERROR_HANDLER_ACTION_IGNORED_AS_REDUNDANT); +@@ -120,7 +118,6 @@ public abstract class UserRecoverableErrorHandler { + sErrorHandlerActionHistogramSample.record(ErrorHandlerAction.IGNORED_AS_REDUNDANT); return; } - GoogleApiAvailability.getInstance().showErrorNotification(context, errorCode); - sErrorHandlerActionHistogramSample.record(ERROR_HANDLER_ACTION_SYSTEM_NOTIFICATION); + sErrorHandlerActionHistogramSample.record(ErrorHandlerAction.SYSTEM_NOTIFICATION); } } -@@ -206,13 +203,6 @@ public abstract class UserRecoverableErrorHandler { +@@ -213,13 +210,6 @@ public abstract class UserRecoverableErrorHandler { if (mErrorCode != errorCode) { cancelDialog(); } @@ -171,16 +165,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/Us diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java -@@ -22,8 +22,6 @@ import android.text.TextUtils; +@@ -21,8 +21,6 @@ import android.text.TextUtils; import android.view.View; import android.view.animation.LinearInterpolator; -import com.google.android.gms.common.GooglePlayServicesUtil; - + import org.chromium.base.AsyncTask; import org.chromium.base.CommandLine; import org.chromium.base.Log; - import org.chromium.base.ThreadUtils; -@@ -161,13 +159,7 @@ public class UpdateMenuItemHelper { +@@ -162,13 +160,7 @@ public class UpdateMenuItemHelper { } private static boolean isGooglePlayStoreAvailable(Context context) { @@ -198,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen 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 -@@ -541,10 +541,7 @@ chrome_java_sources = [ +@@ -586,10 +586,7 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java", "java/src/org/chromium/chrome/browser/fullscreen/FullscreenOptions.java", "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java", @@ -259,7 +253,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java -@@ -23,9 +23,6 @@ import android.os.PatternMatcher; +@@ -24,9 +24,6 @@ import android.os.PatternMatcher; import android.os.Process; import android.os.SystemClock; @@ -269,7 +263,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -@@ -82,17 +79,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -83,17 +80,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { } protected void checkCanUseGooglePlayServices() throws AccountManagerDelegateException { @@ -288,7 +282,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon } @Override -@@ -207,8 +194,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { +@@ -210,8 +197,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { callback.onResult(null); } }; @@ -298,7 +292,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon + */ } - @Override + // No permission is needed on 23+ and Chrome always has MANAGE_ACCOUNTS permission on lower APIs diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java --- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java +++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java diff --git a/patches/BRM086_kill-TOS-and-metrics-opt-out.patch b/patches/BRM085_kill-TOS-and-metrics-opt-out.patch similarity index 72% rename from patches/BRM086_kill-TOS-and-metrics-opt-out.patch rename to patches/BRM085_kill-TOS-and-metrics-opt-out.patch index 98d84ee9..a5e89c3a 100644 --- a/patches/BRM086_kill-TOS-and-metrics-opt-out.patch +++ b/patches/BRM085_kill-TOS-and-metrics-opt-out.patch @@ -4,13 +4,14 @@ Subject: kill TOS and metrics opt-out --- chrome/android/java/res/layout/fre_tosanduma.xml | 3 ++- + chrome/android/java/res/values/dimens.xml | 1 - .../src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml --- a/chrome/android/java/res/layout/fre_tosanduma.xml +++ b/chrome/android/java/res/layout/fre_tosanduma.xml -@@ -62,7 +62,8 @@ +@@ -63,7 +63,8 @@ android:layout_marginBottom="@dimen/fre_vertical_spacing" android:gravity="center" android:lineSpacingMultiplier="1.4" @@ -20,6 +21,17 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j 8dp + 24dp + 120dp +- 12dp + + +