bug# 29685 Eliminating unneccessary hits to registry to improve startup. Improving on previous fix. Thanks to jband's help. r=jband,dveditz a=jevering

xpcom/components/nsComponentManager.cpp

@@ -1160,7 +1160,8 @@ nsComponentManagerImpl::ProgIDToClassID(const char *aProgID, nsCID *aClass)
     else {
         // This is the first time someone has asked for this
         // ProgID. Go to the registry to find the CID.
-        res = PlatformProgIDToCLSID(aProgID, aClass);
+        if (!mPrePopulationDone)
+            res = PlatformProgIDToCLSID(aProgID, aClass);
 
         if (NS_SUCCEEDED(res)) {
             // Found it. So put it into the cache.
@@ -1626,7 +1627,7 @@ nsComponentManagerImpl::RegisterComponentCommon(const nsCID &aClass,
    // Update the ProgID->CLSID Map
     if (aProgID
 #ifdef USE_REGISTRY
-        && !aPersist
+        && (mPrePopulationDone || !aPersist)
 #endif
         ) {
         rv = HashProgID(aProgID, aClass);