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

is mentioned to mention a contractid, including in identifiers.

r=warren

docshell/shistory/public/nsISHEntry.idl

@@ -68,8 +68,8 @@ void create(in nsIURI aURI, in wstring aTitle, in nsIDOMDocument aDocument,
 #define NS_SHENTRY_CID \
 {0xbfd1a791, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
 
-#define NS_SHENTRY_PROGID \
-    "component://netscape/browser/session-history-entry"
+#define NS_SHENTRY_CONTRACTID \
+    "@mozilla.org/browser/session-history-entry;1"
 
 %}
 

docshell/shistory/public/nsISHTransaction.idl

@@ -72,7 +72,7 @@ interface nsISHTransaction : nsISupports
 #define NS_SHTRANSACTION_CID \
 {0xbfd1a792, 0xad9f, 0x11d3, {0xbd, 0xc7, 0x0, 0x50, 0x4, 0xa, 0x9b, 0x44}}
 
-#define NS_SHTRANSACTION_PROGID \
-    "component://netscape/browser/session-history-transaction"
+#define NS_SHTRANSACTION_CONTRACTID \
+    "@mozilla.org/browser/session-history-transaction;1"
 
-%}
+%}

docshell/shistory/public/nsISHistory.idl

@@ -32,7 +32,7 @@
 #define NS_SHISTORY_CID \
 {0xdd335421, 0xb8b8, 0x11d3, {0xbd, 0xc8, 0x00, 0x50, 0x04, 0x0a, 0x9b, 0x44}}
 
-#define NS_SHISTORY_PROGID "component://netscape/browser/shistory"
+#define NS_SHISTORY_CONTRACTID "@mozilla.org/browser/shistory;1"
 %}
 
 [scriptable, uuid(DD335421-B8B8-11d3-BDC8-0050040A9B44)]

docshell/shistory/src/nsSHistory.cpp

@@ -92,7 +92,7 @@ nsSHistory::AddEntry(nsISHEntry * aSHEntry, PRBool aPersist)
       return NS_OK;
       }
 
-	nsCOMPtr<nsISHTransaction> txn(do_CreateInstance(NS_SHTRANSACTION_PROGID));
+	nsCOMPtr<nsISHTransaction> txn(do_CreateInstance(NS_SHTRANSACTION_CONTRACTID));
    NS_ENSURE_TRUE(txn, NS_ERROR_FAILURE);
 
    // Set the ShEntry and parent for the transaction. setting the