Issue 3108 - Less hacky approach to disabling E10S compatibility shims

lib/main.js

Index: lib/main.js
===================================================================
--- a/lib/main.js
+++ b/lib/main.js
@@ -31,36 +31,16 @@ require("notification");
 require("sync");
 require("messageResponder");
 require("ui");
 
 function bootstrapChildProcesses()
 {
   let info = require("info");
 
-  // Huge hack: we cannot opt out of individual compatibility shims (see
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1167802). So the about
-  // protocol shim will override our handler in the content process. Prevent
-  // this by making sure it isn't messaged.
-  try
-  {
-    let {AboutProtocolParent} = Cu.import("resource://gre/modules/RemoteAddonsParent.jsm", {});
-    if (AboutProtocolParent && typeof AboutProtocolParent.registerFactory == "function")
-    {
-      let origRegisterFactory = AboutProtocolParent.registerFactory;
-      AboutProtocolParent.registerFactory = function(addon, ...args)
-      {
-        if (addon != info.addonID)
-          origRegisterFactory.call(this, addon, ...args);
-      }
-      onShutdown.add(() => AboutProtocolParent.registerFactory = origRegisterFactory);
-    }
-  }
-  catch(e) {}
-
   let processScript = info.addonRoot + "lib/child/bootstrap.js?" + Math.random();
   let messageManager = Cc["@mozilla.org/parentprocessmessagemanager;1"]
                          .getService(Ci.nsIProcessScriptLoader)
                          .QueryInterface(Ci.nsIMessageBroadcaster);
   messageManager.loadProcessScript(processScript, true);
   messageManager.broadcastAsyncMessage("AdblockPlus:Info", info);
 
   onShutdown.add(() => {