Skip to content

Commit 39b9c33

Browse files
cmpickardscunnane@mozilla.com
cmpickard
authored and
scunnane@mozilla.com
committed
Bug 2058970 - Remove BROWSER_SEARCH_PREF constant. r=scunnane,search-reviewers,mconley
Differential Revision: https://phabricator.services.mozilla.com/D322413
1 parent b4d81f6 commit 39b9c33

27 files changed

Lines changed: 84 additions & 204 deletions

‎browser/components/backup/tests/xpcshell/test_PreferencesBackupResource_searchEngines.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ add_setup(async function () {
4242
{ identifier: "engine2" },
4343
]);
4444

45-
Services.prefs.setCharPref(SearchUtils.BROWSER_SEARCH_PREF + "region", "US");
45+
Services.prefs.setCharPref("browser.search.region", "US");
4646
Services.locale.availableLocales = ["en-US"];
4747
Services.locale.requestedLocales = ["en-US"];
4848

‎toolkit/components/search/ConfigSearchEngine.sys.mjs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,7 @@ const ParamPreferenceCache = {
309309
let branchFetcher = AppConstants.NIGHTLY_BUILD
310310
? "getBranch"
311311
: "getDefaultBranch";
312-
this.branch = Services.prefs[branchFetcher](
313-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "param."
314-
);
312+
this.branch = Services.prefs[branchFetcher]("browser.search.param.");
315313
this.cache = new Map();
316314
this.nimbusCache = new Map();
317315
for (let prefName of this.branch.getChildList("")) {

‎toolkit/components/search/SearchService.sys.mjs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,7 @@ export const SearchService = new (class SearchService {
217217
async setDefaultPrivate(engine, changeReason) {
218218
await this.init();
219219
if (!this.#lazyPrefs.separatePrivateDefaultPrefValue) {
220-
Services.prefs.setBoolPref(
221-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
222-
true
223-
);
220+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
224221
}
225222
this.#setEngineDefault(this.#separatePrivateDefault, engine, changeReason);
226223
}
@@ -1792,14 +1789,14 @@ export const SearchService = new (class SearchService {
17921789
let logIgnored = (name, url, type) => {
17931790
lazy.logConsole.warn("Search engine", name, `matches ${type}`, url);
17941791
Services.prefs.setCharPref(
1795-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "lastEngineIgnored",
1792+
"browser.search.lastEngineIgnored",
17961793
// Limit length of url to avoid storing too much in prefs.
17971794
`${Math.trunc(Date.now() / 1000)} Search engine matches ${type} ignore list ${url.substring(0, 200)}`
17981795
);
17991796
// Kept separate from lastEngineIgnored so the engine name isn't
18001797
// included if that preference is displayed, e.g. on about:support.
18011798
Services.prefs.setStringPref(
1802-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "lastEngineIgnored.name",
1799+
"browser.search.lastEngineIgnored.name",
18031800
name
18041801
);
18051802
};
@@ -4071,10 +4068,7 @@ export const SearchService = new (class SearchService {
40714068
#maybeStartOpenSearchUpdateTimer() {
40724069
if (
40734070
this.#openSearchUpdateTimerStarted ||
4074-
!Services.prefs.getBoolPref(
4075-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "update",
4076-
true
4077-
)
4071+
!Services.prefs.getBoolPref("browser.search.update", true)
40784072
) {
40794073
return;
40804074
}

‎toolkit/components/search/SearchSettings.sys.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export class SearchSettings {
229229
if (corrupt) {
230230
this.lastGetCorrupt = true;
231231
Services.prefs.setIntPref(
232-
lazy.SearchUtils.BROWSER_SEARCH_PREF + "lastSettingsCorruptTime",
232+
"browser.search.lastSettingsCorruptTime",
233233
Date.now() / 1000
234234
);
235235
try {
@@ -750,7 +750,7 @@ export class SearchSettings {
750750
this.#settings.version < 6 ||
751751
!("useSavedOrder" in this.#settings.metaData)
752752
) {
753-
const prefName = lazy.SearchUtils.BROWSER_SEARCH_PREF + "useDBForOrder";
753+
const prefName = "browser.search.useDBForOrder";
754754
let useSavedOrder = Services.prefs.getBoolPref(prefName, false);
755755

756756
this.setMetaDataAttribute("useSavedOrder", useSavedOrder);

‎toolkit/components/search/SearchUtils.sys.mjs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ const BinaryInputStream = Components.Constructor(
2626
"setInputStream"
2727
);
2828

29-
const BROWSER_SEARCH_PREF = "browser.search.";
30-
3129
/**
3230
* Load listener
3331
*
@@ -148,8 +146,6 @@ export class SearchEngineInstallError extends Error {
148146
}
149147

150148
export var SearchUtils = {
151-
BROWSER_SEARCH_PREF,
152-
153149
/**
154150
* This is the Remote Settings key that we use to get the ignore lists for
155151
* engines.
@@ -688,7 +684,7 @@ export var SearchUtils = {
688684
XPCOMUtils.defineLazyPreferenceGetter(
689685
SearchUtils,
690686
"loggingEnabled",
691-
BROWSER_SEARCH_PREF + "log",
687+
"browser.search.log",
692688
false
693689
);
694690

‎toolkit/components/search/tests/xpcshell/test_config_loading_uses_env.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@ add_setup(async function () {
3737
];
3838

3939
Services.prefs.setBoolPref(
40-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
41-
true
42-
);
43-
Services.prefs.setBoolPref(
44-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
40+
"browser.search.separatePrivateDefault.ui.enabled",
4541
true
4642
);
43+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
4744
Region._setHomeRegion("US", false);
4845
});
4946

‎toolkit/components/search/tests/xpcshell/test_defaultEngine.js‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,10 @@ add_task(async function test_telemetry_empty_submission_url() {
272272

273273
add_task(async function test_privateDefaultClearedOnSeparatePrivateDisabled() {
274274
Services.prefs.setBoolPref(
275-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
276-
true
277-
);
278-
Services.prefs.setBoolPref(
279-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
275+
"browser.search.separatePrivateDefault.ui.enabled",
280276
true
281277
);
278+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
282279

283280
await SearchService.setDefaultPrivate(
284281
engine1,
@@ -290,20 +287,14 @@ add_task(async function test_privateDefaultClearedOnSeparatePrivateDisabled() {
290287
"engine1 should be the private default before disabling separate private"
291288
);
292289

293-
Services.prefs.setBoolPref(
294-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
295-
false
296-
);
290+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", false);
297291
Assert.notEqual(
298292
await SearchService.getDefaultPrivate(),
299293
engine1,
300294
"engine1 should no longer be the private default after disabling separate private"
301295
);
302296

303-
Services.prefs.setBoolPref(
304-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
305-
true
306-
);
297+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
307298
// If the default private engine is ever changed to fall back to the user's
308299
// default engine instead of the app private default, this assertion may need
309300
// updating — but the notEqual to engine1 should remain correct.
@@ -314,11 +305,9 @@ add_task(async function test_privateDefaultClearedOnSeparatePrivateDisabled() {
314305
);
315306

316307
Services.prefs.clearUserPref(
317-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled"
318-
);
319-
Services.prefs.clearUserPref(
320-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault"
308+
"browser.search.separatePrivateDefault.ui.enabled"
321309
);
310+
Services.prefs.clearUserPref("browser.search.separatePrivateDefault");
322311
});
323312

324313
add_task(async function test_switch_with_invalid_overriddenBy() {

‎toolkit/components/search/tests/xpcshell/test_defaultEngine_experiments.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,10 @@ let defaultGetVariable = name => {
6969

7070
add_setup(async () => {
7171
Services.prefs.setBoolPref(
72-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
73-
true
74-
);
75-
Services.prefs.setBoolPref(
76-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
72+
"browser.search.separatePrivateDefault.ui.enabled",
7773
true
7874
);
75+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
7976

8077
sinon.spy(NimbusFeatures.searchConfiguration, "onUpdate");
8178
sinon.stub(NimbusFeatures.searchConfiguration, "ready").resolves();
@@ -414,10 +411,7 @@ add_task(async function test_experiment_setting_user_changed_to_other_during() {
414411
});
415412

416413
add_task(async function test_experiment_setting_user_hid_app_default_during() {
417-
Services.prefs.setBoolPref(
418-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
419-
false
420-
);
414+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", false);
421415
await SearchService.setDefault(
422416
SearchService.getEngineByName("engine1"),
423417
SearchService.CHANGE_REASON.UNKNOWN

‎toolkit/components/search/tests/xpcshell/test_defaultEngine_fallback.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,12 @@ add_setup(async function () {
3232
useHttpServer();
3333
SearchTestUtils.setRemoteSettingsConfig(CONFIG);
3434

35-
Services.prefs.setCharPref(SearchUtils.BROWSER_SEARCH_PREF + "region", "US");
35+
Services.prefs.setCharPref("browser.search.region", "US");
3636
Services.prefs.setBoolPref(
37-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault.ui.enabled",
38-
true
39-
);
40-
Services.prefs.setBoolPref(
41-
SearchUtils.BROWSER_SEARCH_PREF + "separatePrivateDefault",
37+
"browser.search.separatePrivateDefault.ui.enabled",
4238
true
4339
);
40+
Services.prefs.setBoolPref("browser.search.separatePrivateDefault", true);
4441

4542
appDefault = await SearchService.getDefault();
4643
appPrivateDefault = await SearchService.getDefaultPrivate();

0 commit comments

Comments
 (0)