Bug 1491561 - Remove the XPCOM registrations for LoadContext; r=bzbarsky

Differential Revision: https://phabricator.services.mozilla.com/D5945
This commit is contained in:
Ehsan Akhgari
2018-09-15 11:38:45 -04:00
parent d3301cd8be
commit ed0acd2e9d
13 changed files with 47 additions and 72 deletions

View File

@@ -37,9 +37,6 @@
#include "nsSHEntryShared.h"
#include "nsSHistory.h"
// LoadContexts (used for testing)
#include "LoadContext.h"
using mozilla::dom::ContentHandlerService;
static bool gInitialized = false;
@@ -117,8 +114,6 @@ NS_DEFINE_NAMED_CID(NS_EXTERNALURLHANDLERSERVICE_CID);
#endif
NS_DEFINE_NAMED_CID(NS_SHENTRY_CID);
NS_DEFINE_NAMED_CID(NS_CONTENTHANDLERSERVICE_CID);
NS_DEFINE_NAMED_CID(NS_LOADCONTEXT_CID);
NS_DEFINE_NAMED_CID(NS_PRIVATELOADCONTEXT_CID);
const mozilla::Module::CIDEntry kDocShellCIDs[] = {
{ &kNS_DOCSHELL_CID, false, nullptr, nsDocShellConstructor },
@@ -142,8 +137,6 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = {
{ &kNS_EXTERNALURLHANDLERSERVICE_CID, false, nullptr, nsExternalURLHandlerServiceConstructor },
#endif
{ &kNS_SHENTRY_CID, false, nullptr, nsSHEntryConstructor },
{ &kNS_LOADCONTEXT_CID, false, nullptr, mozilla::CreateTestLoadContext },
{ &kNS_PRIVATELOADCONTEXT_CID, false, nullptr, mozilla::CreatePrivateTestLoadContext },
{ nullptr }
};
@@ -197,8 +190,6 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
{ NS_EXTERNALURLHANDLERSERVICE_CONTRACTID, &kNS_EXTERNALURLHANDLERSERVICE_CID },
#endif
{ NS_SHENTRY_CONTRACTID, &kNS_SHENTRY_CID },
{ NS_LOADCONTEXT_CONTRACTID, &kNS_LOADCONTEXT_CID },
{ NS_PRIVATELOADCONTEXT_CONTRACTID, &kNS_PRIVATELOADCONTEXT_CID },
{ NS_OSPERMISSIONREQUEST_CONTRACTID, &kNS_OSPERMISSIONREQUEST_CID, mozilla::Module::MAIN_PROCESS_ONLY },
{ nullptr }
};