Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 718255 - Merge nsIPrefBranch2 with nsIPrefBranch - Part F, remove uses of nsIPrefBranch2 in testing/ and layout/tools/reftest/ ; r=bsmedberg

Browse Source
This commit is contained in:
Geoff Lankow 2012-01-17 15:01:25 +13:00
parent ffee27c39f
commit 38a6e24cbf
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/tools/reftest/reftest.js
View File

@ -244,7 +244,7 @@ function OnRefTestLoad(win)
gVerbose = !!env.get("MOZ_REFTEST_VERBOSE");
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
try {
gBrowserIsRemote = prefs.getBoolPref("browser.tabs.remote");
} catch (e) {
@ -288,7 +288,7 @@ function InitAndStartRefTests()
/* These prefs are optional, so we don't need to spit an error to the log */
try {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
} catch(e) {
gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | | EXCEPTION: " + e + "\n");
}
@ -401,7 +401,7 @@ function StartTests()
/* These prefs are optional, so we don't need to spit an error to the log */
try {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
} catch(e) {
gDumpLog("REFTEST TEST-UNEXPECTED-FAIL | | EXCEPTION: " + e + "\n");
}
@ -563,7 +563,7 @@ function BuildConditionSandbox(aURL) {
gContainingWindow.document.documentElement.removeChild(box);
var prefs = CC["@mozilla.org/preferences-service;1"].
getService(CI.nsIPrefBranch2);
getService(CI.nsIPrefBranch);
try {
sandbox.nativeThemePref = !prefs.getBoolPref("mozilla.widget.disable-native-theme");
} catch (e) {
@ -1036,7 +1036,7 @@ function StartCurrentTest()
gURLs.shift();
} else if (gURLs[0].prefSettings.length > 0) {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
var badPref = undefined;
try {
gURLs[0].prefSettings.forEach(function(ps) {
@ -1612,7 +1612,7 @@ function RestoreChangedPreferences()
{
if (gPrefsToRestore.length > 0) {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
gPrefsToRestore.forEach(function(ps) {
var value = ps.value;
if (ps.type == PREF_BOOLEAN) {

2
testing/mochitest/tests/SimpleTest/SpecialPowersObserverAPI.js
View File

@ -135,7 +135,7 @@ SpecialPowersObserverAPI.prototype = {
switch(aMessage.name) {
case "SPPrefService":
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch2);
getService(Components.interfaces.nsIPrefBranch);
var prefType = aMessage.json.prefType.toUpperCase();
var prefName = aMessage.json.prefName;
var prefValue = "prefValue" in aMessage.json ? aMessage.json.prefValue : null;

4
testing/mochitest/tests/SimpleTest/specialpowersAPI.js
View File

@ -121,7 +121,7 @@ Observer.prototype = {
cleanup: function() {
if (this._isPref) {
var os = Cc["@mozilla.org/preferences-service;1"].getService()
.QueryInterface(Ci.nsIPrefBranch2);
.QueryInterface(Ci.nsIPrefBranch);
os.removeObserver(this._topic, this);
} else {
var os = Cc["@mozilla.org/observer-service;1"]
@ -625,7 +625,7 @@ SpecialPowersAPI.prototype = {
if (aIsPref) {
var os = Cc["@mozilla.org/preferences-service;1"].getService()
.QueryInterface(Ci.nsIPrefBranch2);
.QueryInterface(Ci.nsIPrefBranch);
os.addObserver(aTopic, observer, false);
} else {
var os = Cc["@mozilla.org/observer-service;1"]