[tor-commits] [tor-browser/esr24] Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper.

[mikeperry@xxxxxxxxxxxxxx]

commit 89c62704f293dc6ec816b936c634046c2c11bc5f
Author: Gervase Markham <gerv@xxxxxxxx>
Date:   Thu Jul 3 17:25:58 2014 +0100

    Bug 1033340 - remove use of API not present on ESR 24. a=morebustage, bag=brownpaper.
---
 netwerk/test/unit/test_psl.js |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/netwerk/test/unit/test_psl.js b/netwerk/test/unit/test_psl.js
index 251ffa6..91124ea 100644
--- a/netwerk/test/unit/test_psl.js
+++ b/netwerk/test/unit/test_psl.js
@@ -4,8 +4,6 @@ var etld = Cc["@mozilla.org/network/effective-tld-service;1"]
 var idna = Cc["@mozilla.org/network/idn-service;1"]
            .getService(Ci.nsIIDNService);
 
-var Cr = Components.results;
-
 function run_test()
 {
   var file = do_get_file("data/test_psl.txt");
@@ -23,8 +21,8 @@ function checkPublicSuffix(host, expectedSuffix)
   var actualSuffix = null;
   try {
     actualSuffix = etld.getBaseDomainFromHost(host);
-  } catch (e if e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS ||
-                e.result == Cr.NS_ERROR_ILLEGAL_VALUE) {
+  } catch (e if e.name == "NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS" ||
+                e.name == "NS_ERROR_ILLEGAL_VALUE") {
   }
   // The EffectiveTLDService always gives back punycoded labels.
   // The test suite wants to get back what it put in.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits