Bug 37275, Changing value of all progids, and changing everywhere a progid

is mentioned to mention a contractid, including in identifiers.

r=warren

Author: rayw%netscape.com

caps/idl/nsIAggregatePrincipal.idl

@@ -23,7 +23,7 @@
 /* Defines an interface for aggregate principals. */
 
 %{C++
-#define NS_AGGREGATEPRINCIPAL_PROGID "component://netscape/aggregateprincipal"
+#define NS_AGGREGATEPRINCIPAL_CONTRACTID "@mozilla.org/aggregateprincipal;1"
 #define NS_AGGREGATEPRINCIPAL_CLASSNAME "aggregateprincipal"
 %}
 

caps/idl/nsICertificatePrincipal.idl

@@ -26,7 +26,7 @@
 #include "nsIZipReader.idl"
 
 %{C++
-#define NS_CERTIFICATEPRINCIPAL_PROGID "component://netscape/certificateprincipal"
+#define NS_CERTIFICATEPRINCIPAL_CONTRACTID "@mozilla.org/certificateprincipal;1"
 #define NS_CERTIFICATEPRINCIPAL_CLASSNAME "certificateprincipal"
 %}
 

caps/idl/nsICodebasePrincipal.idl

@@ -24,7 +24,7 @@
 interface nsIURI;
 
 %{C++
-#define NS_CODEBASEPRINCIPAL_PROGID "component://netscape/codebaseprincipal"
+#define NS_CODEBASEPRINCIPAL_CONTRACTID "@mozilla.org/codebaseprincipal;1"
 #define NS_CODEBASEPRINCIPAL_CLASSNAME "codebaseprincipal"
 %}
 

caps/idl/nsIScriptSecurityManager.idl

@@ -161,6 +161,6 @@ interface nsIScriptSecurityManager : nsISupports
 };
 
 %{C++
-#define NS_SCRIPTSECURITYMANAGER_PROGID "component://netscape/scriptsecuritymanager"
+#define NS_SCRIPTSECURITYMANAGER_CONTRACTID "@mozilla.org/scriptsecuritymanager;1"
 #define NS_SCRIPTSECURITYMANAGER_CLASSNAME "scriptsecuritymanager"
 %}

caps/idl/nsISignatureVerifier.idl

@@ -60,5 +60,5 @@ interface nsISignatureVerifier : nsISupports
 
 
 %{C++
-#define SIGNATURE_VERIFIER_PROGID "component://netscape/psm"
+#define SIGNATURE_VERIFIER_CONTRACTID "@mozilla.org/psm;1"
 %}

caps/src/nsCodebasePrincipal.cpp

@@ -85,7 +85,7 @@ nsCodebasePrincipal::CanEnableCapability(const char *capability,
     // check to see if the codebase principal pref is enabled.
     static char pref[] = "signed.applets.codebase_principal_support";
     nsresult rv;
-	NS_WITH_SERVICE(nsIPref, prefs, "component://netscape/preferences", &rv);
+	NS_WITH_SERVICE(nsIPref, prefs, "@mozilla.org/preferences;1", &rv);
 	if (NS_FAILED(rv))
 		return NS_ERROR_FAILURE;
 	PRBool enabled;

caps/src/nsScriptSecurityManager.cpp

@@ -83,7 +83,7 @@ static JSContext *
 GetCurrentContext() {
     // Get JSContext from stack.
     nsresult rv;
-    nsCOMPtr<nsIJSContextStack> stack = do_GetService("nsThreadJSContextStack", &rv);
+    nsCOMPtr<nsIJSContextStack> stack = do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
     if (NS_FAILED(rv))
         return nsnull;
     JSContext *cx;
@@ -100,7 +100,7 @@ nsScriptSecurityManager::GetCurrentContextQuick() {
     // Get JSContext from stack.
     nsresult rv;
     if (!mThreadJSContextStack) {
-        mThreadJSContextStack = do_GetService("nsThreadJSContextStack", &rv);
+        mThreadJSContextStack = do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
     }
     if (!mThreadJSContextStack)
         return nsnull;
@@ -117,7 +117,7 @@ static JSContext *
 GetSafeContext() {
     // Get the "safe" JSContext: our JSContext of last resort
     nsresult rv;
-    NS_WITH_SERVICE(nsIJSContextStack, stack, "nsThreadJSContextStack", 
+    NS_WITH_SERVICE(nsIJSContextStack, stack, "@mozilla.org/js/xpc/ContextStack;1", 
                     &rv);
     if (NS_FAILED(rv))
         return nsnull;
@@ -185,7 +185,7 @@ netscape_security_isPrivilegeEnabled(JSContext *cx, JSObject *obj, uintN argc,
     if (cap) {
         nsresult rv;
         NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                        NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                        NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
         if (NS_SUCCEEDED(rv)) {
             NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
             rv = securityManager->IsCapabilityEnabled(cap, &result);
@@ -207,7 +207,7 @@ netscape_security_enablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
         return JS_FALSE;
     nsresult rv;
     NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                    NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) 
         return JS_FALSE;
     NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
@@ -225,7 +225,7 @@ netscape_security_disablePrivilege(JSContext *cx, JSObject *obj, uintN argc,
         return JS_FALSE;
     nsresult rv;
     NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                    NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) 
         return JS_FALSE;
     NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
@@ -243,7 +243,7 @@ netscape_security_revertPrivilege(JSContext *cx, JSObject *obj, uintN argc,
         return JS_FALSE;
     nsresult rv;
     NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                    NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) 
         return JS_FALSE;
     NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
@@ -263,7 +263,7 @@ netscape_security_setCanEnablePrivilege(JSContext *cx, JSObject *obj, uintN argc
         return JS_FALSE;
     nsresult rv;
     NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                    NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) 
         return JS_FALSE;
     NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
@@ -282,7 +282,7 @@ netscape_security_invalidate(JSContext *cx, JSObject *obj, uintN argc,
         return JS_FALSE;
     nsresult rv;
     NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                    NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                    NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) 
         return JS_FALSE;
     NS_ASSERTION(cx == GetCurrentContext(), "unexpected context");
@@ -1186,7 +1186,7 @@ nsScriptSecurityManager::SetCanEnableCapability(const char* certificateID,
     if (!mSystemCertificate)
     {
         nsCOMPtr<nsIFile> systemCertFile;
-        NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
+        NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
         if (!directoryService) return NS_ERROR_FAILURE;
         rv = directoryService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsIFile), 
                               getter_AddRefs(systemCertFile));
@@ -1434,7 +1434,7 @@ nsScriptSecurityManager::nsScriptSecurityManager(void)
     NS_INIT_REFCNT();
     memset(hasDomainPolicyVector, 0, sizeof(hasDomainPolicyVector));
     InitPrefs();
-    mThreadJSContextStack = do_GetService("nsThreadJSContextStack");
+    mThreadJSContextStack = do_GetService("@mozilla.org/js/xpc/ContextStack;1");
 }
 
 nsScriptSecurityManager::~nsScriptSecurityManager(void)

caps/src/nsSecurityManagerFactory.cpp

@@ -52,13 +52,13 @@ static nsModuleComponentInfo components[] =
 {
     { NS_SCRIPTSECURITYMANAGER_CLASSNAME, 
       NS_SCRIPTSECURITYMANAGER_CID, 
-      NS_SCRIPTSECURITYMANAGER_PROGID,
+      NS_SCRIPTSECURITYMANAGER_CONTRACTID,
       Construct_nsIScriptSecurityManager 
     },
 
     { NS_CODEBASEPRINCIPAL_CLASSNAME, 
       NS_CODEBASEPRINCIPAL_CID, 
-      NS_CODEBASEPRINCIPAL_PROGID,
+      NS_CODEBASEPRINCIPAL_CONTRACTID,
       nsCodebasePrincipalConstructor
     }
 };

chrome/src/nsChromeFactory.cpp

@@ -53,13 +53,13 @@ static nsModuleComponentInfo components[] =
 {
     { "Chrome Registry", 
       NS_CHROMEREGISTRY_CID,
-      "component://netscape/chrome/chrome-registry", 
+      "@mozilla.org/chrome/chrome-registry;1", 
       NS_ConstructChromeRegistry
     },
 
     { "Chrome Protocol Handler", 
       NS_CHROMEPROTOCOLHANDLER_CID,
-      NS_NETWORK_PROTOCOL_PROGID_PREFIX "chrome", 
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "chrome", 
       nsChromeProtocolHandler::Create
     },
 };

chrome/src/nsChromeProtocolHandler.cpp

@@ -728,7 +728,7 @@ nsChromeProtocolHandler::NewChannel(nsIURI* aURI,
         if (PL_strcmp(fileExtension, "xul") == 0)
         {
             NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                            NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
+                            NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
             if (NS_FAILED(rv)) return rv;
 
             nsCOMPtr<nsIPrincipal> principal;

chrome/src/nsChromeRegistry.cpp

@@ -186,7 +186,7 @@ NS_IMETHODIMP nsOverlayEnumerator::GetNext(nsISupports **aResult)
 
   nsCOMPtr<nsIURL> url;
 
-  rv = nsComponentManager::CreateInstance("component://netscape/network/standard-url",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/network/standard-url;1",
                                           nsnull,
                                           NS_GET_IID(nsIURL),
                                           getter_AddRefs(url));
@@ -622,7 +622,7 @@ nsChromeRegistry::FindProvider(const nsCString& aPackage,
 
   // wrap it in a container
   nsCOMPtr<nsIRDFContainer> container;
-  rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                           nsnull,
                                           NS_GET_IID(nsIRDFContainer),
                                           getter_AddRefs(container));
@@ -687,7 +687,7 @@ nsChromeRegistry::SelectPackageInProvider(nsIRDFResource *aPackageList,
 
   // wrap aPackageList in a container
   nsCOMPtr<nsIRDFContainer> container;
-  rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                           nsnull,
                                           NS_GET_IID(nsIRDFContainer),
                                           getter_AddRefs(container));
@@ -851,7 +851,7 @@ NS_IMETHODIMP nsChromeRegistry::GetDynamicInfo(nsIURI *aChromeURL, PRBool aIsOve
   if (installSource)
   {
     nsCOMPtr<nsIRDFContainer> container;
-    rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+    rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                             nsnull,
                                             NS_GET_IID(nsIRDFContainer),
                                             getter_AddRefs(container));
@@ -863,7 +863,7 @@ NS_IMETHODIMP nsChromeRegistry::GetDynamicInfo(nsIURI *aChromeURL, PRBool aIsOve
   if (profileSource)
   {
     nsCOMPtr<nsIRDFContainer> container;
-    rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+    rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                             nsnull,
                                             NS_GET_IID(nsIRDFContainer),
                                             getter_AddRefs(container));
@@ -1050,7 +1050,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins()
 
   // Flush the style sheet cache completely.
   // XXX For now flush everything.  need a better call that only flushes style sheets.
-  NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "component://netscape/rdf/xul-prototype-cache", &rv);
+  NS_WITH_SERVICE(nsIXULPrototypeCache, xulCache, "@mozilla.org/rdf/xul-prototype-cache;1", &rv);
   if (NS_SUCCEEDED(rv) && xulCache) {
     xulCache->Flush();
   }
@@ -1256,7 +1256,7 @@ NS_IMETHODIMP nsChromeRegistry::WriteInfoToDataSource(const char *aDocURI,
   nsresult rv;
   nsCOMPtr<nsIURL> url;
 
-  rv = nsComponentManager::CreateInstance("component://netscape/network/standard-url",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/network/standard-url;1",
                                           nsnull,
                                           NS_GET_IID(nsIURL),
                                           getter_AddRefs(url));
@@ -1285,7 +1285,7 @@ NS_IMETHODIMP nsChromeRegistry::WriteInfoToDataSource(const char *aDocURI,
   if (NS_FAILED(rv)) return rv;
   if (!container) {
     // Already exists. Create a container instead.
-    rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+    rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                       nsnull,
                                       NS_GET_IID(nsIRDFContainer),
                                       getter_AddRefs(container));
@@ -1327,7 +1327,7 @@ NS_IMETHODIMP nsChromeRegistry::UpdateDynamicDataSource(nsIRDFDataSource *aDataS
   nsCOMPtr<nsIRDFContainer> container;
   nsresult rv;
 
-  rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                           nsnull,
                                           NS_GET_IID(nsIRDFContainer),
                                           getter_AddRefs(container));
@@ -1388,7 +1388,7 @@ NS_IMETHODIMP nsChromeRegistry::UpdateDynamicDataSources(nsIRDFDataSource *aData
   if (!resource)
     return NS_OK;
 
-  nsCOMPtr<nsIRDFContainer> container(do_CreateInstance("component://netscape/rdf/container"));
+  nsCOMPtr<nsIRDFContainer> container(do_CreateInstance("@mozilla.org/rdf/container;1"));
   if (!container)
     return NS_OK;
 
@@ -1568,7 +1568,7 @@ NS_IMETHODIMP nsChromeRegistry::SetProvider(const nsCString& aProvider,
 
   // Build an RDF container to wrap the SEQ
   nsCOMPtr<nsIRDFContainer> container;
-  rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                           nsnull,
                                           NS_GET_IID(nsIRDFContainer),
                                           getter_AddRefs(container));
@@ -1831,7 +1831,7 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
       }
 
       nsCOMPtr<nsIRDFContainer> container;
-      rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+      rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                             nsnull,
                                             NS_GET_IID(nsIRDFContainer),
                                             getter_AddRefs(container));
@@ -1846,7 +1846,7 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
         if (NS_FAILED(rv)) return rv;
         if (!installContainer) {
           // Already exists. Create a container instead.
-          rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+          rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                             nsnull,
                                             NS_GET_IID(nsIRDFContainer),
                                             getter_AddRefs(installContainer));
@@ -2025,7 +2025,7 @@ nsChromeRegistry::GetProfileRoot(nsCString& aFileURL)
 { 
   nsCOMPtr<nsIFileLocator> fl;
 
-  nsresult rv = nsComponentManager::CreateInstance("component://netscape/filelocator",
+  nsresult rv = nsComponentManager::CreateInstance("@mozilla.org/filelocator;1",
                                           nsnull,
                                           NS_GET_IID(nsIFileLocator),
                                           getter_AddRefs(fl));
@@ -2056,7 +2056,7 @@ nsChromeRegistry::GetInstallRoot(nsCString& aFileURL)
 { 
   nsresult rv;
   nsCOMPtr<nsIFileLocator> fl;
-  rv = nsComponentManager::CreateInstance("component://netscape/filelocator",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/filelocator;1",
                                           nsnull,
                                           NS_GET_IID(nsIFileLocator),
                                           getter_AddRefs(fl));
@@ -2086,7 +2086,7 @@ nsChromeRegistry::ReloadChrome()
 
   // Flush the cache completely.
   nsCOMPtr<nsIXULPrototypeCache> xulCache = 
-    do_GetService("component://netscape/rdf/xul-prototype-cache", &rv);
+    do_GetService("@mozilla.org/rdf/xul-prototype-cache;1", &rv);
   if (NS_SUCCEEDED(rv) && xulCache) {
     rv = xulCache->Flush();
     if (NS_FAILED(rv)) return rv;
@@ -2139,7 +2139,7 @@ nsChromeRegistry::GetArcs(nsIRDFDataSource* aDataSource,
                           nsISimpleEnumerator** aResult)
 {
   nsCOMPtr<nsIRDFContainer> container;
-  nsresult rv = nsComponentManager::CreateInstance("component://netscape/rdf/container",
+  nsresult rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/container;1",
                                           nsnull,
                                           NS_GET_IID(nsIRDFContainer),
                                           getter_AddRefs(container));
@@ -2173,7 +2173,7 @@ nsChromeRegistry::AddToCompositeDataSource(PRBool aUseProfile)
 {
   nsresult rv = NS_OK;
   if (!mChromeDataSource) {
-    rv = nsComponentManager::CreateInstance("component://netscape/rdf/datasource?name=composite-datasource",
+    rv = nsComponentManager::CreateInstance("@mozilla.org/rdf/datasource;1?name=composite-datasource",
                                             nsnull,
                                             NS_GET_IID(nsIRDFCompositeDataSource),
                                             getter_AddRefs(mChromeDataSource));
@@ -2299,7 +2299,7 @@ nsChromeRegistry::GetUserSheets(PRBool aIsChrome, nsISupportsArray **aResult)
 nsresult nsChromeRegistry::LoadStyleSheet(nsICSSStyleSheet** aSheet, const nsCString& aURL)
 {
   nsCOMPtr<nsIURL> url;
-  nsresult rv = nsComponentManager::CreateInstance("component://netscape/network/standard-url",
+  nsresult rv = nsComponentManager::CreateInstance("@mozilla.org/network/standard-url;1",
                                                    nsnull,
                                                    NS_GET_IID(nsIURL),
                                                    getter_AddRefs(url));
@@ -2411,7 +2411,7 @@ nsChromeRegistry::CheckForNewChrome()
 
   // open the installed-chrome file
   nsCOMPtr<nsIFileLocator> locator;
-  rv = nsComponentManager::CreateInstance("component://netscape/filelocator",
+  rv = nsComponentManager::CreateInstance("@mozilla.org/filelocator;1",
                                           nsnull,
                                           NS_GET_IID(nsIFileLocator),
                                           getter_AddRefs(locator));

chrome/tools/chromereg/regchrome.cpp

@@ -29,7 +29,7 @@ int main(int argc, char **argv)
   NS_InitXPCOM(nsnull, nsnull);
 
   nsCOMPtr <nsIChromeRegistry> chromeReg = 
-    do_GetService("component://netscape/chrome/chrome-registry");
+    do_GetService("@mozilla.org/chrome/chrome-registry;1");
   if (!chromeReg) {
     NS_WARNING("chrome check couldn't get the chrome registry");
     return NS_ERROR_FAILURE;
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
   NS_ADDREF(appFileLocProvider);
   nsresult rv;
   NS_WITH_SERVICE(nsIDirectoryService, directoryService,
-		  NS_DIRECTORY_SERVICE_PROGID, &rv);
+		  NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) {
     NS_WARNING("failed to get directory service");
     return rv;