зеркало из https://github.com/mozilla/gecko-dev.git
Bug 783738 - Use Components.results.NS_BINDING_ABORTED instead of hardcoding the value, r=gavin
This commit is contained in:
Родитель
8999cd9d44
Коммит
decb1792cf
|
@ -285,7 +285,7 @@ FeedConverter.prototype = {
|
|||
// getResponseHeader.
|
||||
if (!httpChannel.requestSucceeded) {
|
||||
// Just give up, but don't forget to cancel the channel first!
|
||||
request.cancel(0x804b0002); // NS_BINDING_ABORTED
|
||||
request.cancel(Cr.NS_BINDING_ABORTED);
|
||||
return;
|
||||
}
|
||||
var noSniff = httpChannel.getResponseHeader("X-Moz-Is-Feed");
|
||||
|
|
|
@ -12,8 +12,6 @@ const sinkContract = "@mozilla.org/network/unittest/channeleventsink;1";
|
|||
|
||||
const categoryName = "net-channel-event-sinks";
|
||||
|
||||
const NS_BINDING_ABORTED = 0x804b0002;
|
||||
|
||||
/**
|
||||
* This object is both a factory and an nsIChannelEventSink implementation (so, it
|
||||
* is de-facto a service). It's also an interface requestor that gives out
|
||||
|
@ -39,7 +37,7 @@ var eventsink = {
|
|||
asyncOnChannelRedirect: function eventsink_onredir(oldChan, newChan, flags, callback) {
|
||||
// veto
|
||||
this.called = true;
|
||||
throw NS_BINDING_ABORTED;
|
||||
throw Components.results.NS_BINDING_ABORTED;
|
||||
},
|
||||
|
||||
getInterface: function eventsink_gi(iid) {
|
||||
|
|
|
@ -8,8 +8,6 @@ const Cr = Components.results;
|
|||
|
||||
Cu.import("resource://testing-common/httpd.js");
|
||||
|
||||
const NS_BINDING_ABORTED = 0x804b0002;
|
||||
|
||||
var observer = {
|
||||
QueryInterface: function eventsink_qi(iid) {
|
||||
if (iid.equals(Components.interfaces.nsISupports) ||
|
||||
|
@ -20,7 +18,7 @@ var observer = {
|
|||
|
||||
observe: function(subject, topic, data) {
|
||||
subject = subject.QueryInterface(Components.interfaces.nsIRequest);
|
||||
subject.cancel(NS_BINDING_ABORTED);
|
||||
subject.cancel(Components.results.NS_BINDING_ABORTED);
|
||||
|
||||
var obs = Components.classes["@mozilla.org/observer-service;1"].getService();
|
||||
obs = obs.QueryInterface(Components.interfaces.nsIObserverService);
|
||||
|
@ -30,7 +28,7 @@ var observer = {
|
|||
|
||||
var listener = {
|
||||
onStartRequest: function test_onStartR(request, ctx) {
|
||||
do_check_eq(request.status, NS_BINDING_ABORTED);
|
||||
do_check_eq(request.status, Components.results.NS_BINDING_ABORTED);
|
||||
},
|
||||
|
||||
onDataAvailable: function test_ODA() {
|
||||
|
|
|
@ -162,8 +162,7 @@ nsUnknownContentTypeDialog.prototype = {
|
|||
} catch (ex) {
|
||||
// The containing window may have gone away. Break reference
|
||||
// cycles and stop doing the download.
|
||||
const NS_BINDING_ABORTED = 0x804b0002;
|
||||
this.mLauncher.cancel(NS_BINDING_ABORTED);
|
||||
this.mLauncher.cancel(Components.results.NS_BINDING_ABORTED);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -916,8 +915,7 @@ nsUnknownContentTypeDialog.prototype = {
|
|||
|
||||
// Cancel app launcher.
|
||||
try {
|
||||
const NS_BINDING_ABORTED = 0x804b0002;
|
||||
this.mLauncher.cancel(NS_BINDING_ABORTED);
|
||||
this.mLauncher.cancel(Components.results.NS_BINDING_ABORTED);
|
||||
} catch(exception) {
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче