Resolving apprunner bustage in an unfortunate way. r=danm

chrome/src/nsChromeRegistry.cpp

@@ -608,11 +608,16 @@ nsChromeRegistry::InitRegistry()
 
         rv = remote->Init(innerURI);
         if (NS_FAILED(rv)) return rv;
-
-        // We need to read this synchronously.
-        rv = remote->Refresh(PR_TRUE);
-        if (NS_FAILED(rv)) return rv;
     }
+
+    nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(mInner);
+    if (! remote)
+        return NS_ERROR_UNEXPECTED;
+
+    // We need to read this synchronously.
+    nsresult rv = remote->Refresh(PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+    
     return NS_OK;
 }
 

rdf/chrome/build/registry.rdf

@@ -7,8 +7,8 @@
 	
     <skin> 
       <RDF:Description about="chrome://global/skin/">
-	    <base>resource:/chrome/global/skin/default/</base>
-        <main>skin.css</main> 
+	    <main>skin.css</main>
+		<base>resource:/chrome/global/skin/default/</base>
       </RDF:Description> 
     </skin> 
 	

rdf/chrome/src/nsChromeRegistry.cpp

@@ -608,11 +608,16 @@ nsChromeRegistry::InitRegistry()
 
         rv = remote->Init(innerURI);
         if (NS_FAILED(rv)) return rv;
-
-        // We need to read this synchronously.
-        rv = remote->Refresh(PR_TRUE);
-        if (NS_FAILED(rv)) return rv;
     }
+
+    nsCOMPtr<nsIRDFRemoteDataSource> remote = do_QueryInterface(mInner);
+    if (! remote)
+        return NS_ERROR_UNEXPECTED;
+
+    // We need to read this synchronously.
+    nsresult rv = remote->Refresh(PR_TRUE);
+    if (NS_FAILED(rv)) return rv;
+    
     return NS_OK;
 }