Applied changes from emailed code review

lib/main.js

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // Import prefs from old branch if there are any
 let {Prefs} = require("prefs");
@@ skipping 58 matching lines @@
     {
       // window.Browser.addTab(url, true);
       // No firstrun on Fennec.
     }
     else if ("gBrowser" in window)
       window.gBrowser.loadOneTab(url, {inBackground: false});
   }
 
   require("typedItCollector").onBrowserInitialized(window);
 }
-
-var URLFIXER = {
-  load : function () {
-    document.addEventListener("URLFixerNetErrorCorrection", URLFIXER.netErrorCorrection, false, true);
-  },
-
-  netErrorCorrection : function (evt) {
-    var button = evt.target;
-    var oldUrl = button.getAttribute("old");
-    var newUrl = button.getAttribute("new");
-
-    if (newUrl.indexOf("http://") == -1 && newUrl.indexOf("https://") == -1) {
-      newUrl = oldUrl.split("//")[0] + "//" + newUrl;
-    }
-
-    var rv = newUrl;
-
-    var oldParts = oldUrl.split("://");
-    var newParts = newUrl.split("://");
-
-    // Discard the protocol if they're the same.
-    if (oldParts[0] == newParts[0]) {
-      oldParts.shift();
-      newParts.shift();
-      oldUrl = "//" + oldParts.join("//");
-      newUrl = "//" + newParts.join("//");
-    }
-
-    // Ignore www subdomain if both of them have it.
-    if (oldUrl.indexOf("//www.") != -1 && (oldUrl.indexOf("//www.") === newUrl.indexOf("//www."))) {
-      oldUrl = oldUrl.split("//www.")[1];
-      newUrl = newUrl.split("//www.")[1];
-    }
-
-    // Ignore trailing slashes
-    if (oldUrl.charAt(oldUrl.length - 1) == "/" && newUrl.charAt(newUrl.length - 1) == "/") {
-      oldUrl = oldUrl.substr(0, oldUrl.length - 1);
-      newUrl = newUrl.substr(0, newUrl.length - 1);
-    }
-
-    var corrections = URLFIXER.getJSONPref("custom_replace", {});
-    corrections[oldUrl] = newUrl;
-    URLFIXER.setJSONPref("custom_replace", corrections);
-
-    content.location.href = rv;
-  }
-};
-