Convert SSL Observatory to use getBrowserForChannel.

jsha · jsha · commit 27b0f7357f59 · 2014-12-05T15:07:07.000-08:00
diff --git a/https-everywhere-tests/test_profile_skeleton/prefs.js b/https-everywhere-tests/test_profile_skeleton/prefs.js
@@ -12,3 +12,9 @@ user_pref("general.warnOnAboutConfig", false);
 // Minimize unnecesary requests.
 user_pref("browser.safebrowsing.enabled", false);
 user_pref("browser.safebrowsing.malware.enabled", false);
+// These two preferences allow debugging the extension
+// using Tools > Web Developer > Browser Toolbox
+// (Note: Since this is not an SDK extension, you can't use the Addon
+// Debugger, but the Browser Toolbox is just about as good).
+user_pref("devtools.chrome.enabled", true);
+user_pref("devtools.debugger.remote-enabled", true);
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -502,10 +502,13 @@ SSLObservatory.prototype = {
           // active now
           return this.everSeenPrivateBrowsing;
         }
-        var win = this.HTTPSEverywhere.getWindowForChannel(channel);
-        if (!win) return this.everSeenPrivateBrowsing;  // windowless request
+        var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
+        // windowless request
+        if (!browser || !browser.contentWindow) {
+          return this.everSeenPrivateBrowsing;
+	}
 
-        if (PrivateBrowsingUtils.isWindowPrivate(win)) {
+        if (PrivateBrowsingUtils.isWindowPrivate(browser.contentWindow)) {
           this.everSeenPrivateBrowsing = true;
           return true;
         }
@@ -816,7 +819,11 @@ SSLObservatory.prototype = {
 
     var that = this; // We have neither SSLObservatory nor this in scope in the lambda
 
-    var win = channel ? this.HTTPSEverywhere.getWindowForChannel(channel) : null;
+    var win = null
+    if (channel) {
+      var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
+      var win = browser.contentWindow;
+    }
     var req = this.buildRequest(params);
     req.timeout = TIMEOUT;
 
