diff --git a/mozilla/dom/src/base/nsDOMWindowList.cpp b/mozilla/dom/src/base/nsDOMWindowList.cpp
index dcbd5093f41..c0715ad6aae 100644
--- a/mozilla/dom/src/base/nsDOMWindowList.cpp
+++ b/mozilla/dom/src/base/nsDOMWindowList.cpp
@@ -146,7 +146,7 @@ nsDOMWindowList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aRetur
       }
     }
 
-    mDocShellNode->FindChildWithName(nsPromiseFlatString(aName),
+    mDocShellNode->FindChildWithName(nsPromiseFlatString(aName).get(),
                                      PR_FALSE, PR_FALSE,
                                      nsnull, getter_AddRefs(item));
 
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 2b21470aac9..0f1c8b8438c 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -893,7 +893,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetStatus(const nsAReadableString& aStatus)
    nsCOMPtr<nsIWebBrowserChrome> browserChrome;
    GetWebBrowserChrome(getter_AddRefs(browserChrome));
    if(browserChrome)
-      browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT, nsPromiseFlatString(aStatus));
+      browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT, nsPromiseFlatString(aStatus).get());
 
   return NS_OK;
 }
@@ -911,7 +911,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetDefaultStatus(const nsAReadableString& aDefau
    nsCOMPtr<nsIWebBrowserChrome> browserChrome;
    GetWebBrowserChrome(getter_AddRefs(browserChrome));
    if(browserChrome)
-      browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT_DEFAULT, nsPromiseFlatString(aDefaultStatus));
+      browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_SCRIPT_DEFAULT, nsPromiseFlatString(aDefaultStatus).get());
 
   return NS_OK;
 }
@@ -932,7 +932,7 @@ NS_IMETHODIMP GlobalWindowImpl::SetName(const nsAReadableString& aName)
   nsresult result = NS_OK;
   nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(mDocShell));
   if (docShellAsItem)
-    result = docShellAsItem->SetName(nsPromiseFlatString(aName));
+    result = docShellAsItem->SetName(nsPromiseFlatString(aName).get());
   return result;
 }
 
@@ -1038,7 +1038,7 @@ GlobalWindowImpl::SetTitle(const nsAReadableString& aTitle)
         treeOwner->GetPrimaryContentShell(getter_AddRefs(primaryContent));
         nsCOMPtr<nsIBaseWindow> docShellAsWin(do_QueryInterface(primaryContent));
         if (docShellAsWin) {
-          docShellAsWin->SetTitle(nsPromiseFlatString(aTitle));
+          docShellAsWin->SetTitle(nsPromiseFlatString(aTitle).get());
         }
       }
     }
@@ -2072,7 +2072,9 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritabl
 
   PRInt32 maxByteLen, srcLen;
   srcLen = aStr.Length();
-  const PRUnichar* src = nsPromiseFlatString(aStr);
+
+  nsPromiseFlatString flatSrc(aStr);
+  const PRUnichar* src = flatSrc.get();
 
   // Get the expected length of result string
   result = encoder->GetMaxLength(src, srcLen, &maxByteLen);
diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index 876e230da4e..44a251ea2c0 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -460,7 +460,7 @@ nsJSContext::EvaluateStringWithValue(const nsAReadableString& aScript,
       ok = ::JS_EvaluateUCScriptForPrincipals(mContext,
                                               (JSObject *)aScopeObject,
                                               jsprin,
-                                              (jschar*)(const PRUnichar*)nsPromiseFlatString(aScript),
+                                              (jschar*)(const PRUnichar*)nsPromiseFlatString(aScript).get(),
                                               aScript.Length(),
                                               aURL,
                                               aLineNo,
@@ -576,7 +576,7 @@ nsJSContext::EvaluateString(const nsAReadableString& aScript,
       ok = ::JS_EvaluateUCScriptForPrincipals(mContext,
                                               (JSObject *)aScopeObject,
                                               jsprin,
-                                              (jschar*)(const PRUnichar*)nsPromiseFlatString(aScript),
+                                              (jschar*)(const PRUnichar*)nsPromiseFlatString(aScript).get(),
                                               aScript.Length(),
                                               aURL,
                                               aLineNo,
@@ -800,7 +800,7 @@ nsJSContext::CompileEventHandler(void *aTarget, nsIAtom *aName,
   JSFunction* fun =
       ::JS_CompileUCFunctionForPrincipals(mContext, target, jsprin,
                                           charName, 1, gEventArgv,
-                                          (jschar*)(const PRUnichar*)nsPromiseFlatString(aBody),
+                                          (jschar*)(const PRUnichar*)nsPromiseFlatString(aBody).get(),
                                           aBody.Length(),
                                           //XXXbe filename, lineno:
                                           nsnull, 0);
@@ -850,7 +850,7 @@ nsJSContext::CompileFunction(void* aTarget,
   JSFunction* fun =
       ::JS_CompileUCFunctionForPrincipals(mContext, target, jsprin,
                                           aName, aArgCount, aArgArray,
-                                          (jschar*)(const PRUnichar*)nsPromiseFlatString(aBody),
+                                          (jschar*)(const PRUnichar*)nsPromiseFlatString(aBody).get(),
                                           aBody.Length(),
                                           aURL, aLineNo);