diff --git a/mozilla/content/xslt/src/base/txStringUtils.h b/mozilla/content/xslt/src/base/txStringUtils.h
index 5602174ca5b..1c8ba37f79d 100644
--- a/mozilla/content/xslt/src/base/txStringUtils.h
+++ b/mozilla/content/xslt/src/base/txStringUtils.h
@@ -73,9 +73,7 @@ void TX_ToLowerCase(const nsAString& aSource, nsAString& aDest);
  */
 static PRBool TX_StringEqualsAtom(const nsAString& aString, nsIAtom* aAtom)
 {
-  const PRUnichar* atom;
-  aAtom->GetUnicode(&atom);
-  return aString.Equals(atom);
+  return aAtom->Equals(aString);
 };
 
 #endif // txStringUtils_h__
diff --git a/mozilla/content/xslt/src/xpath/txNameTest.cpp b/mozilla/content/xslt/src/xpath/txNameTest.cpp
index 7b63a478a4c..bff91f825b3 100644
--- a/mozilla/content/xslt/src/xpath/txNameTest.cpp
+++ b/mozilla/content/xslt/src/xpath/txNameTest.cpp
@@ -88,12 +88,12 @@ double txNameTest::getDefaultPriority()
 void txNameTest::toString(nsAString& aDest)
 {
     if (mPrefix) {
-        const PRUnichar* prefix;
-        mPrefix->GetUnicode(&prefix);
-        aDest.Append(nsDependentString(prefix));
+        nsAutoString prefix;
+        mPrefix->ToString(prefix);
+        aDest.Append(prefix);
         aDest.Append(PRUnichar(':'));
     }
-    const PRUnichar* localName;
-    mLocalName->GetUnicode(&localName);
-    aDest.Append(nsDependentString(localName));
+    nsAutoString localName;
+    mLocalName->ToString(localName);
+    aDest.Append(localName);
 }