Bug 940717 - Unify the IsChromeURI functions we have in various places - r=ehsan

chrome/src/nsChromeRegistry.cpp

@@ -27,8 +27,10 @@
 #include "nsIPresShell.h"
 #include "nsIScriptError.h"
 #include "nsIWindowMediator.h"
+#include "mozilla/dom/URL.h"
 
 nsChromeRegistry* nsChromeRegistry::gChromeRegistry;
+using mozilla::dom::IsChromeURI;
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -371,14 +373,6 @@ nsChromeRegistry::FlushSkinCaches()
                           NS_CHROME_FLUSH_SKINS_TOPIC, nullptr);
 }
 
-static bool IsChromeURI(nsIURI* aURI)
-{
-    bool isChrome=false;
-    if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome)
-        return true;
-    return false;
-}
-
 // XXXbsmedberg: move this to windowmediator
 nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindow* aWindow)
 {

content/xbl/src/nsXBLDocumentInfo.cpp

@@ -33,9 +33,11 @@
 #include "mozilla/scache/StartupCacheUtils.h"
 #include "nsCCUncollectableMarker.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/URL.h"
 
-using namespace mozilla::scache;
 using namespace mozilla;
+using namespace mozilla::scache;
+using namespace mozilla::dom;
 
 static const char kXBLCachePrefix[] = "xblcache";
 
@@ -282,14 +284,6 @@ nsXBLDocGlobalObject::GetPrincipal()
   return document->NodePrincipal();
 }
 
-static bool IsChromeURI(nsIURI* aURI)
-{
-  bool isChrome = false;
-  if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)))
-      return isChrome;
-  return false;
-}
-
 /* Implementation file */
 
 static bool

content/xbl/src/nsXBLPrototypeResources.cpp

@@ -16,6 +16,9 @@
 #include "nsLayoutCID.h"
 #include "nsCSSRuleProcessor.h"
 #include "nsStyleSet.h"
+#include "mozilla/dom/URL.h"
+
+using mozilla::dom::IsChromeURI;
 
 nsXBLPrototypeResources::nsXBLPrototypeResources(nsXBLPrototypeBinding* aBinding)
 {
@@ -57,14 +60,6 @@ nsXBLPrototypeResources::AddResourceListener(nsIContent* aBoundElement)
     mLoader->AddResourceListener(aBoundElement);
 }
 
-static bool IsChromeURI(nsIURI* aURI)
-{
-  bool isChrome=false;
-  if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome)
-    return true;
-  return false;
-}
-
 nsresult
 nsXBLPrototypeResources::FlushSkinSheets()
 {

content/xul/document/src/XULDocument.cpp

@@ -90,6 +90,7 @@
 #include "mozilla/Preferences.h"
 #include "nsTextNode.h"
 #include "nsJSUtils.h"
+#include "mozilla/dom/URL.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -101,14 +102,6 @@ using namespace mozilla::dom;
 
 static NS_DEFINE_CID(kParserCID,                 NS_PARSER_CID);
 
-static bool IsChromeURI(nsIURI* aURI)
-{
-    bool isChrome = false;
-    if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome)
-        return true;
-    return false;
-}
-
 static bool IsOverlayAllowed(nsIURI* aURI)
 {
     bool canOverlay = false;

dom/base/URL.cpp

@@ -409,5 +409,13 @@ URL::SetHash(const nsAString& aHash)
   mURI->SetRef(NS_ConvertUTF16toUTF8(aHash));
 }
 
+bool IsChromeURI(nsIURI* aURI)
+{
+  bool isChrome = false;
+  if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)))
+      return isChrome;
+  return false;
+}
+
 }
 }

dom/base/URL.h

@@ -130,6 +130,8 @@ private:
   friend class mozilla::dom::workers::URLProxy;
 };
 
+bool IsChromeURI(nsIURI* aURI);
+
 }
 }
 

layout/style/Loader.cpp

@@ -48,6 +48,7 @@
 #include "nsIThreadInternal.h"
 #include "nsCrossSiteListenerProxy.h"
 #include "nsINetworkSeer.h"
+#include "mozilla/dom/URL.h"
 
 #ifdef MOZ_XUL
 #include "nsXULPrototypeCache.h"
@@ -942,16 +943,6 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
   return result;
 }
 
-#ifdef MOZ_XUL
-static bool IsChromeURI(nsIURI* aURI)
-{
-  NS_ASSERTION(aURI, "Have to pass in a URI");
-  bool isChrome = false;
-  aURI->SchemeIs("chrome", &isChrome);
-  return isChrome;
-}
-#endif
-
 bool
 Loader::IsAlternate(const nsAString& aTitle, bool aHasAlternateRel)
 {