Skip to content

Commit

Permalink
Bug 1330464 - script-generated removal of additional parameters that …
Browse files Browse the repository at this point in the history
…don't exist in the interface, r=jaws.
  • Loading branch information
fqueze committed Jan 13, 2017
1 parent a21bd13 commit bf52b3b
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const ROOT = getRootDirectory(gTestPath).replace("chrome://mochitests/content/",
let pageWithAlert = ROOT + "openPromptOffTimeout.html";

registerCleanupFunction(function() {
Services.perms.removeAll(makeURI(pageWithAlert));
Services.perms.removeAll();
});

/*
Expand Down
4 changes: 2 additions & 2 deletions browser/components/newtab/aboutNewTabService.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ AboutNewTabService.prototype = {
.replace("%VERSION%", this.remoteVersion)
.replace("%LOCALE%", Locale.getLocale())
.replace("%CHANNEL%", releaseName);
let mode = Services.prefs.getCharPref(PREF_REMOTE_MODE, "production");
let mode = Services.prefs.getCharPref(PREF_REMOTE_MODE);
if (!(mode in NewTabRemoteResources.MODE_CHANNEL_MAP)) {
mode = "production";
}
Expand Down Expand Up @@ -229,7 +229,7 @@ AboutNewTabService.prototype = {
},

get remoteVersion() {
return Services.prefs.getCharPref(PREF_REMOTE_VERSION, "1");
return Services.prefs.getCharPref(PREF_REMOTE_VERSION);
},

get remoteReleaseName() {
Expand Down
2 changes: 1 addition & 1 deletion browser/modules/test/browser_UsageTelemetry_urlbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ add_task(function* setup() {
Services.telemetry.canRecordExtended = oldCanRecord;
Services.search.currentEngine = originalEngine;
Services.search.removeEngine(engine);
Services.prefs.clearUserPref(SUGGEST_URLBAR_PREF, true);
Services.prefs.clearUserPref(SUGGEST_URLBAR_PREF);
Services.prefs.clearUserPref(ONEOFF_URLBAR_PREF);
yield PlacesTestUtils.clearHistory();
Services.telemetry.setEventRecordingEnabled("navigation", false);
Expand Down
4 changes: 2 additions & 2 deletions devtools/client/webconsole/net/test/mochitest/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Services.prefs.setBoolPref(NET_INFO_PREF, true);
Services.prefs.setBoolPref(NET_XHR_PREF, true);

registerCleanupFunction(() => {
Services.prefs.clearUserPref(NET_INFO_PREF, true);
Services.prefs.clearUserPref(NET_XHR_PREF, true);
Services.prefs.clearUserPref(NET_INFO_PREF);
Services.prefs.clearUserPref(NET_XHR_PREF);
});

// Use the old webconsole since the new one doesn't yet support
Expand Down
2 changes: 1 addition & 1 deletion services/sync/tests/unit/test_fxa_startOver.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function run_test() {
}

add_task(async function test_startover() {
let oldValue = Services.prefs.getBoolPref("services.sync-testing.startOverKeepIdentity", true);
let oldValue = Services.prefs.getBoolPref("services.sync-testing.startOverKeepIdentity");
Services.prefs.setBoolPref("services.sync-testing.startOverKeepIdentity", false);

ensureLegacyIdentityManager();
Expand Down
2 changes: 1 addition & 1 deletion testing/specialpowers/content/SpecialPowersObserverAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ SpecialPowersObserverAPI.prototype = {
let hasPerm = Services.perms.testPermissionFromPrincipal(principal, msg.type);
return hasPerm == Ci.nsIPermissionManager.ALLOW_ACTION;
case "test":
let testPerm = Services.perms.testPermissionFromPrincipal(principal, msg.type, msg.value);
let testPerm = Services.perms.testPermissionFromPrincipal(principal, msg.type);
return testPerm == msg.value;
default:
throw new SpecialPowersError(
Expand Down
2 changes: 1 addition & 1 deletion toolkit/components/osfile/tests/xpcshell/test_shutdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ add_task(function system_shutdown() {
Services.prefs.clearUserPref("toolkit.osfile.log");
Services.prefs.clearUserPref("toolkit.osfile.log.redirect");
Services.prefs.clearUserPref("toolkit.osfile.test.shutdown.observer");
Services.prefs.clearUserPref("toolkit.async_shutdown.testing", true);
Services.prefs.clearUserPref("toolkit.async_shutdown.testing");

throw new Task.Result(resolved);
});
Expand Down
4 changes: 2 additions & 2 deletions toolkit/content/browser-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ var Printing = {
},

get shouldSavePrintSettings() {
return Services.prefs.getBoolPref("print.use_global_printsettings", false) &&
Services.prefs.getBoolPref("print.save_print_settings", false);
return Services.prefs.getBoolPref("print.use_global_printsettings") &&
Services.prefs.getBoolPref("print.save_print_settings");
},

handleEvent(event) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function load_blocklist(aFile, aCallback) {
// if we're not using the blocklist.xml for certificate blocklist state,
// ensure that kinto update is enabled
if (!Services.prefs.getBoolPref("security.onecrl.via.amo")) {
ok(Services.prefs.getBoolPref("services.blocklist.update_enabled", false),
ok(Services.prefs.getBoolPref("services.blocklist.update_enabled"),
"Kinto update should be enabled");
}
blocklist.notify(null);
Expand Down
2 changes: 1 addition & 1 deletion toolkit/mozapps/extensions/test/xpcshell/test_startup.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ function run_test_8() {

// More hiding and revealing
function run_test_9() {
Services.prefs.clearUserPref("extensions.enabledScopes", 0);
Services.prefs.clearUserPref("extensions.enabledScopes");

var dest = userDir.clone();
dest.append(do_get_expected_addon_name("addon1@tests.mozilla.org"));
Expand Down

0 comments on commit bf52b3b

Please sign in to comment.