Skip to content

Commit 97b4985

Browse files
committed
Bug 1874177: enable macOS attribution reporting by default r=nalexander
Differential Revision: https://phabricator.services.mozilla.com/D198294
1 parent 2a8f474 commit 97b4985

File tree

7 files changed

+0
-21
lines changed

7 files changed

+0
-21
lines changed

browser/app/profile/firefox.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2938,11 +2938,6 @@ pref("ui.new-webcompat-reporter.reason-dropdown", 0);
29382938
// performing the clear action.
29392939
pref("browser.privatebrowsing.resetPBM.showConfirmationDialog", true);
29402940

2941-
// bug 1858545: Temporary pref to enable a staged rollout of macOS attribution Telemetry
2942-
#ifdef XP_MACOSX
2943-
pref("browser.attribution.macos.enabled", false);
2944-
#endif
2945-
29462941
// the preferences related to the Nimbus experiment, to activate and deactivate
29472942
// the the entire rollout or deactivate only the OS prompt (see: bug 1864216)
29482943
pref("browser.mailto.dualPrompt", false);

browser/components/aboutwelcome/tests/browser/browser.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ support-files = [
55

66
prefs = [
77
"intl.multilingual.aboutWelcome.languageMismatchEnabled=false",
8-
"browser.attribution.macos.enabled=true",
98
]
109

1110
["browser_aboutwelcome_attribution.js"]

browser/components/attribution/AttributionCode.sys.mjs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -259,17 +259,6 @@ export var AttributionCode = {
259259
return gCachedAttrData;
260260
}
261261

262-
// This is a temporary block until we're ready to enable macOS reporting by default.
263-
if (
264-
AppConstants.platform == "macosx" &&
265-
!Services.prefs.getBoolPref("browser.attribution.macos.enabled")
266-
) {
267-
lazy.log.debug(
268-
"getAttrDataSync: macOS attribution disabled by pref; skipping"
269-
);
270-
return {};
271-
}
272-
273262
gCachedAttrData = {};
274263

275264
if (AppConstants.platform == "macosx") {

browser/components/attribution/test/browser/browser.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[DEFAULT]
22
support-files = ["head.js"]
3-
prefs = ["browser.attribution.macos.enabled=true"]
43

54
["browser_AttributionCode_Mac_telemetry.js"]
65
skip-if = ["toolkit != 'cocoa'"] # macOS only telemetry.

browser/components/attribution/test/xpcshell/xpcshell.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ run-if = [
55
"os == 'mac'",
66
]
77
head = "head.js"
8-
prefs = ["browser.attribution.macos.enabled=true"]
98

109
["test_AttributionCode.js"]
1110

browser/components/newtab/test/xpcshell/xpcshell.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ skip-if = ["toolkit == 'android'"] # bug 1730213
55
prefs = [
66
"browser.startup.homepage.abouthome_cache.enabled=true",
77
"browser.startup.homepage.abouthome_cache.testing=true",
8-
"browser.attribution.macos.enabled=true",
98
]
109

1110
["test_ASRouterTargeting_attribution.js"]

toolkit/components/telemetry/tests/unit/xpcshell.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ generated-files = [
2121
"system.xpi",
2222
"restartless.xpi",
2323
]
24-
prefs = ["browser.attribution.macos.enabled=true"]
2524

2625
["test_ChildEvents.js"]
2726
skip-if = ["os == 'android'"] # Disabled due to crashes (see bug 1331366)

0 commit comments

Comments
 (0)