From a0c3300d49858c8b4c44721da329a5a775a30730 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Tue, 9 Sep 2008 21:33:27 -0700
Subject: [PATCH] Bug 454360 - Use Components.results.NS_BINDING_ABORTED
 instead of hardcoding the value, r=gavin

---
 browser/base/content/browser.js                    | 6 ++----
 browser/components/nsBrowserContentHandler.js      | 2 +-
 toolkit/components/places/src/nsLivemarkService.js | 5 ++---
 toolkit/mozapps/update/content/updates.js          | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index d42f39d26901..0b57db8ce373 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3901,13 +3901,11 @@ var XULBrowserWindow = {
             gBrowser.userTypedValue = null;
 
           if (location.spec != "about:blank") {
-            const kErrorBindingAborted = 0x804B0002;
-            const kErrorNetTimeout = 0x804B000E;
             switch (aStatus) {
-              case kErrorBindingAborted:
+              case Components.results.NS_BINDING_ABORTED:
                 msg = gNavigatorBundle.getString("nv_stopped");
                 break;
-              case kErrorNetTimeout:
+              case Components.results.NS_ERROR_NET_TIMEOUT:
                 msg = gNavigatorBundle.getString("nv_timeout");
                 break;
             }
diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js
index 0dad6930734f..27c60cc3ebd2 100644
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -64,7 +64,7 @@ const nsIWebNavigationInfo   = Components.interfaces.nsIWebNavigationInfo;
 const nsIBrowserSearchService = Components.interfaces.nsIBrowserSearchService;
 const nsICommandLineValidator = Components.interfaces.nsICommandLineValidator;
 
-const NS_BINDING_ABORTED = 0x804b0002;
+const NS_BINDING_ABORTED = Components.results.NS_BINDING_ABORTED;
 const NS_ERROR_WONT_HANDLE_CONTENT = 0x805d0001;
 const NS_ERROR_ABORT = Components.results.NS_ERROR_ABORT;
 
diff --git a/toolkit/components/places/src/nsLivemarkService.js b/toolkit/components/places/src/nsLivemarkService.js
index 05f975ec0f18..3191adddc5cf 100644
--- a/toolkit/components/places/src/nsLivemarkService.js
+++ b/toolkit/components/places/src/nsLivemarkService.js
@@ -80,7 +80,6 @@ const FP_CONTRACTID = "@mozilla.org/feed-processor;1";
 const SEC_CONTRACTID = "@mozilla.org/scriptsecuritymanager;1";
 const IS_CONTRACTID = "@mozilla.org/widget/idleservice;1";
 const SEC_FLAGS = Ci.nsIScriptSecurityManager.DISALLOW_INHERIT_PRINCIPAL;
-const NS_BINDING_ABORTED = 0x804b0002;
 
 // Expire livemarks after 1 hour by default
 var gExpiration = 3600000;
@@ -217,7 +216,7 @@ LivemarkService.prototype = {
 
     for (var livemark in this._livemarks) {
       if (livemark.loadGroup)
-        livemark.loadGroup.cancel(NS_BINDING_ABORTED);
+        livemark.loadGroup.cancel(Components.results.NS_BINDING_ABORTED);
     }
 
     // kill timer
@@ -469,7 +468,7 @@ LivemarkService.prototype = {
     this._livemarks.splice(livemarkIndex, 1);
 
     if (livemark.loadGroup)
-      livemark.loadGroup.cancel(NS_BINDING_ABORTED);
+      livemark.loadGroup.cancel(Components.results.NS_BINDING_ABORTED);
   },
 
   createInstance: function LS_createInstance(aOuter, aIID) {
diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
index f5b466c16ed6..f4fea8221aa4 100755
--- a/toolkit/mozapps/update/content/updates.js
+++ b/toolkit/mozapps/update/content/updates.js
@@ -1448,7 +1448,6 @@ var gDownloadingPage = {
       this._downloadProgress.mode = "normal";
 
     var u = gUpdates.update;
-    const NS_BINDING_ABORTED = 0x804b0002;
     switch (status) {
     case Components.results.NS_ERROR_UNEXPECTED:
       if (u.selectedPatch.state == STATE_DOWNLOAD_FAILED &&
@@ -1473,7 +1472,7 @@ var gDownloadingPage = {
         return;
       }
       break;
-    case NS_BINDING_ABORTED:
+    case Components.results.NS_BINDING_ABORTED:
       LOG("UI:DownloadingPage", "onStopRequest: Pausing Download");
       // Return early, do not remove UI listener since the user may resume
       // downloading again.