Bug 1402769 - Remove unused stuff in and around nsParserModule.cpp. r=mrbkap.

None of these things are used in mozilla-central or comm-central.

--HG--
extra : rebase_source : 470eeca24dda8a3d475208d0c7dd22d5280bb904

parser/htmlparser/nsParserCIID.h

@@ -6,20 +6,8 @@
 #ifndef nsParserCIID_h__
 #define nsParserCIID_h__
 
-#include "nsISupports.h"
-#include "nsIFactory.h"
-#include "nsIComponentManager.h"
-
 // {2ce606b0-bee6-11d1-aad9-00805f8a3e14}
 #define NS_PARSER_CID      \
 { 0x2ce606b0, 0xbee6, 0x11d1, { 0xaa, 0xd9, 0x0, 0x80, 0x5f, 0x8a, 0x3e, 0x14 } }
 
-// {a6cf9107-15b3-11d2-932e-00805f8add32}
-#define NS_CNAVDTD_CID \
-{ 0xa6cf9107, 0x15b3, 0x11d2, { 0x93, 0x2e, 0x0, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } }
-
-// {FFF4FBE9-528A-4b37-819D-FC18F3A401A7}
-#define NS_EXPAT_DRIVER_CID \
-{ 0xfff4fbe9, 0x528a, 0x4b37, { 0x81, 0x9d, 0xfc, 0x18, 0xf3, 0xa4, 0x1, 0xa7 } }
-
 #endif

parser/htmlparser/nsParserModule.cpp

@@ -3,58 +3,27 @@
  * 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 "nsIAtom.h"
-#include "nsString.h"
-#include "nspr.h"
-#include "nsCOMPtr.h"
 #include "mozilla/ModuleUtils.h"
-#include "nsParserCIID.h"
 #include "nsParser.h"
-#include "CNavDTD.h"
-#include "nsHTMLTokenizer.h"
-//#include "nsTextTokenizer.h"
-#include "nsElementTable.h"
-#include "nsSAXAttributes.h"
-#include "nsSAXLocator.h"
+#include "nsParserCIID.h"
+#include "nsHTMLTags.h"
 #include "nsSAXXMLReader.h"
 
-#if defined(DEBUG)
-#include "nsExpatDriver.h"
-#endif
-
 //----------------------------------------------------------------------
 
-#if defined(DEBUG)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsExpatDriver)
-#endif
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsParser)
-NS_GENERIC_FACTORY_CONSTRUCTOR(CNavDTD)
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSAXAttributes)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSAXXMLReader)
 
-#if defined(DEBUG)
-NS_DEFINE_NAMED_CID(NS_EXPAT_DRIVER_CID);
-#endif
 NS_DEFINE_NAMED_CID(NS_PARSER_CID);
-NS_DEFINE_NAMED_CID(NS_CNAVDTD_CID);
-NS_DEFINE_NAMED_CID(NS_SAXATTRIBUTES_CID);
 NS_DEFINE_NAMED_CID(NS_SAXXMLREADER_CID);
 
 static const mozilla::Module::CIDEntry kParserCIDs[] = {
-#if defined(DEBUG)
-  { &kNS_EXPAT_DRIVER_CID, false, nullptr, nsExpatDriverConstructor },
-#endif
   { &kNS_PARSER_CID, false, nullptr, nsParserConstructor },
-  { &kNS_CNAVDTD_CID, false, nullptr, CNavDTDConstructor },
-  { &kNS_SAXATTRIBUTES_CID, false, nullptr, nsSAXAttributesConstructor },
   { &kNS_SAXXMLREADER_CID, false, nullptr, nsSAXXMLReaderConstructor },
   { nullptr }
 };
 
 static const mozilla::Module::ContractIDEntry kParserContracts[] = {
-  { NS_SAXATTRIBUTES_CONTRACTID, &kNS_SAXATTRIBUTES_CID },
   { NS_SAXXMLREADER_CONTRACTID, &kNS_SAXXMLREADER_CID },
   { nullptr }
 };
@@ -67,9 +36,6 @@ Initialize()
 
 #ifdef DEBUG
   CheckElementTable();
-#endif
-
-#ifdef DEBUG
   nsHTMLTags::TestTagTable();
 #endif
 

parser/xml/nsSAXAttributes.h

@@ -13,12 +13,6 @@
 #include "nsString.h"
 #include "mozilla/Attributes.h"
 
-#define NS_SAXATTRIBUTES_CONTRACTID "@mozilla.org/saxparser/attributes;1"
-#define NS_SAXATTRIBUTES_CID  \
-{/* {7bb40992-77eb-43db-9a4e-39d3bcc483ae}*/ \
-0x7bb40992, 0x77eb, 0x43db, \
-{ 0x9a, 0x4e, 0x39, 0xd3, 0xbc, 0xc3, 0x83, 0xae} }
-
 struct SAXAttr
 {
   nsString uri;

parser/xml/nsSAXLocator.h

@@ -10,12 +10,6 @@
 #include "nsString.h"
 #include "mozilla/Attributes.h"
 
-#define NS_SAXLOCATOR_CONTRACTID "@mozilla.org/saxparser/locator;1"
-#define NS_SAXLOCATOR_CID  \
-{/* {c1cd4045-846b-43bb-a95e-745a3d7b40e0}*/ \
-0xc1cd4045, 0x846b, 0x43bb, \
-{ 0xa9, 0x5e, 0x74, 0x5a, 0x3d, 0x7b, 0x40, 0xe0} }
-
 class nsSAXLocator final : public nsISAXLocator
 {
 public: