Issue 3208 - Initialize types map in PolicyImplementation, not Policy

lib/contentPolicy.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus 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.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 63 matching lines @@
    * Map containing all schemes that should be ignored by content policy.
    * @type Set
    */
   whitelistSchemes: new Set(),
 
   /**
    * Called on module startup, initializes various exported properties.
    */
   init: function()
   {
-    // Populate types map
-    let iface = Ci.nsIContentPolicy;
-    for (let name in iface)
-      if (name.indexOf("TYPE_") == 0 && name != "TYPE_DATAREQUEST")
-        types.set(iface[name], name.substr(5));
-
     // whitelisted URL schemes
     for (let scheme of Prefs.whitelistschemes.toLowerCase().split(" "))
       this.whitelistSchemes.add(scheme);
 
     // Generate class identifier used to collapse node and register corresponding
     // stylesheet.
     let offset = "a".charCodeAt(0);
     for (let i = 0; i < 20; i++)
       collapsedClass +=  String.fromCharCode(offset + Math.random() * 26);
 
@@ skipping 239 matching lines @@
   classDescription: "Adblock Plus content policy",
   classID: Components.ID("cfeaabe6-1dd1-11b2-a0c6-cb5c268894c9"),
   contractID: "@adblockplus.org/abp/policy;1",
   xpcom_categories: ["content-policy", "net-channel-event-sinks"],
 
   /**
    * Registers the content policy on startup.
    */
   init: function()
   {
+    // Populate types map
+    let iface = Ci.nsIContentPolicy;
+    for (let name in iface)
+      if (name.indexOf("TYPE_") == 0 && name != "TYPE_DATAREQUEST")
+        types.set(iface[name], name.substr(5));
+
     let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
     registrar.registerFactory(this.classID, this.classDescription, this.contractID, this);
 
     let catMan = Utils.categoryManager;
     for (let category of this.xpcom_categories)
       catMan.addCategoryEntry(category, this.contractID, this.contractID, false, true);
 
     Services.obs.addObserver(this, "content-document-global-created", true);
 
     onShutdown.add(() =>
@@ skipping 326 matching lines @@
   if (!wnd || wnd.closed)
     return;
 
   if (entry.type == "OBJECT")
   {
     node.removeEventListener("mouseover", objectMouseEventHander, true);
     node.removeEventListener("mouseout", objectMouseEventHander, true);
   }
   Policy.processNode(wnd, node, entry.type, entry.location, true);
 }