Adding https-everywhere.js changes from master

diracdeltas · diracdeltas · commit 3758243827b9 · 2013-08-16T15:38:31.000-07:00
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -56,13 +56,11 @@ const INCLUDE = function(name) {
     for (var j = 0, len = arguments.length; j < len; j++)
       INCLUDE(arguments[j]);
   else if (!_INCLUDED[name]) {
-    try {
-      LOADER.loadSubScript("chrome://https-everywhere/content/code/"
-              + name + ".js");
-      _INCLUDED[name] = true;
-    } catch(e) {
-      dump("INCLUDE " + name + ": " + e + "\n");
-    }
+    // we used to try/catch here, but that was less useful because it didn't
+    // produce line numbers for syntax errors
+    LOADER.loadSubScript("chrome://https-everywhere/content/code/"
+            + name + ".js");
+    _INCLUDED[name] = true;
   }
 }
 
@@ -382,11 +380,11 @@ HTTPSEverywhere.prototype = {
     try {
       var domWin = nc.getInterface(CI.nsIDOMWindow);
     } catch(e) {
-      this.log(INFO, "exploded getting DOMWin for " + channel.URI.spec);
+      this.log(INFO, "No window associated with request: " + channel.URI.spec);
       return null;
     }
     if (!domWin) {
-      this.log(WARN, "failed to get DOMWin for " + channel.URI.spec);
+      this.log(NOTE, "failed to get DOMWin for " + channel.URI.spec);
       return null;
     }
     domWin = domWin.top;
@@ -454,7 +452,6 @@ HTTPSEverywhere.prototype = {
          HTTPS.handleSecureCookies(channel);
     } else if (topic == "cookie-changed") {
       // Javascript can add cookies via document.cookie that are insecure.
-      // It might also be able to 
       if (data == "added" || data == "changed") {
         // subject can also be an nsIArray! bleh.
         try {
@@ -520,7 +517,6 @@ HTTPSEverywhere.prototype = {
     var shown = ssl_observatory.myGetBoolPref("popup_shown");
     var enabled = ssl_observatory.myGetBoolPref("enabled");
     var that = this;
-    var cohort = this.getExperimentalFeatureCohort();
     var obs_popup_callback = function(result) {
       if (result) that.log(INFO, "Got positive proxy test.");
       else        that.log(INFO, "Got negative proxy text.");
