With channel.redirectTo, other extensions shouldn't need an observer for our rewrites

pde · pde · commit 272fd444c9ee · 2013-11-21T16:51:12.000-08:00
diff --git a/src/chrome/content/code/HTTPS.js b/src/chrome/content/code/HTTPS.js
@@ -57,32 +57,22 @@ const HTTPS = {
     }
 
     // Check for the new internal redirect API. If it exists, use it.
-    if ("redirectTo" in channel) {
-      this.log(INFO, "Using nsIHttpChannel.redirectTo: " + channel.URI.spec + " -> " + uri.spec);
-      try {
-        channel.redirectTo(uri);
-        return true;
-      } catch(e) {
-        // This should not happen. We should only get exceptions if
-        // the channel was already open.
-        this.log(WARN, "Exception on nsIHttpChannel.redirectTo: "+e);
-
-        // Don't return: Fallback to NoScript ChannelReplacement.js
-      }
+    if (!"redirectTo" in channel) {
+      this.log(WARN, "nsIHTTPChannel.redirectTo API is missing. This version of HTTPS Everywhere is useless!!!!\n!!!\n");
+      return false;
     }
 
-    if (ChannelReplacement.supported) {
-      HTTPSEverywhere.instance.notifyObservers(channel.URI, uri.spec);
-      HTTPS.log(INFO,"Scheduling channel replacement for "+channel.URI.spec);
-      ChannelReplacement.runWhenPending(channel, function() {
-        var cr = new ChannelReplacement(channel, uri);
-        cr.replace(true,null);
-        cr.open();
-        HTTPS.log(INFO,"Ran channel replacement for "+channel.URI.spec);
-      });
+    this.log(INFO, "Using nsIHttpChannel.redirectTo: " + channel.URI.spec + " -> " + uri.spec);
+    try {
+      channel.redirectTo(uri);
       return true;
+    } catch(e) {
+      // This should not happen. We should only get exceptions if
+      // the channel was already open.
+      this.log(WARN, "Exception on nsIHttpChannel.redirectTo: "+e);
+
+      // Don't return: Fallback to NoScript ChannelReplacement.js
     }
-    
     this.log(WARN,"Aborting redirection " + channel.name + ", should be HTTPS!");
     IOUtil.abort(channel);
     return false;
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -109,6 +109,7 @@ const DUMMY_ARRAY = [];
 
 const EARLY_VERSION_CHECK = !("nsISessionStore" in CI && typeof(/ /) === "object");
 
+// This is probably obsolete since the switch to the channel.redirectTo API
 const OBSERVER_TOPIC_URI_REWRITE = "https-everywhere-uri-rewrite";
 
 // XXX: Better plan for this?
@@ -646,23 +647,6 @@ HTTPSEverywhere.prototype = {
     return o_branch;
   },
 
-  /**
-   * Notify observers of the topic OBSERVER_TOPIC_URI_REWRITE.
-   *
-   * @param nsIURI oldURI
-   * @param string newSpec
-   */
-  notifyObservers: function(oldURI, newSpec) {
-    this.log(INFO, "Notifying observers of rewrite from " + oldURI.spec + " to " + newSpec);
-    try {
-      // The subject has to be an nsISupports and the extra data is a string,
-      // that's why one is an nsIURI and the other is a nsIURI.spec string.
-      this.obsService.notifyObservers(oldURI, OBSERVER_TOPIC_URI_REWRITE, newSpec);
-    } catch (e) {
-      this.log(WARN, "Couldn't notify observers: " + e);
-    }
-  },
-
   chrome_opener: function(uri, args) {
     // we don't use window.open, because we need to work around TorButton's 
     // state control
