unify contract ids (omitting platform); r=smontagu, rs=blizzard (also discussed

with pinkerton, sfraser, timeless, kaie, bryner and probably a few others), bug=211360

widget/src/beos/nsWidgetFactory.cpp

@@ -93,7 +93,7 @@ static const nsModuleComponentInfo components[] =
     nsToolkitConstructor },
   { "BeOS Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/beos;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "Transferrable",
     NS_TRANSFERABLE_CID,
@@ -109,7 +109,7 @@ static const nsModuleComponentInfo components[] =
     nsClipboardHelperConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/beos;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "BeOS Sound",
     NS_SOUND_CID,

widget/src/build/nsWinWidgetFactory.cpp

@@ -102,7 +102,7 @@ static const nsModuleComponentInfo components[] =
     nsToolkitConstructor },
   { "Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/win;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "Sound",
     NS_SOUND_CID,
@@ -116,7 +116,7 @@ static const nsModuleComponentInfo components[] =
     nsTransferableConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/win;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "Clipboard",
     NS_CLIPBOARD_CID,

widget/src/cocoa/nsWidgetFactory.mm

@@ -124,7 +124,7 @@ static nsModuleComponentInfo components[] =
 		nsToolkitConstructor },
 	{	"Look And Feel",
 		NS_LOOKANDFEEL_CID,
-		"@mozilla.org/widget/lookandfeel/mac;1",
+		"@mozilla.org/widget/lookandfeel;1",
 		nsLookAndFeelConstructor },
 	{	"Menubar",
 		NS_MENUBAR_CID,
@@ -148,7 +148,7 @@ static nsModuleComponentInfo components[] =
 		nsTransferableConstructor },
 	{	"HTML Format Converter",
 		NS_HTMLFORMATCONVERTER_CID,
-		"@mozilla.org/widget/htmlformatconverter/mac;1",
+		"@mozilla.org/widget/htmlformatconverter;1",
 		nsHTMLFormatConverterConstructor },
 	{	"Clipboard",
 		NS_CLIPBOARD_CID,

widget/src/gtk/nsWidgetFactory.cpp

@@ -112,7 +112,7 @@ static const nsModuleComponentInfo components[] =
     nsToolkitConstructor },
   { "Gtk Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/gtk;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "Gtk Label",
     NS_LABEL_CID,
@@ -139,7 +139,7 @@ static const nsModuleComponentInfo components[] =
     nsClipboardHelperConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/gtk;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "Gtk Drag Service",
     NS_DRAGSERVICE_CID,

widget/src/gtk2/nsWidgetFactory.cpp

@@ -80,7 +80,7 @@ static const nsModuleComponentInfo components[] =
       nsAppShellConstructor },
     { "Gtk2 Look And Feel",
       NS_LOOKANDFEEL_CID,
-      "@mozilla.org/widget/lookandfeel/gtk;1",
+      "@mozilla.org/widget/lookandfeel;1",
       nsLookAndFeelConstructor },
     { "Gtk2 Sound",
       NS_SOUND_CID,
@@ -108,7 +108,7 @@ static const nsModuleComponentInfo components[] =
     nsDragServiceConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/gtk;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "Gtk2 Bidi Keyboard",
     NS_BIDIKEYBOARD_CID,

widget/src/mac/nsWidgetFactory.cpp

@@ -153,7 +153,7 @@ static const nsModuleComponentInfo components[] =
 		nsToolkitConstructor },
 	{	"Look And Feel",
 		NS_LOOKANDFEEL_CID,
-		"@mozilla.org/widget/lookandfeel/mac;1",
+		"@mozilla.org/widget/lookandfeel;1",
 		nsLookAndFeelConstructor },
 	{	"Label",
 		NS_LABEL_CID,
@@ -181,7 +181,7 @@ static const nsModuleComponentInfo components[] =
 		nsTransferableConstructor },
 	{	"HTML Format Converter",
 		NS_HTMLFORMATCONVERTER_CID,
-		"@mozilla.org/widget/htmlformatconverter/mac;1",
+		"@mozilla.org/widget/htmlformatconverter;1",
 		nsHTMLFormatConverterConstructor },
 	{	"Clipboard",
 		NS_CLIPBOARD_CID,

widget/src/os2/nsWidgetFactory.cpp

@@ -148,7 +148,7 @@ static const nsModuleComponentInfo components[] =
     nsFilePickerConstructor },
   { "OS/2 Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/os2;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "OS/2 Sound",
     NS_SOUND_CID,
@@ -168,7 +168,7 @@ static const nsModuleComponentInfo components[] =
     nsTransferableConstructor },
   { "OS/2 HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/os2;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor }
 };
 

widget/src/photon/nsWidgetFactory.cpp

@@ -95,7 +95,7 @@ static nsModuleComponentInfo components[] =
     nsToolkitConstructor },
   { "Ph Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/ph;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "Transferrable",
     NS_TRANSFERABLE_CID,
@@ -107,7 +107,7 @@ static nsModuleComponentInfo components[] =
     nsClipboardConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/ph;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "Ph Drag Service",
     NS_DRAGSERVICE_CID,

widget/src/xlib/nsWidgetFactory.cpp

@@ -109,7 +109,7 @@ static const nsModuleComponentInfo components[] =
     nsToolkitConstructor },
   { "Xlib Look And Feel",
     NS_LOOKANDFEEL_CID,
-    "@mozilla.org/widget/lookandfeel/xlib;1",
+    "@mozilla.org/widget/lookandfeel;1",
     nsLookAndFeelConstructor },
   { "Xlib Label",
     NS_LABEL_CID,
@@ -135,7 +135,7 @@ static const nsModuleComponentInfo components[] =
     nsClipboardHelperConstructor },
   { "HTML Format Converter",
     NS_HTMLFORMATCONVERTER_CID,
-    "@mozilla.org/widget/htmlformatconverter/xlib;1",
+    "@mozilla.org/widget/htmlformatconverter;1",
     nsHTMLFormatConverterConstructor },
   { "Xlib Drag Service",
     NS_DRAGSERVICE_CID,