Backed out changeset 9d5e247b5052 to see whether bug 495176 might be causing

the WinXP Txul regression.

--HG--
extra : rebase_source : 41a0fe73ec43dff97ada391db29dc121fb677403

caps/src/nsScriptSecurityManager.cpp

@@ -842,9 +842,6 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
         if (!nsAutoInPrincipalDomainOriginSetter::sInPrincipalDomainOrigin) {
             nsCOMPtr<nsIURI> uri, domain;
             subjectPrincipal->GetURI(getter_AddRefs(uri));
-            // Subject can't be system if we failed the security
-            // check, so |uri| is non-null.
-            NS_ASSERTION(uri, "How did that happen?");
             GetOriginFromURI(uri, subjectOrigin);
             subjectPrincipal->GetDomain(getter_AddRefs(domain));
             if (domain) {
@@ -862,9 +859,7 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
             objectPrincipal) {
             nsCOMPtr<nsIURI> uri, domain;
             objectPrincipal->GetURI(getter_AddRefs(uri));
-            if (uri) { // Object principal might be system
             GetOriginFromURI(uri, objectOrigin);
-            }
             objectPrincipal->GetDomain(getter_AddRefs(domain));
             if (domain) {
                 GetOriginFromURI(domain, objectDomain);