Bug 913734 - Remove namespace mozilla::hotness. r=mrbkap

caps/include/DomainPolicy.h

@@ -13,11 +13,6 @@
 
 namespace mozilla {
 
-// The name "DomainPolicy" conflicts with some of the old-style policy machinery
-// in nsScriptSecurityManager.cpp, which needs to #include this file. So we
-// temporarily use a sub-namespace until that machinery goes away in bug 913734.
-namespace hotness {
-
 class DomainPolicy : public nsIDomainPolicy
 {
 public:
@@ -46,7 +41,6 @@ protected:
     nsTHashtable<nsURIHashKey> mHashTable;
 };
 
-} /* namespace hotness */
 } /* namespace mozilla */
 
 #endif /* DomainPolicy_h__ */

caps/src/DomainPolicy.cpp

@@ -8,7 +8,6 @@
 #include "nsScriptSecurityManager.h"
 
 namespace mozilla {
-namespace hotness {
 
 NS_IMPL_ISUPPORTS1(DomainPolicy, nsIDomainPolicy)
 
@@ -161,5 +160,4 @@ DomainSet::ContainsSuperDomain(nsIURI* aDomain, bool* aContains)
 
 }
 
-} /* namespace hotness */
 } /* namespace mozilla */

caps/src/nsScriptSecurityManager.cpp

@@ -1959,7 +1959,7 @@ nsScriptSecurityManager::ActivateDomainPolicy(nsIDomainPolicy** aRv)
         return NS_ERROR_SERVICE_NOT_AVAILABLE;
     }
 
-    mDomainPolicy = new mozilla::hotness::DomainPolicy();
+    mDomainPolicy = new DomainPolicy();
     nsCOMPtr<nsIDomainPolicy> ptr = mDomainPolicy;
     ptr.forget(aRv);
     return NS_OK;