Bug 581868: Remove nsIPrivateDOMImplementation. r=jst

content/base/public/Makefile.in

@@ -65,7 +65,6 @@ nsIRange.h \
 nsIRangeUtils.h \
 nsIScriptElement.h \
 nsIStyleSheetLinkingElement.h \
-nsIPrivateDOMImplementation.h \
 nsIContentSerializer.h \
 nsIHTMLToTextSink.h \
 nsIXPathEvaluatorInternal.h \

content/base/src/nsDocument.cpp

@@ -118,7 +118,6 @@
 
 #include "nsIScriptSecurityManager.h"
 #include "nsIPrincipal.h"
-#include "nsIPrivateDOMImplementation.h"
 
 #include "nsIDOMWindowInternal.h"
 #include "nsPIDOMWindow.h"
@@ -1224,8 +1223,7 @@ nsDOMStyleSheetSetList::GetSets(nsTArray<nsString>& aStyleSets)
 // =
 // ==================================================================
 
-class nsDOMImplementation : public nsIDOMDOMImplementation,
-                            public nsIPrivateDOMImplementation
+class nsDOMImplementation : public nsIDOMDOMImplementation
 {
 public:
   nsDOMImplementation(nsIScriptGlobalObject* aScriptObject,
@@ -1239,10 +1237,6 @@ public:
   // nsIDOMDOMImplementation
   NS_DECL_NSIDOMDOMIMPLEMENTATION
 
-  // nsIPrivateDOMImplementation
-  NS_IMETHOD Init(nsIURI* aDocumentURI, nsIURI* aBaseURI,
-                  nsIPrincipal* aPrincipal);
-
 protected:
   nsWeakPtr mScriptObject;
   nsCOMPtr<nsIURI> mDocumentURI;
@@ -1284,7 +1278,6 @@ DOMCI_DATA(DOMImplementation, nsDOMImplementation)
 // QueryInterface implementation for nsDOMImplementation
 NS_INTERFACE_MAP_BEGIN(nsDOMImplementation)
   NS_INTERFACE_MAP_ENTRY(nsIDOMDOMImplementation)
-  NS_INTERFACE_MAP_ENTRY(nsIPrivateDOMImplementation)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMDOMImplementation)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMImplementation)
 NS_INTERFACE_MAP_END
@@ -1371,18 +1364,6 @@ nsDOMImplementation::CreateDocument(const nsAString& aNamespaceURI,
                                         scriptHandlingObject, aReturn);
 }
 
-NS_IMETHODIMP
-nsDOMImplementation::Init(nsIURI* aDocumentURI, nsIURI* aBaseURI,
-                          nsIPrincipal* aPrincipal)
-{
-  // Note: can't require that the args be non-null, since at least one
-  // caller (XMLHttpRequest) doesn't have decent args to pass in.
-  mDocumentURI = aDocumentURI;
-  mBaseURI = aBaseURI;
-  mPrincipal = aPrincipal;
-  return NS_OK;
-}
-
 // ==================================================================
 // =
 // ==================================================================

content/base/src/nsSyncLoadService.cpp

@@ -50,8 +50,6 @@
 #include "nsWeakReference.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
-#include "nsIDOMDOMImplementation.h"
-#include "nsIPrivateDOMImplementation.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -64,7 +64,6 @@
 #include "nsIDOMNode.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMXMLDocument.h"
-#include "nsIPrivateDOMImplementation.h"
 #include "nsIDOMXULElement.h"
 #include "nsIDocument.h"
 #include "nsBindingManager.h"

layout/build/nsLayoutModule.cpp

@@ -76,7 +76,6 @@
 #include "nsIObserver.h"
 #include "nsIObserverService.h"
 #include "nsIPresShell.h"
-#include "nsIPrivateDOMImplementation.h"
 #include "nsIRangeUtils.h"
 #include "nsIScriptNameSpaceManager.h"
 #include "nsISelection.h"
@@ -275,6 +274,9 @@ nsresult
 NS_NewXULTreeBuilder(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 #endif
 
+nsresult
+NS_NewDOMImplementation(nsIDOMDOMImplementation**);
+
 static void Shutdown();
 
 #ifdef MOZ_XTF