diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp
index f3f5a1ba90e..616d6738d11 100644
--- a/mozilla/content/base/src/nsDocumentViewer.cpp
+++ b/mozilla/content/base/src/nsDocumentViewer.cpp
@@ -7461,7 +7461,7 @@ DocumentViewerImpl::ShowPrintErrorDialog(nsresult aPrintError, PRBool aIsPrintin
   if (!msg)
     return;
 
-  nsCOMPtr<nsIWindowWatcher> wwatch = do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
+  nsCOMPtr<nsIWindowWatcher> wwatch = do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
   if (NS_FAILED(rv))
     return;
 
diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp
index a9f1d1954c0..827ad636c98 100644
--- a/mozilla/content/xml/document/src/nsXMLDocument.cpp
+++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp
@@ -294,7 +294,7 @@ nsXMLDocument::GetInterface(const nsIID& aIID, void** aSink)
     *aSink = nsnull;
 
     nsresult rv;
-    nsCOMPtr<nsIWindowWatcher> ww(do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv));
+    nsCOMPtr<nsIWindowWatcher> ww(do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv));
     if (NS_FAILED(rv))
       return rv;
 
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index cb0ef2f5d42..d2cf748bca8 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -164,7 +164,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); // For window.find()
 static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 
-static const char *sWindowWatcherContractID = "@mozilla.org/embedcomp/window-watcher;1";
 static const char *sJSStackContractID = "@mozilla.org/js/xpc/ContextStack;1";
 
 static const char *kDOMBundleURL = "chrome://global/locale/commonDialogs.properties";
@@ -4219,7 +4218,7 @@ GlobalWindowImpl::OpenInternal(const nsAString& aUrl,
   }
 
   if (NS_SUCCEEDED(rv)) {
-    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID, &rv));
+    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv));
     if (wwatch) {
       if (argc) {
         nsCOMPtr<nsPIWindowWatcher> pwwatch(do_QueryInterface(wwatch));
diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
index 8eee8239232..d7f4c904bcb 100644
--- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
+++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
@@ -1066,7 +1066,7 @@ HRESULT CMozillaBrowser::Initialize()
 
         // Attach it via the watcher service
         nsCOMPtr<nsIWindowWatcher> watcher =
-            do_GetService("@mozilla.org/embedcomp/window-watcher;1");
+            do_GetService(NS_WINDOWWATCHER_CONTRACTID);
         if (watcher)
             watcher->SetWindowCreator(windowCreator);
     }
diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
index 39d2d3ff0e6..67870703082 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
@@ -68,8 +68,6 @@ gtk_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count);
 
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 
-static const char sWatcherContractID[] = "@mozilla.org/embedcomp/window-watcher;1";
-
 PRUint32     EmbedPrivate::sWidgetCount = 0;
 char        *EmbedPrivate::sCompPath    = nsnull;
 nsIAppShell *EmbedPrivate::sAppShell    = nsnull;
@@ -163,7 +161,7 @@ EmbedPrivate::Init(GtkMozEmbed *aOwningWidget)
     windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
 
     // Attach it via the watcher service
-    nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(sWatcherContractID);
+    nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
     if (watcher)
       watcher->SetWindowCreator(windowCreator);
   }
diff --git a/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp b/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
index 7e827ed34f3..5c3633db763 100644
--- a/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
+++ b/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
@@ -81,8 +81,6 @@
 
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 
-static const char sWatcherContractID[] = "@mozilla.org/embedcomp/window-watcher;1";
-
 nsIAppShell *EmbedPrivate::sAppShell    = nsnull;
 nsIPref     *EmbedPrivate::sPrefs       = nsnull;
 nsVoidArray *EmbedPrivate::sWindowList  = nsnull;
@@ -173,7 +171,7 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget)
 		windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
 
 		// Attach it via the watcher service
-		nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(sWatcherContractID);
+		nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
 		if (watcher)
       		watcher->SetWindowCreator(windowCreator);
   }
diff --git a/mozilla/embedding/browser/photon/src/PromptService.cpp b/mozilla/embedding/browser/photon/src/PromptService.cpp
index 6d1b1cbf03b..027f8eeff11 100644
--- a/mozilla/embedding/browser/photon/src/PromptService.cpp
+++ b/mozilla/embedding/browser/photon/src/PromptService.cpp
@@ -83,7 +83,7 @@ private:
 NS_IMPL_ISUPPORTS2(CPromptService, nsIPromptService, nsPIPromptService)
 
 CPromptService::CPromptService() :
-	mWWatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1")) {
+	mWWatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID)) {
 	NS_INIT_REFCNT();
 	}
 
@@ -95,7 +95,7 @@ PtWidget_t *CPromptService::GetWebBrowser(nsIDOMWindow *aWindow)
   nsCOMPtr<nsIWebBrowserChrome> chrome;
   PtWidget_t *val = 0;
 
-	nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+	nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
 	if (!wwatch) return nsnull;
 
   if( wwatch ) {
diff --git a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp
index a52da34095f..0f55277d132 100644
--- a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp
+++ b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp
@@ -137,7 +137,7 @@ PtWidget_t *nsUnknownContentTypeHandler::GetWebBrowser(nsIDOMWindow *aWindow)
   nsCOMPtr<nsIWebBrowserChrome> chrome;
   PtWidget_t *val = 0;
 
-  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   if (!wwatch) return nsnull;
 
   if( wwatch ) {
diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserChrome.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserChrome.cpp
index 389f891fd52..5b587141392 100644
--- a/mozilla/embedding/browser/powerplant/source/CBrowserChrome.cpp
+++ b/mozilla/embedding/browser/powerplant/source/CBrowserChrome.cpp
@@ -554,7 +554,7 @@ LWindow* CBrowserChrome::GetLWindowForDOMWindow(nsIDOMWindow* aDOMWindow)
     if (!aDOMWindow)
         return nsnull;
         
-    nsCOMPtr<nsIWindowWatcher> windowWatcher(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+    nsCOMPtr<nsIWindowWatcher> windowWatcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
     if (!windowWatcher)
         return nsnull;
     nsCOMPtr<nsIWebBrowserChrome> windowChrome;
diff --git a/mozilla/embedding/browser/powerplant/source/CWindowCreator.cpp b/mozilla/embedding/browser/powerplant/source/CWindowCreator.cpp
index 690f46666e9..2020c47e7f1 100644
--- a/mozilla/embedding/browser/powerplant/source/CWindowCreator.cpp
+++ b/mozilla/embedding/browser/powerplant/source/CWindowCreator.cpp
@@ -148,7 +148,7 @@ nsresult CWindowCreator::Initialize()
     CWindowCreator *windowCreator = new CWindowCreator;
     if (!windowCreator) return NS_ERROR_FAILURE;
     
-    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
     if (!wwatch) return NS_ERROR_FAILURE;
     return wwatch->SetWindowCreator(windowCreator);
 }
diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index 7994c1454f1..6466a30e636 100644
--- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -69,9 +69,6 @@
 #include "nsIDragDropOverride.h"
 #include "nsIContent.h"
 
-static const char sWindowWatcherContractID[] = "@mozilla.org/embedcomp/window-watcher;1";
-
-
 //
 // GetEventReceiver
 //
@@ -300,7 +297,7 @@ nsresult nsDocShellTreeOwner::FindItemWithNameAcrossWindows(
                 nsIDocShellTreeItem** aFoundItem)
 {
   // search for the item across the list of top-level windows
-  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   if (!wwatch)
     return NS_OK;
 
@@ -343,7 +340,7 @@ void nsDocShellTreeOwner::EnsurePrompter()
   if (mPrompter)
     return;
 
-  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   if (wwatch && mWebBrowser) {
     nsCOMPtr<nsIDOMWindow> domWindow;
     mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
@@ -357,7 +354,7 @@ void nsDocShellTreeOwner::EnsureAuthPrompter()
   if (mAuthPrompter)
     return;
 
-  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   if (wwatch && mWebBrowser) {
     nsCOMPtr<nsIDOMWindow> domWindow;
     mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
@@ -372,7 +369,7 @@ void nsDocShellTreeOwner::AddToWatcher() {
     nsCOMPtr<nsIDOMWindow> domWindow;
     mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
     if (domWindow) {
-      nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
+      nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
       if (wwatch)
         wwatch->AddWindow(domWindow, mWebBrowserChrome);
     }
@@ -385,7 +382,7 @@ void nsDocShellTreeOwner::RemoveFromWatcher() {
     nsCOMPtr<nsIDOMWindow> domWindow;
     mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
     if (domWindow) {
-      nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(sWindowWatcherContractID));
+      nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
       if (wwatch)
         wwatch->RemoveWindow(domWindow);
     }
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
index 79a9e714b64..bfed7f4889f 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -91,7 +91,7 @@ nsWebBrowser::nsWebBrowser() : mDocShellTreeOwner(nsnull),
 {
     NS_INIT_REFCNT();
     mInitInfo = new nsWebBrowserInitInfo();
-    mWWatch = do_GetService("@mozilla.org/embedcomp/window-watcher;1");
+    mWWatch = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
     NS_ASSERTION(mWWatch, "failed to get WindowWatcher");
 }
 
diff --git a/mozilla/embedding/components/jsconsole/src/nsJSConsoleService.cpp b/mozilla/embedding/components/jsconsole/src/nsJSConsoleService.cpp
index bde23026c57..86121c5ee37 100644
--- a/mozilla/embedding/components/jsconsole/src/nsJSConsoleService.cpp
+++ b/mozilla/embedding/components/jsconsole/src/nsJSConsoleService.cpp
@@ -64,7 +64,7 @@ nsJSConsoleService::~nsJSConsoleService()
 NS_IMETHODIMP
 nsJSConsoleService :: Open ( nsIDOMWindow *inParent )               
 {
-  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
+  nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
   if (!wwatch)
     return NS_ERROR_FAILURE;
 
diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
index 4afb6ce2f65..6bcd4734522 100644
--- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
@@ -309,7 +309,7 @@ static pascal TPPrDlg MyJobDlgInit(THPrint aHPrint)
 NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener)
 
 nsPrintingPromptService::nsPrintingPromptService() :
-    mWatcher(do_GetService("@mozilla.org/embedcomp/window-watcher;1"))
+    mWatcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID))
 {
     NS_INIT_REFCNT();
 }
diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
index 8e3f934e2c2..96caa4ede74 100644
--- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
+++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
@@ -130,7 +130,7 @@ static CFPlugInRef LoadPDEPlugIn()
 NS_IMPL_ISUPPORTS2(nsPrintingPromptService, nsIPrintingPromptService, nsIWebProgressListener)
 
 nsPrintingPromptService::nsPrintingPromptService() :
-    mWatcher(do_GetService("@mozilla.org/embedcomp/window-watcher;1"))
+    mWatcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID))
 {
     NS_INIT_REFCNT();
 }
diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
index e445479b46e..2fae6544277 100644
--- a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
@@ -112,7 +112,7 @@ nsresult
 nsPrintingPromptService::Init()
 {
     nsresult rv;
-    mWatcher = do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
+    mWatcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
     return rv;
 }
 
diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
index 7b10a8c43b3..b03b6b3fdf0 100644
--- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
@@ -107,7 +107,7 @@ nsresult
 nsPrintingPromptService::Init()
 {
     nsresult rv;
-    mWatcher = do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
+    mWatcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
     return rv;
 }
 
diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp
index f3f5a1ba90e..616d6738d11 100644
--- a/mozilla/layout/base/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/nsDocumentViewer.cpp
@@ -7461,7 +7461,7 @@ DocumentViewerImpl::ShowPrintErrorDialog(nsresult aPrintError, PRBool aIsPrintin
   if (!msg)
     return;
 
-  nsCOMPtr<nsIWindowWatcher> wwatch = do_GetService("@mozilla.org/embedcomp/window-watcher;1", &rv);
+  nsCOMPtr<nsIWindowWatcher> wwatch = do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
   if (NS_FAILED(rv))
     return;