diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 1215f8cbc70..07af13eba45 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -1082,7 +1082,7 @@ NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAReadableString& aChar
     PRInt32 n = mCharSetObservers.Count();
     for (PRInt32 i = 0; i < n; i++) {
       nsIObserver* observer = (nsIObserver*) mCharSetObservers.ElementAt(i);
-      observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset"),
+      observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset").get(),
                         nsPromiseFlatString(aCharSetID));
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
index ab7731cc1b6..ead487d64b5 100644
--- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -345,7 +345,7 @@ nsHTMLAnchorElement::StringToAttribute(nsIAtom* aAttribute,
     }
   }
   else if (aAttribute == nsHTMLAtoms::suppress) {
-    if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true"))) {
+    if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true").get())) {
       aResult.SetEmptyValue();  // XXX? shouldn't just leave "true"
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 4f2079c457c..fe7b551f98f 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -2847,7 +2847,7 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
     (do_GetService("mozilla.consoleservice.1"));
 
   if (consoleService) {
-    consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called.  Please use window.getSelection() instead."));
+    consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called.  Please use window.getSelection() instead.").get());
   }
 
   return domSelection->ToString(NS_ConvertASCIItoUCS2("text/plain"), nsIDocumentEncoder::OutputFormatted |nsIDocumentEncoder::OutputSelectionOnly, 0, aReturn);
diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
index a38dc79164d..ec89332ce33 100644
--- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -184,7 +184,7 @@ nsEvaluateStringProxy::BringUpConsole()
 
     // Next, find out whether there's a console already open.
     nsCOMPtr<nsIDOMWindowInternal> console;
-    rv = windowMediator->GetMostRecentWindow(NS_LITERAL_STRING("global:console"),
+    rv = windowMediator->GetMostRecentWindow(NS_LITERAL_STRING("global:console").get(),
                                              getter_AddRefs(console));
     if (NS_FAILED(rv)) return rv;
 
diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp
index 1215f8cbc70..07af13eba45 100644
--- a/mozilla/layout/base/src/nsDocument.cpp
+++ b/mozilla/layout/base/src/nsDocument.cpp
@@ -1082,7 +1082,7 @@ NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAReadableString& aChar
     PRInt32 n = mCharSetObservers.Count();
     for (PRInt32 i = 0; i < n; i++) {
       nsIObserver* observer = (nsIObserver*) mCharSetObservers.ElementAt(i);
-      observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset"),
+      observer->Observe((nsIDocument*) this, NS_LITERAL_STRING("charset").get(),
                         nsPromiseFlatString(aCharSetID));
     }
   }
diff --git a/mozilla/layout/base/src/nsXIFConverter.cpp b/mozilla/layout/base/src/nsXIFConverter.cpp
index 690c6f35d09..33b9194a842 100644
--- a/mozilla/layout/base/src/nsXIFConverter.cpp
+++ b/mozilla/layout/base/src/nsXIFConverter.cpp
@@ -539,7 +539,7 @@ nsXIFConverter::BeginLeaf(const nsAReadableString& aTag)
 // XXX: Complete hack to prevent the style leaf
 // From being created until the style sheet work
 // is redone. -- gpk 1/27/99
-  if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE")) == 0)
+  if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE").get()) == 0)
     return NS_OK;
 
 
@@ -556,7 +556,7 @@ nsXIFConverter::EndLeaf(const nsAReadableString& aTag)
 // XXX: Complete hack to prevent the style leaf
 // From being created until the style sheet work
 // is redone. -- gpk 1/27/99
-  if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE")) == 0)
+  if (nsCRT::strcasecmp(nsPromiseFlatString(aTag), NS_LITERAL_STRING("STYLE").get()) == 0)
     return NS_OK;
 
 
diff --git a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
index ab7731cc1b6..ead487d64b5 100644
--- a/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLAnchorElement.cpp
@@ -345,7 +345,7 @@ nsHTMLAnchorElement::StringToAttribute(nsIAtom* aAttribute,
     }
   }
   else if (aAttribute == nsHTMLAtoms::suppress) {
-    if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true"))) {
+    if (nsCRT::strcasecmp(nsPromiseFlatString(aValue), NS_LITERAL_STRING("true").get())) {
       aResult.SetEmptyValue();  // XXX? shouldn't just leave "true"
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index 4f2079c457c..fe7b551f98f 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -2847,7 +2847,7 @@ nsHTMLDocument::GetSelection(nsAWritableString& aReturn)
     (do_GetService("mozilla.consoleservice.1"));
 
   if (consoleService) {
-    consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called.  Please use window.getSelection() instead."));
+    consoleService->LogStringMessage(NS_LITERAL_STRING("Deprecated method document.getSelection() called.  Please use window.getSelection() instead.").get());
   }
 
   return domSelection->ToString(NS_ConvertASCIItoUCS2("text/plain"), nsIDocumentEncoder::OutputFormatted |nsIDocumentEncoder::OutputSelectionOnly, 0, aReturn);
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index f713094a2c4..c30cf833bf7 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -235,17 +235,17 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   PRUnichar *titleUni = nsnull;
   PRUnichar *messageUni = nsnull;
   PRUnichar *checkboxMessageUni = nsnull;
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginTitle"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginTitle").get(), 
                                  &titleUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
   }
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(), 
                                  &messageUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
   }
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginCheckboxMessage"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginCheckboxMessage").get(), 
                                  &checkboxMessageUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index f713094a2c4..c30cf833bf7 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -235,17 +235,17 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
   PRUnichar *titleUni = nsnull;
   PRUnichar *messageUni = nsnull;
   PRUnichar *checkboxMessageUni = nsnull;
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginTitle"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginTitle").get(), 
                                  &titleUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
   }
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginMessage").get(), 
                                  &messageUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
   }
-  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginCheckboxMessage"), 
+  rv = bundle->GetStringFromName(NS_LITERAL_STRING("noDefaultPluginCheckboxMessage").get(), 
                                  &checkboxMessageUni);
   if (NS_FAILED(rv)) {
     goto EXIT_DNDPD;
diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index ec22e231b48..92fb69f5295 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -1745,7 +1745,7 @@ nsProfile::ShowProfileWizard(void)
         if (NS_FAILED(rv)) return rv;
 
         nsCOMPtr<nsIURI> profURI;
-        rv = NS_NewURI(getter_AddRefs(profURI), NS_LITERAL_CSTRING(PROFILE_WIZARD_URL));
+        rv = NS_NewURI(getter_AddRefs(profURI), NS_LITERAL_CSTRING(PROFILE_WIZARD_URL).get());
         if (NS_FAILED(rv)) return rv;
 
         nsCOMPtr<nsIXULWindow> newWindow;
diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp
index 884cd24a827..e19d69e5b8a 100644
--- a/mozilla/widget/src/mac/nsMenuBar.cpp
+++ b/mozilla/widget/src/mac/nsMenuBar.cpp
@@ -514,7 +514,7 @@ NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu)
       
       //XXX "aboutStrName" should be less hardcoded
       PRUnichar *ptrv = nsnull;
-      bundle->GetStringFromName(NS_LITERAL_STRING("aboutStrName"), &ptrv);
+      bundle->GetStringFromName(NS_LITERAL_STRING("aboutStrName").get(), &ptrv);
       nsAutoString label(ptrv);
 		  nsCRT::free(ptrv);
 
diff --git a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
index 42e9f13b152..ab22aeb243c 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
@@ -129,33 +129,33 @@ nsBaseFilePicker::AppendFilters(PRInt32 aFilterMask)
   nsXPIDLString filter;
 
   if (aFilterMask & filterAll) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("allTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("allFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("allTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("allFilter").get(), getter_Copies(filter));
     AppendFilter(title,filter);
   }
   if (aFilterMask & filterHTML) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("htmlTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("htmlFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("htmlTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("htmlFilter").get(), getter_Copies(filter));
     AppendFilter(title,filter);
   }
   if (aFilterMask & filterText) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("textTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("textFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("textTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("textFilter").get(), getter_Copies(filter));
     AppendFilter(title,filter);
   }
   if (aFilterMask & filterImages) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("imageTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("imageFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("imageTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("imageFilter").get(), getter_Copies(filter));
     AppendFilter(title,filter);
   }
   if (aFilterMask & filterXML) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("xmlTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("xmlFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("xmlTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("xmlFilter").get(), getter_Copies(filter));
     AppendFilter(title,filter);
   }
   if (aFilterMask & filterXUL) {
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("xulTitle"), getter_Copies(title));
-    stringBundle->GetStringFromName(NS_LITERAL_STRING("xulFilter"), getter_Copies(filter));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("xulTitle").get(), getter_Copies(title));
+    stringBundle->GetStringFromName(NS_LITERAL_STRING("xulFilter").get(), getter_Copies(filter));
     AppendFilter(title, filter);
   }