Bug 790732 - Fix two more toolkit tests. r=me

Not sure why these didn't appear on earlier try runs, but they're trivial.
This commit is contained in:
Bobby Holley 2013-03-27 18:27:25 -07:00
parent 4a5afc7389
commit 3529fbf9a4
2 changed files with 6 additions and 8 deletions

View File

@ -138,7 +138,7 @@ var resolveCallback = {
const interfaces = [Ci.nsIProtocolProxyCallback, Ci.nsISupports];
if (!interfaces.some( function(v) { return iid.equals(v) } ))
throw Components.results.NS_ERROR_NO_INTERFACE;
throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
return this;
},
@ -160,12 +160,10 @@ var resolveCallback = {
function startup() {
//need to allow for arbitrary network servers defined in PAC instead of a hardcoded moz-proxy.
var ios = SpecialPowers.wrap(Components).
classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService);
var ios = SpecialPowers.Cc["@mozilla.org/network/io-service;1"].
getService(SpecialPowers.Ci.nsIIOService);
var pps = SpecialPowers.wrap(Components).
classes["@mozilla.org/network/protocol-proxy-service;1"].getService();
var pps = SpecialPowers.Cc["@mozilla.org/network/protocol-proxy-service;1"].getService();
var uri = ios.newURI("http://example.com", null, null);
pps.asyncResolve(uri, 0, resolveCallback);
@ -183,7 +181,7 @@ var storageObserver = {
Ci.nsISupports, Ci.nsISupportsWeakReference];
if (!interfaces.some( function(v) { return iid.equals(v) } ))
throw SpecialPowers.Components.results.NS_ERROR_NO_INTERFACE;
throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
return this;
},

View File

@ -122,7 +122,7 @@ const shiftModifier = Event.SHIFT_MASK;
// Get the form history service
var fh = SpecialPowers.Cc["@mozilla.org/satchel/form-history;1"].
getService(Components.interfaces.nsIFormHistory2);
getService(SpecialPowers.Ci.nsIFormHistory2);
ok(fh != null, "got form history service");
fh.removeAllEntries();