Index: mozilla/dom/src/base/nsGlobalWindow.cpp
===================================================================
RCS file: /cvsroot/mozilla/dom/src/base/nsGlobalWindow.cpp,v
retrieving revision 1.842
diff -pU0 -r1.842 mozilla/dom/src/base/nsGlobalWindow.cpp
--- mozilla/dom/src/base/nsGlobalWindow.cpp
+++ mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -292 +291,0 @@ static NS_DEFINE_CID(kCharsetConverterMa
-static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); // For window.find()
@@ -4701 +4700 @@ nsGlobalWindow::FindInternal(const nsASt
-      do_GetService(kWindowMediatorCID);
+      do_GetService(NS_WINDOWMEDIATOR_CONTRACTID);
Index: mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
===================================================================
RCS file: /cvsroot/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp,v
retrieving revision 1.124
diff -pU0 -r1.124 mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
--- mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -75,3 +74,0 @@ static NS_DEFINE_CID(kSimpleURICID, NS_S
-static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
-
-
@@ -315 +312 @@ nsresult nsJSThunk::BringUpConsole(nsIDO
-        do_GetService(kWindowMediatorCID, &rv);
+        do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv);
Index: mozilla/rdf/chrome/src/nsChromeRegistry.cpp
===================================================================
RCS file: /cvsroot/mozilla/rdf/chrome/src/nsChromeRegistry.cpp,v
retrieving revision 1.328
diff -pU0 -r1.328 mozilla/rdf/chrome/src/nsChromeRegistry.cpp
--- mozilla/rdf/chrome/src/nsChromeRegistry.cpp
+++ mozilla/rdf/chrome/src/nsChromeRegistry.cpp
@@ -105 +104,0 @@ nsIAtom* nsChromeRegistry::sCPrefix; // 
-static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
@@ -1314 +1313 @@ NS_IMETHODIMP nsChromeRegistry::RefreshS
-  nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+  nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -2849 +2848 @@ nsChromeRegistry::ReloadChrome()
-  nsCOMPtr<nsIWindowMediator> windowMediator = do_GetService(kWindowMediatorCID, &rv);
+  nsCOMPtr<nsIWindowMediator> windowMediator = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv);
Index: mozilla/widget/src/photon/nsWindow.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/photon/nsWindow.cpp,v
retrieving revision 1.106
diff -pU0 -r1.106 mozilla/widget/src/photon/nsWindow.cpp
--- mozilla/widget/src/photon/nsWindow.cpp
+++ mozilla/widget/src/photon/nsWindow.cpp
@@ -794,2 +793,0 @@ int nsWindow::ResizeHandler( PtWidget_t 
-static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
-
@@ -808 +806 @@ int nsWindow::EvInfo( PtWidget_t *widget
-		nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+		nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
Index: mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp,v
retrieving revision 1.22
diff -pU0 -r1.22 mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
--- mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
+++ mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp
@@ -74,4 +73,0 @@ using namespace nsWindowUtils;
-// CIDs
-static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
-
-
@@ -94 +90 @@ static void GetXULWindowFromWindowPtr(Wi
-	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -219 +215 @@ long nsWindowUtils::CountWindowsOfKind(T
-	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -256 +252 @@ WindowPtr nsWindowUtils::GetNamedOrFront
-	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -320 +316 @@ WindowPtr nsWindowUtils::GetIndexedWindo
-	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -367 +363 @@ TAEListIndex nsWindowUtils::GetWindowInd
-	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
+	nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));