Skip to content

Commit 63439ed

Browse files
committed
Bug 1864079 - Update browser.vpn_promo.disallowed_regions pref and regions list in BrowserUtils regarding Ukraine(ua) r=omc-reviewers,dmose
Differential Revision: https://phabricator.services.mozilla.com/D194715
1 parent 19759c6 commit 63439ed

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

browser/app/profile/firefox.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,8 +2065,7 @@ pref("browser.contentblocking.report.show_mobile_app", true);
20652065
pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,fr,id,pl,pt-BR,ru,zh-TW");
20662066

20672067
// Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes.
2068-
// We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.sys.mjs only exposes the country, not the subdivision.
2069-
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
2068+
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr");
20702069

20712070
// Default to enabling VPN promo messages to be shown when specified and allowed
20722071
pref("browser.vpn_promo.enabled", true);

browser/components/protections/test/browser/browser_protections_telemetry.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ add_setup(async function () {
5050
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb"],
5151
[
5252
"browser.vpn_promo.disallowed_regions",
53-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
53+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
5454
],
5555

5656
// Change the endpoints to prevent non-local network connections when landing on the page.
@@ -897,7 +897,7 @@ add_task(async function checkTelemetryClickEventsVPN() {
897897
["browser.vpn_promo.enabled", true],
898898
[
899899
"browser.vpn_promo.disallowed_regions",
900-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
900+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
901901
],
902902
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb"],
903903
["browser.contentblocking.database.enabled", false],
@@ -1029,7 +1029,7 @@ add_task(async function checkTelemetryEventsVPNBanner() {
10291029
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb"],
10301030
[
10311031
"browser.vpn_promo.disallowed_regions",
1032-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
1032+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
10331033
],
10341034
["browser.contentblocking.database.enabled", false],
10351035
["browser.contentblocking.report.monitor.enabled", false],

browser/components/protections/test/browser/browser_protections_vpn.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ add_task(async function testVPNCardVisibility() {
100100
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb"],
101101
[
102102
"browser.vpn_promo.disallowed_regions",
103-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
103+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
104104
],
105105
],
106106
});
@@ -158,7 +158,7 @@ add_task(async function testVPNPromoBanner() {
158158
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb"],
159159
[
160160
"browser.vpn_promo.disallowed_regions",
161-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
161+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
162162
],
163163
["browser.contentblocking.report.hide_vpn_banner", false],
164164
],
@@ -248,7 +248,7 @@ add_task(async function testVPNDoesNotShowChina() {
248248
["browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb,cn"],
249249
[
250250
"browser.vpn_promo.disallowed_regions",
251-
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
251+
"ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
252252
],
253253
["browser.contentblocking.report.hide_vpn_banner", false],
254254
],

toolkit/modules/BrowserUtils.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ let PromoInfo = {
508508
},
509509
disallowedRegions: {
510510
name: "browser.vpn_promo.disallowed_regions",
511-
default: "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua",
511+
default: "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr",
512512
},
513513
},
514514
//See https://github.com/search?q=repo%3Amozilla%2Fbedrock+VPN_EXCLUDED_COUNTRY_CODES&type=code

0 commit comments

Comments
 (0)