Ported changes from Adblock Plus integration back into URL Fixer

lib/main.js

 /*
  * This file is part of the URL Fixer,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * URL Fixer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * URL Fixer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with URL Fixer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 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");
 Prefs.migrate("extensions.typed-it-collection.domainOptInAsk", "domainOptInAsk");
 Prefs.migrate("extensions.typed-it-collection.domainOptIn", "domainOptIn");
 Prefs.migrate("extensions.typed-it-collection.counter", "counter");
 
 require("typoFixer");
-require("typedItCollector");
+require("typoCollector");
 
 // Execute first-run actions once the session is restored
 {
   let observer =
   {
     observe: function(subject, topic, data)
     {
       removeHandler();
       onShutdown.remove(removeHandler);
       onBrowserInitialized();
@@ skipping 40 matching lines @@
       url += "&update=1";
     if ("Browser" in window && typeof window.Browser.addTab != 'undefined')
     {
       // window.Browser.addTab(url, true);
       // No firstrun on Fennec.
     }
     else if ("gBrowser" in window)
       window.gBrowser.loadOneTab(url, {inBackground: false});
   }
 
-  require("typedItCollector").onBrowserInitialized(window);
+  require("typoCollector").onBrowserInitialized(window);
 }