Index: mozilla/content/base/src/nsObjectLoadingContent.cpp =================================================================== RCS file: /cvsroot/mozilla/content/base/src/nsObjectLoadingContent.cpp,v retrieving revision 1.31 diff -pU0 -r1.31 mozilla/content/base/src/nsObjectLoadingContent.cpp --- mozilla/content/base/src/nsObjectLoadingContent.cpp +++ mozilla/content/base/src/nsObjectLoadingContent.cpp @@ -81,2 +80,0 @@ -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); - @@ -1219 +1217 @@ nsObjectLoadingContent::TypeForClassID(c - nsCOMPtr pluginHost(do_GetService(kCPluginManagerCID)); + nsCOMPtr pluginHost(do_GetService(NS_PLUGINMANAGER_CONTRACTID)); Index: mozilla/dom/src/base/nsDOMClassInfo.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp,v retrieving revision 1.377 diff -pU0 -r1.377 mozilla/dom/src/base/nsDOMClassInfo.cpp --- mozilla/dom/src/base/nsDOMClassInfo.cpp +++ mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -415 +414,0 @@ -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -9076 +9075 @@ nsHTMLPluginObjElementSH::GetPluginJSObj - do_GetService(kCPluginManagerCID); + do_GetService(NS_PLUGINMANAGER_CONTRACTID); @@ -9134 +9133 @@ nsHTMLPluginObjElementSH::NewResolve(nsI - do_GetService(kCPluginManagerCID); + do_GetService(NS_PLUGINMANAGER_CONTRACTID); Index: mozilla/dom/src/base/nsPluginArray.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsPluginArray.cpp,v retrieving revision 1.30 diff -pU0 -r1.30 mozilla/dom/src/base/nsPluginArray.cpp --- mozilla/dom/src/base/nsPluginArray.cpp +++ mozilla/dom/src/base/nsPluginArray.cpp @@ -54,2 +53,0 @@ -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); - @@ -61 +59 @@ nsPluginArray::nsPluginArray(nsNavigator - mPluginHost = do_GetService(kPluginManagerCID, &rv); + mPluginHost = do_GetService(NS_PLUGINMANAGER_CONTRACTID, &rv); @@ -170 +168 @@ nsPluginArray::GetPluginHost(nsIPluginHo - mPluginHost = do_GetService(kPluginManagerCID, &rv); + mPluginHost = do_GetService(NS_PLUGINMANAGER_CONTRACTID, &rv); @@ -204 +202 @@ nsPluginArray::Refresh(PRBool aReloadDoc - mPluginHost = do_GetService(kPluginManagerCID, &res); + mPluginHost = do_GetService(NS_PLUGINMANAGER_CONTRACTID, &res); Index: mozilla/layout/build/nsContentDLF.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/build/nsContentDLF.cpp,v retrieving revision 1.74 diff -pU0 -r1.74 mozilla/layout/build/nsContentDLF.cpp --- mozilla/layout/build/nsContentDLF.cpp +++ mozilla/layout/build/nsContentDLF.cpp @@ -68 +67,0 @@ -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -283 +282 @@ nsContentDLF::CreateInstance(const char* - nsCOMPtr ph (do_GetService(kPluginManagerCID)); + nsCOMPtr ph (do_GetService(NS_PLUGINMANAGER_CONTRACTID)); Index: mozilla/layout/generic/nsObjectFrame.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/generic/nsObjectFrame.cpp,v retrieving revision 1.561 diff -pU0 -r1.561 mozilla/layout/generic/nsObjectFrame.cpp --- mozilla/layout/generic/nsObjectFrame.cpp +++ mozilla/layout/generic/nsObjectFrame.cpp @@ -465 +464,0 @@ static NS_DEFINE_CID(kWidgetCID, NS_CHIL -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -1286 +1285 @@ nsObjectFrame::Instantiate(nsIChannel* a - nsCOMPtr pluginHost(do_GetService(kCPluginManagerCID, &rv)); + nsCOMPtr pluginHost(do_GetService(NS_PLUGINMANAGER_CONTRACTID, &rv)); @@ -1314 +1313 @@ nsObjectFrame::Instantiate(const char* a - nsCOMPtr pluginHost(do_GetService(kCPluginManagerCID, &rv)); + nsCOMPtr pluginHost(do_GetService(NS_PLUGINMANAGER_CONTRACTID, &rv)); @@ -1388 +1387 @@ nsObjectFrame::StopPlugin() - nsCOMPtr pluginHost = do_GetService(kCPluginManagerCID); + nsCOMPtr pluginHost = do_GetService(NS_PLUGINMANAGER_CONTRACTID); @@ -1537 +1536 @@ nsPluginInstanceOwner::nsPluginInstanceO - nsCOMPtr ph = do_GetService(kCPluginManagerCID); + nsCOMPtr ph = do_GetService(NS_PLUGINMANAGER_CONTRACTID); @@ -1602 +1601 @@ nsPluginInstanceOwner::~nsPluginInstance - nsCOMPtr ph = do_GetService(kCPluginManagerCID); + nsCOMPtr ph = do_GetService(NS_PLUGINMANAGER_CONTRACTID); Index: mozilla/modules/oji/src/nsJVMManager.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/oji/src/nsJVMManager.cpp,v retrieving revision 1.78 diff -pU0 -r1.78 mozilla/modules/oji/src/nsJVMManager.cpp --- mozilla/modules/oji/src/nsJVMManager.cpp +++ mozilla/modules/oji/src/nsJVMManager.cpp @@ -108,2 +107,0 @@ static NS_DEFINE_CID(kJVMManagerCID, NS_ -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); - @@ -606 +604 @@ nsJVMManager::StartupJVM(void) - do_GetService(kPluginManagerCID, &err); + do_GetService(NS_PLUGINMANAGER_CONTRACTID, &err); Index: mozilla/modules/plugin/base/public/nsIPluginManager.idl =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/base/public/nsIPluginManager.idl,v retrieving revision 1.11 diff -pU0 -r1.11 mozilla/modules/plugin/base/public/nsIPluginManager.idl --- mozilla/modules/plugin/base/public/nsIPluginManager.idl +++ mozilla/modules/plugin/base/public/nsIPluginManager.idl @@ -56,0 +57,3 @@ +#define NS_PLUGINMANAGER_CONTRACTID \ + "@mozilla.org/plugin/manager;1" + Index: mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp,v retrieving revision 1.555 diff -pU0 -r1.555 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp --- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -223 +222,0 @@ static NS_DEFINE_IID(kStringBundleServic -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL Index: mozilla/modules/plugin/base/src/nsPluginModule.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/base/src/nsPluginModule.cpp,v retrieving revision 1.16 diff -pU0 -r1.16 mozilla/modules/plugin/base/src/nsPluginModule.cpp --- mozilla/modules/plugin/base/src/nsPluginModule.cpp +++ mozilla/modules/plugin/base/src/nsPluginModule.cpp @@ -56 +56 @@ static const nsModuleComponentInfo gComp - "@mozilla.org/plugin/manager;1", + NS_PLUGINMANAGER_CONTRACTID, Index: mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp,v retrieving revision 1.15 diff -pU0 -r1.15 mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp --- mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -97 +96,0 @@ static PRInt32 gPluginObjectCount = 0; -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID ); @@ -139 +138 @@ nsSanePluginInstance::nsSanePluginInstan - if (NS_FAILED(CallCreateInstance(kCPluginManagerCID, &mPluginManager))) { + if (NS_FAILED(CallCreateInstance(NS_PLUGINMANAGER_CONTRACTID, &mPluginManager))) { Index: mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp,v retrieving revision 1.8 diff -pU0 -r1.8 mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp Index: mozilla/modules/plugin/samples/simple/npsimple.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/samples/simple/npsimple.cpp,v retrieving revision 1.46 diff -pU0 -r1.46 mozilla/modules/plugin/samples/simple/npsimple.cpp --- mozilla/modules/plugin/samples/simple/npsimple.cpp +++ mozilla/modules/plugin/samples/simple/npsimple.cpp @@ -158 +157,0 @@ static NS_DEFINE_CID(kSimplePluginCID, N -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -464 +463 @@ SimplePluginInstance::RegisterSelf(nsICo - rv = svcMgr->GetService(kPluginManagerCID, + rv = svcMgr->GetService(NS_PLUGINMANAGER_CONTRACTID, @@ -500 +499 @@ SimplePluginInstance::UnregisterSelf(nsI - rv = svcMgr->GetService(kPluginManagerCID, + rv = svcMgr->GetService(NS_PLUGINMANAGER_CONTRACTID, Index: mozilla/modules/plugin/samples/testevents/npevents.cpp =================================================================== RCS file: /cvsroot/mozilla/modules/plugin/samples/testevents/npevents.cpp,v retrieving revision 1.15 diff -pU0 -r1.15 mozilla/modules/plugin/samples/testevents/npevents.cpp --- mozilla/modules/plugin/samples/testevents/npevents.cpp +++ mozilla/modules/plugin/samples/testevents/npevents.cpp @@ -105 +104,0 @@ typedef HWND WinID; -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -313 +312 @@ EventsPluginInstance::RegisterSelf(nsICo - rv = svcMgr->GetService(kPluginManagerCID, + rv = svcMgr->GetService(NS_PLUGINMANAGER_CONTRACTID, @@ -349 +348 @@ EventsPluginInstance::UnregisterSelf(nsI - rv = svcMgr->GetService(kPluginManagerCID, + rv = svcMgr->GetService(NS_PLUGINMANAGER_CONTRACTID, Index: mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp =================================================================== RCS file: /cvsroot/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp,v retrieving revision 1.45 diff -pU0 -r1.45 mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp --- mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp +++ mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp @@ -970 +969,0 @@ static NS_DEFINE_CID(kPluginCID, NS_PLUG -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -1958 +1957 @@ CPluginManager::GetService(const nsCID& - if (aClass.Equals(kPluginManagerCID) || aClass.Equals(kMemoryCID)) { + if (aClass.Equals(NS_PLUGINMANAGER_CONTRACTID) || aClass.Equals(kMemoryCID)) { Index: mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp =================================================================== RCS file: /cvsroot/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp,v retrieving revision 1.299 diff -pU0 -r1.299 mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp --- mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -130 +129,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_ -static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); @@ -2651 +2650 @@ NS_IMETHODIMP nsExternalHelperAppService - nsCOMPtr pluginHost (do_GetService(kPluginManagerCID, &rv)); + nsCOMPtr pluginHost (do_GetService(NS_PLUGINMANAGER_CONTRACTID, &rv)); Index: mozilla/xpinstall/src/nsXPIProxy.cpp =================================================================== RCS file: /cvsroot/mozilla/xpinstall/src/nsXPIProxy.cpp,v retrieving revision 1.13 diff -pU0 -r1.13 mozilla/xpinstall/src/nsXPIProxy.cpp