diff --git a/gfx/thebes/public/gfxFontUtils.h b/gfx/thebes/public/gfxFontUtils.h
index 2a9a597f215..b6e3d544a39 100644
--- a/gfx/thebes/public/gfxFontUtils.h
+++ b/gfx/thebes/public/gfxFontUtils.h
@@ -336,7 +336,7 @@ public:
     static PRUint8 CharRangeBit(PRUint32 ch);
     
     // for a given font list pref name, set up a list of font names
-    static void GetPrefsFontList(const char *aPrefName, nsTArray<nsAutoString>& aFontList);
+    static void GetPrefsFontList(const char *aPrefName, nsTArray<nsString>& aFontList);
 
 };
 
diff --git a/gfx/thebes/src/gfxFontUtils.cpp b/gfx/thebes/src/gfxFontUtils.cpp
index 0aa1192587f..f43129f9167 100644
--- a/gfx/thebes/src/gfxFontUtils.cpp
+++ b/gfx/thebes/src/gfxFontUtils.cpp
@@ -428,7 +428,7 @@ PRUint8 gfxFontUtils::CharRangeBit(PRUint32 ch) {
     return NO_RANGE_FOUND;
 }
 
-void gfxFontUtils::GetPrefsFontList(const char *aPrefName, nsTArray<nsAutoString>& aFontList)
+void gfxFontUtils::GetPrefsFontList(const char *aPrefName, nsTArray<nsString>& aFontList)
 {
     const PRUnichar kComma = PRUnichar(',');
     
diff --git a/gfx/thebes/src/gfxQuartzFontCache.mm b/gfx/thebes/src/gfxQuartzFontCache.mm
index db2314faf6d..e08513effe5 100644
--- a/gfx/thebes/src/gfxQuartzFontCache.mm
+++ b/gfx/thebes/src/gfxQuartzFontCache.mm
@@ -861,7 +861,7 @@ gfxQuartzFontCache::ReadOtherFamilyNamesForFamily(const nsAString& aFamilyName)
 void
 gfxQuartzFontCache::InitSingleFaceList()
 {
-    nsAutoTArray<nsAutoString, 10> singleFaceFonts;
+    nsAutoTArray<nsString, 10> singleFaceFonts;
     gfxFontUtils::GetPrefsFontList("font.single-face-list", singleFaceFonts);
     
     PRUint32 numFonts = singleFaceFonts.Length();
@@ -906,7 +906,7 @@ gfxQuartzFontCache::InitSingleFaceList()
 void
 gfxQuartzFontCache::PreloadNamesList()
 {
-    nsAutoTArray<nsAutoString, 10> preloadFonts;
+    nsAutoTArray<nsString, 10> preloadFonts;
     gfxFontUtils::GetPrefsFontList("font.preload-names-list", preloadFonts);
     
     PRUint32 numFonts = preloadFonts.Length();
@@ -978,7 +978,7 @@ gfxQuartzFontCache::EliminateDuplicateFaces(const nsAString& aFamilyName)
 void
 gfxQuartzFontCache::InitBadUnderlineList()
 {
-    nsAutoTArray<nsAutoString, 10> blacklist;
+    nsAutoTArray<nsString, 10> blacklist;
     gfxFontUtils::GetPrefsFontList("font.blacklist.underline_offset", blacklist);
     PRUint32 numFonts = blacklist.Length();
     for (PRUint32 i = 0; i < numFonts; i++) {
diff --git a/gfx/thebes/src/gfxWindowsFonts.cpp b/gfx/thebes/src/gfxWindowsFonts.cpp
index 152044b4965..103864af711 100644
--- a/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -700,7 +700,7 @@ AddFontNameToArray(const nsAString& aName,
                    void *closure)
 {
     if (!aName.IsEmpty()) {
-        nsTArray<nsAutoString> *list = static_cast<nsTArray<nsAutoString> *>(closure);
+        nsTArray<nsString> *list = static_cast<nsTArray<nsString> *>(closure);
 
         if (list->IndexOf(aName) == list->NoIndex)
             list->AppendElement(aName);
@@ -712,7 +712,7 @@ AddFontNameToArray(const nsAString& aName,
 void
 gfxWindowsFontGroup::GroupFamilyListToArrayList(nsTArray<nsRefPtr<FontEntry> > *list)
 {
-    nsAutoTArray<nsAutoString, 15> fonts;
+    nsAutoTArray<nsString, 15> fonts;
     ForEachFont(AddFontNameToArray, &fonts);
 
     PRUint32 len = fonts.Length();
@@ -727,12 +727,12 @@ gfxWindowsFontGroup::FamilyListToArrayList(const nsString& aFamilies,
                                            const nsCString& aLangGroup,
                                            nsTArray<nsRefPtr<FontEntry> > *list)
 {
-    nsAutoTArray<nsAutoString, 15> fonts;
+    nsAutoTArray<nsString, 15> fonts;
     ForEachFont(aFamilies, aLangGroup, AddFontNameToArray, &fonts);
 
     PRUint32 len = fonts.Length();
     for (PRUint32 i = 0; i < len; ++i) {
-        const nsAutoString& str = fonts[i];
+        const nsString& str = fonts[i];
         nsRefPtr<FontEntry> fe = gfxWindowsPlatform::GetPlatform()->FindFontEntry(str, mStyle);
         list->AppendElement(fe);
     }
diff --git a/gfx/thebes/src/gfxWindowsPlatform.cpp b/gfx/thebes/src/gfxWindowsPlatform.cpp
index b78ebb41573..b865784d681 100644
--- a/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -307,7 +307,7 @@ static PRBool SimpleResolverCallback(const nsAString& aName, void* aClosure)
 void
 gfxWindowsPlatform::InitBadUnderlineList()
 {
-    nsAutoTArray<nsAutoString, 10> blacklist;
+    nsAutoTArray<nsString, 10> blacklist;
     gfxFontUtils::GetPrefsFontList("font.blacklist.underline_offset", blacklist);
     PRUint32 numFonts = blacklist.Length();
     for (PRUint32 i = 0; i < numFonts; i++) {