Renamed necessary components for ABP integration

lib/typoFixer.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/XPCOMUtils.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
-let {getSchemeCorrection, isKnownScheme, getDomainCorrection, getDomainReferral, onWhitelistEntryRemoved} = require("rules");
+let {getSchemeCorrection, isKnownScheme, getDomainCorrection, getDomainReferral, onWhitelistEntryRemoved} = require("typoRules");
 let {processTypedDomain, processDomainCorrection,
      processUserCorrection, processFalsePositive} = require("typedItCollector");
-let appIntegration = require("appIntegration");
+let appIntegration = require("typoAppIntegration");
 
 // Attach our handlers to all browser windows
 new WindowObserver(
 {
   applyToWindow: function(window)
   {
     if (!appIntegration.isKnownWindow(window))
       return;
 
     let browser = appIntegration.getBrowser(window);
@@ skipping 23 matching lines @@
       }
     }
 
     appIntegration.removeFromWindow(window);
   }
 });
 
 // Load HTML code to add to network error pages
 let netErrorOverlay = null;
 let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
-request.open("GET", "chrome://url-fixer/content/netError.xhtml");
+request.open("GET", "chrome://url-fixer/content/typoNetError.xhtml");
 request.addEventListener("load", function(event)
 {
   netErrorOverlay = event.target.responseXML;
 }, false);
 request.send(null)
 
 function handlePageLoad(event)
 {
   let document = event.target;
   if (document.documentURI.indexOf("about:neterror?") != 0 ||
@@ skipping 176 matching lines @@
       {
         // Yes: Do nothing
       }
     },
     {
       label:      no,
       accessKey:  null,
       callback:   function()
       {
         // No: Add to list of corrections (ignore)
-        let {onWhitelistEntryAdded} = require("rules");
+        let {onWhitelistEntryAdded} = require("typoRules");
         let entry = oldDomain.replace(/^www\./, "");
         Prefs.whitelist[entry] = true;
         onWhitelistEntryAdded(entry);
         Prefs.whitelist = JSON.parse(JSON.stringify(Prefs.whitelist));
 
-        require("appIntegration").loadURI(window, value);
+        appIntegration.loadURI(window, value);
         processFalsePositive(domain, oldDomain);
       }
     }
   ];
   // We need to have persistence being set to 1 due to redirect which happens afterwards
-  require("appIntegration").openInfobar(window, "url-fixer-infobar-askafter", message, buttons, 1);
+  appIntegration.openInfobar(window, "url-fixer-infobar-askafter", message, buttons, 1);
 
   require("survey").incrementCorrectionsCounter();
 
   return prefix + domain + suffix;
 }
 
 let stringBundle = null;
 
 function getInfobarTexts()
 {
   // Randomize URI to work around bug 719376
   if (!stringBundle)
-    stringBundle = Services.strings.createBundle("chrome://url-fixer/locale/locale.properties?" + Math.random());
+    stringBundle = Services.strings.createBundle("chrome://url-fixer/locale/typo.properties?" + Math.random());
   let result = [
     stringBundle.GetStringFromName("urlfixer.isItCorrect"),
     stringBundle.GetStringFromName("urlfixer.yes"),
     stringBundle.GetStringFromName("urlfixer.no")
   ];
 
   getInfobarTexts = function() result;
   return getInfobarTexts();
 }