Bug 908530 part 2. Fix all the places that are bootlegging things (esp nsIURI) via xpcpublic.h. r=khuey

accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp

@@ -11,6 +11,7 @@
 
 #include "AccessibleWrap.h"
 #include "IUnknownImpl.h"
+#include "nsIURI.h"
 
 using namespace mozilla::a11y;
 

content/base/public/nsContentPolicyUtils.h

@@ -19,6 +19,7 @@
 #include "nsIContent.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIPrincipal.h"
+#include "nsIURI.h"
 
 //XXXtw sadly, this makes consumers of nsContentPolicyUtils depend on widget
 #include "nsIDocument.h"

content/base/public/nsIDocument.h

@@ -269,12 +269,7 @@ public:
     }
     return mDocumentBaseURI ? mDocumentBaseURI : mDocumentURI;
   }
-  virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE
-  {
-    nsCOMPtr<nsIURI> uri = GetDocBaseURI();
-
-    return uri.forget();
-  }
+  virtual already_AddRefed<nsIURI> GetBaseURI() const MOZ_OVERRIDE;
 
   virtual nsresult SetBaseURI(nsIURI* aURI) = 0;
 

content/base/src/nsDocument.cpp

@@ -3259,6 +3259,13 @@ nsIDocument::ReleaseCapture() const
   }
 }
 
+already_AddRefed<nsIURI>
+nsIDocument::GetBaseURI() const
+{
+  nsCOMPtr<nsIURI> uri = GetDocBaseURI();
+  return uri.forget();
+}
+
 nsresult
 nsDocument::SetBaseURI(nsIURI* aURI)
 {

content/html/content/src/HTMLAnchorElement.cpp

@@ -15,6 +15,7 @@
 #include "nsIDocument.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
+#include "nsIURI.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
 

content/html/content/src/HTMLMenuElement.cpp

@@ -12,6 +12,7 @@
 #include "nsEventDispatcher.h"
 #include "nsGUIEvent.h"
 #include "nsXULContextMenuBuilder.h"
+#include "nsIURI.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Menu)
 

content/svg/content/src/SVGAElement.cpp

@@ -11,6 +11,7 @@
 #include "nsContentUtils.h"
 #include "nsGkAtoms.h"
 #include "nsSVGString.h"
+#include "nsIURI.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(A)
 

content/svg/content/src/SVGAnimationElement.cpp

@@ -9,6 +9,7 @@
 #include "nsSMILAnimationController.h"
 #include "nsSMILAnimationFunction.h"
 #include "nsContentUtils.h"
+#include "nsIURI.h"
 #include "prtime.h"
 
 namespace mozilla {

content/svg/content/src/SVGMPathElement.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/dom/SVGPathElement.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/SVGMPathElementBinding.h"
+#include "nsIURI.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(MPath)
 

content/svg/content/src/SVGUseElement.cpp

@@ -13,6 +13,7 @@
 #include "nsIPresShell.h"
 #include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
+#include "nsIURI.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Use)
 

content/xbl/src/nsXBLProtoImpl.cpp

@@ -17,6 +17,8 @@
 #include "nsIDOMNode.h"
 #include "nsXBLPrototypeBinding.h"
 #include "nsXBLProtoImplProperty.h"
+#include "nsIURI.h"
+#include "xpcpublic.h"
 
 using namespace mozilla;
 

content/xbl/src/nsXBLResourceLoader.h

@@ -15,6 +15,7 @@ class nsSupportsHashtable;
 class nsXBLPrototypeResources;
 class nsXBLPrototypeBinding;
 struct nsXBLResource;
+class nsIObjectOutputStream;
 
 // *********************************************************************/
 // The XBLResourceLoader class

content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp

@@ -19,6 +19,7 @@
 #include "nsAttrName.h"
 #include "rdf.h"
 #include "nsArrayUtils.h"
+#include "nsIURI.h"
 
 #include "nsContentTestNode.h"
 #include "nsRDFConInstanceTestNode.h"

dom/base/nsDOMNavigationTiming.h

@@ -98,7 +98,7 @@ public:
   }
 
 private:
-  nsDOMNavigationTiming(const nsDOMNavigationTiming &){};
+  nsDOMNavigationTiming(const nsDOMNavigationTiming &) MOZ_DELETE;
   ~nsDOMNavigationTiming();
 
   void Clear();

dom/bindings/TypedArray.h

@@ -10,6 +10,7 @@
 #include "jsfriendapi.h"
 #include "jsapi.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {

js/xpconnect/loader/mozJSSubScriptLoader.cpp

@@ -28,6 +28,7 @@
 #include "jsdbgapi.h"
 #include "jsfriendapi.h"
 #include "nsJSPrincipals.h"
+#include "xpcpublic.h" // For xpc::SystemErrorReporter
 
 #include "mozilla/scache/StartupCache.h"
 #include "mozilla/scache/StartupCacheUtils.h"

mobile/android/components/build/nsAndroidHistory.cpp

@@ -5,6 +5,7 @@
 #include "nsAndroidHistory.h"
 #include "AndroidBridge.h"
 #include "Link.h"
+#include "nsIURI.h"
 
 using namespace mozilla;
 using mozilla::dom::Link;