diff -r 000000000000 -r 6474c204b198 toolkit/modules/RemoteAddonsParent.jsm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/modules/RemoteAddonsParent.jsm	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,129 @@
+// -*- Mode: javascript; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// 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/.
+
+this.EXPORTED_SYMBOLS = ["RemoteAddonsParent"];
+
+const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import('resource://gre/modules/Services.jsm');
+
+/**
+ * This code listens for nsIContentPolicy hooks firing in child
+ * processes. It then fires all hooks in the parent process and
+ * returns the result to the child.
+ */
+let ContentPolicyParent = {
+  /**
+   * Some builtin policies will have already run in the child, and
+   * there's no reason to run them in the parent. This is a list of
+   * those policies. We assume that all child processes have the same
+   * set of built-in policies.
+   */
+  _policiesToIgnore: [],
+
+  init: function() {
+    let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+               .getService(Ci.nsIMessageBroadcaster);
+    ppmm.addMessageListener("Addons:ContentPolicy:IgnorePolicies", this);
+    ppmm.addMessageListener("Addons:ContentPolicy:Run", this);
+
+    Services.obs.addObserver(this, "xpcom-category-entry-added", true);
+    Services.obs.addObserver(this, "xpcom-category-entry-removed", true);
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case "xpcom-category-entry-added":
+      case "xpcom-category-entry-removed":
+        if (aData == "content-policy")
+          this.updatePolicies();
+        break;
+    }
+  },
+
+  /**
+   * There's no need for the child process to inform us about the
+   * shouldLoad hook if we don't have any policies in the parent to
+   * run. This code iterates over the parent's policies, looking for
+   * ones that should not be ignored. Based on that, it tells the
+   * children whether it needs to be informed about the shouldLoad
+   * hook.
+   */
+  updatePolicies: function() {
+    let needHook = false;
+
+    let services = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager)
+                                                       .enumerateCategory("content-policy");
+    while (services.hasMoreElements()) {
+      let item = services.getNext();
+      let name = item.QueryInterface(Components.interfaces.nsISupportsCString).toString();
+
+      if (this._policiesToIgnore.indexOf(name) == -1) {
+        needHook = true;
+        break;
+      }
+    }
+
+    let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+               .getService(Ci.nsIMessageBroadcaster);
+    ppmm.broadcastAsyncMessage("Addons:ContentPolicy:NeedHook", { needed: needHook });
+  },
+
+  receiveMessage: function (aMessage) {
+    switch (aMessage.name) {
+      case "Addons:ContentPolicy:IgnorePolicies":
+        this._policiesToIgnore = aMessage.data.policies;
+        this.updatePolicies();
+        break;
+
+      case "Addons:ContentPolicy:Run":
+        return this.shouldLoad(aMessage.data, aMessage.objects);
+        break;
+    }
+  },
+
+  shouldLoad: function(aData, aObjects) {
+    let services = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager)
+                                                       .enumerateCategory("content-policy");
+    while (services.hasMoreElements()) {
+      let item = services.getNext();
+      let name = item.QueryInterface(Components.interfaces.nsISupportsCString).toString();
+      if (this._policiesToIgnore.indexOf(name) != -1)
+        continue;
+
+      let policy = Cc[name].getService(Ci.nsIContentPolicy);
+      try {
+        let result = policy.shouldLoad(aData.contentType,
+                                       aObjects.contentLocation,
+                                       aObjects.requestOrigin,
+                                       aObjects.node,
+                                       aData.mimeTypeGuess,
+                                       null);
+        if (result != Ci.nsIContentPolicy.ACCEPT && result != 0)
+          return result;
+      } catch (e) {}
+    }
+
+    return Ci.nsIContentPolicy.ACCEPT;
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+};
+
+let RemoteAddonsParent = {
+  initialized: false,
+
+  init: function() {
+    if (this.initialized)
+      return;
+
+    this.initialized = true;
+
+    ContentPolicyParent.init();
+  },
+};