diff -r 000000000000 -r 6474c204b198 security/manager/pki/src/nsPKIModule.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/pki/src/nsPKIModule.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 2; 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/. */
+
+#include "mozilla/ModuleUtils.h"
+
+#include "nsNSSDialogs.h"
+#include "nsPKIParamBlock.h"
+#include "nsASN1Tree.h"
+#include "nsFormSigningDialog.h"
+#include "nsISSLCertErrorDialog.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSDialogs, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPKIParamBlock, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsNSSASN1Tree)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsFormSigningDialog)
+
+NS_DEFINE_NAMED_CID(NS_NSSDIALOGS_CID);
+NS_DEFINE_NAMED_CID(NS_NSSASN1OUTINER_CID);
+NS_DEFINE_NAMED_CID(NS_PKIPARAMBLOCK_CID);
+NS_DEFINE_NAMED_CID(NS_FORMSIGNINGDIALOG_CID);
+
+
+static const mozilla::Module::CIDEntry kPKICIDs[] = {
+  { &kNS_NSSDIALOGS_CID, false, nullptr, nsNSSDialogsConstructor },
+  { &kNS_NSSASN1OUTINER_CID, false, nullptr, nsNSSASN1TreeConstructor },
+  { &kNS_PKIPARAMBLOCK_CID, false, nullptr, nsPKIParamBlockConstructor },
+  { &kNS_FORMSIGNINGDIALOG_CID, false, nullptr, nsFormSigningDialogConstructor },
+  { nullptr }
+};
+
+static const mozilla::Module::ContractIDEntry kPKIContracts[] = {
+  { NS_SSLCERTERRORDIALOG_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_TOKENPASSWORDSDIALOG_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CERTIFICATEDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CLIENTAUTHDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_CERTPICKDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_TOKENDIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_DOMCRYPTODIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_GENERATINGKEYPAIRINFODIALOGS_CONTRACTID, &kNS_NSSDIALOGS_CID },
+  { NS_ASN1TREE_CONTRACTID, &kNS_NSSASN1OUTINER_CID },
+  { NS_PKIPARAMBLOCK_CONTRACTID, &kNS_PKIPARAMBLOCK_CID },
+  { NS_FORMSIGNINGDIALOG_CONTRACTID, &kNS_FORMSIGNINGDIALOG_CID },
+  { nullptr }
+};
+
+static const mozilla::Module kPKIModule = {
+  mozilla::Module::kVersion,
+  kPKICIDs,
+  kPKIContracts
+};
+
+NSMODULE_DEFN(PKI) = &kPKIModule;