From dd3dac92458021ec1a4368aa780e957564e0f317 Mon Sep 17 00:00:00 2001
From: "rayw%netscape.com"
 <rayw%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 29 Jun 2005 18:32:37 +0000
Subject: [PATCH] Bug 37275, Changing value of all progids, and changing
 everywhere a progid is mentioned to mention a contractid, including in
 identifiers.

r=warren


git-svn-id: svn://10.0.0.236/trunk@175318 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/sample/program/nsTestSample.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/xpcom/sample/program/nsTestSample.cpp b/mozilla/xpcom/sample/program/nsTestSample.cpp
index 0e59a19954e..ae514d59aae 100644
--- a/mozilla/xpcom/sample/program/nsTestSample.cpp
+++ b/mozilla/xpcom/sample/program/nsTestSample.cpp
@@ -31,7 +31,7 @@
 #include <nsIServiceManager.h>
 #include <nsXPIDLString.h>
 
-#define NS_SAMPLE_PROGID "component://netscape/sample"
+#define NS_SAMPLE_CONTRACTID "@mozilla.org/sample;1"
 
 main()
 {
@@ -59,10 +59,10 @@ main()
     (void) nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsnull);
 
     // Create an instance of our component
-    nsCOMPtr<nsISample> mysample = do_CreateInstance(NS_SAMPLE_PROGID, &rv);
+    nsCOMPtr<nsISample> mysample = do_CreateInstance(NS_SAMPLE_CONTRACTID, &rv);
     if (NS_FAILED(rv))
     {
-        printf("ERROR: Cannot create instance of component " NS_SAMPLE_PROGID " [%x].\n"
+        printf("ERROR: Cannot create instance of component " NS_SAMPLE_CONTRACTID " [%x].\n"
                "Debugging hint:\n"
                "\tsetenv NSPR_LOG_MODULES nsComponentManager:5\n"
                "\tsetenv NSPR_LOG_FILE xpcom.log\n"