diff --git a/mozilla/modules/libpr0n/public/ImageLogging.h b/mozilla/modules/libpr0n/public/ImageLogging.h
index 835df0b2914..fc101918e42 100644
--- a/mozilla/modules/libpr0n/public/ImageLogging.h
+++ b/mozilla/modules/libpr0n/public/ImageLogging.h
@@ -33,7 +33,7 @@ extern PRLogModuleInfo *gImgLog;
 
 class LogScope {
 public:
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn) :
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsACString &fn) :
     mLog(aLog), mFrom(from), mFunc(fn)
   {
     PR_LOG(mLog, PR_LOG_DEBUG, ("%d [this=%p] %s {ENTER}\n",
@@ -42,7 +42,7 @@ public:
   }
 
   /* const char * constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsACString &fn,
            const nsDependentCString &paramName, const char *paramValue) :
     mLog(aLog), mFrom(from), mFunc(fn)
   {
@@ -54,7 +54,7 @@ public:
   }
 
   /* void ptr constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsACString &fn,
            const nsDependentCString &paramName, const void *paramValue) :
     mLog(aLog), mFrom(from), mFunc(fn)
   {
@@ -66,7 +66,7 @@ public:
   }
 
   /* PRInt32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsACString &fn,
            const nsDependentCString &paramName, PRInt32 paramValue) :
     mLog(aLog), mFrom(from), mFunc(fn)
   {
@@ -78,7 +78,7 @@ public:
   }
 
   /* PRUint32 constructor */
-  LogScope(PRLogModuleInfo *aLog, void *from, const nsAReadableCString &fn,
+  LogScope(PRLogModuleInfo *aLog, void *from, const nsACString &fn,
            const nsDependentCString &paramName, PRUint32 paramValue) :
     mLog(aLog), mFrom(from), mFunc(fn)
   {
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index edce80031ad..e02119402c2 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -4115,7 +4115,7 @@ static nsresult CreateUnicodeDecoder(nsIUnicodeDecoder **aUnicodeDecoder)
 }
 
 static nsresult DoCharsetConversion(nsIUnicodeDecoder *aUnicodeDecoder, 
-                                     const char* aANSIString, nsAWritableString& aUnicodeString)
+                                     const char* aANSIString, nsAString& aUnicodeString)
 {
   NS_ENSURE_TRUE(aUnicodeDecoder, NS_ERROR_FAILURE);
   NS_ENSURE_TRUE(aANSIString, NS_ERROR_FAILURE);
@@ -4159,7 +4159,7 @@ public:
   virtual ~DOMMimeTypeImpl() {
   }
 
-  NS_METHOD GetDescription(nsAWritableString& aDescription)
+  NS_METHOD GetDescription(nsAString& aDescription)
   {
     aDescription.Assign(mDescription);
     return NS_OK;
@@ -4172,13 +4172,13 @@ public:
     return NS_OK;
   }
 
-  NS_METHOD GetSuffixes(nsAWritableString& aSuffixes)
+  NS_METHOD GetSuffixes(nsAString& aSuffixes)
   {
     aSuffixes.Assign(mSuffixes);
     return NS_OK;
   }
 
-  NS_METHOD GetType(nsAWritableString& aType)
+  NS_METHOD GetType(nsAString& aType)
   {
     aType.Assign(mType);
     return NS_OK;
@@ -4209,12 +4209,12 @@ public:
   virtual ~DOMPluginImpl() {
   }
 
-  NS_METHOD GetDescription(nsAWritableString& aDescription)
+  NS_METHOD GetDescription(nsAString& aDescription)
   {
     return DoCharsetConversion(mUnicodeDecoder, mPluginTag.mDescription, aDescription);
   }
 
-  NS_METHOD GetFilename(nsAWritableString& aFilename)
+  NS_METHOD GetFilename(nsAString& aFilename)
   {
 #ifdef XP_MAC
     return DoCharsetConversion(mUnicodeDecoder, mPluginTag.mFullPath, aFilename);
@@ -4223,7 +4223,7 @@ public:
 #endif
   }
 
-  NS_METHOD GetName(nsAWritableString& aName)
+  NS_METHOD GetName(nsAString& aName)
   {
     return DoCharsetConversion(mUnicodeDecoder, mPluginTag.mName, aName);
   }
@@ -4242,7 +4242,7 @@ public:
     return NS_OK;
   }
 
-  NS_METHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn)
+  NS_METHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn)
   {
     for (int index = mPluginTag.mVariants - 1; index >= 0; --index) {
       if (aName.Equals(NS_ConvertASCIItoUCS2(mPluginTag.mMimeTypeArray[index])))
diff --git a/mozilla/profile/src/nsProfile.h b/mozilla/profile/src/nsProfile.h
index 3f37d393307..96136e8741e 100644
--- a/mozilla/profile/src/nsProfile.h
+++ b/mozilla/profile/src/nsProfile.h
@@ -113,6 +113,6 @@ public:
     nsresult ShowProfileWizard(void);
 };
 
-extern nsresult ConvertStringToUnicode(nsString& aCharset, const char* inString, nsAWritableString& outString);
+extern nsresult ConvertStringToUnicode(nsString& aCharset, const char* inString, nsAString& outString);
 extern nsresult GetPlatformCharset(nsString& aCharset);
 
diff --git a/mozilla/profile/src/nsProfileAccess.cpp b/mozilla/profile/src/nsProfileAccess.cpp
index 65bee483a80..1818cfe8b6b 100644
--- a/mozilla/profile/src/nsProfileAccess.cpp
+++ b/mozilla/profile/src/nsProfileAccess.cpp
@@ -130,7 +130,7 @@ GetPlatformCharset(nsString& aCharset)
 
 // Apply a charset conversion from the given charset to Unicode for input C string.
 nsresult 
-ConvertStringToUnicode(nsString& aCharset, const char* inString, nsAWritableString& outString)
+ConvertStringToUnicode(nsString& aCharset, const char* inString, nsAString& outString)
 {
     nsresult rv;
     // convert result to unicode
diff --git a/mozilla/rdf/base/src/nsNameSpaceMap.cpp b/mozilla/rdf/base/src/nsNameSpaceMap.cpp
index 43b9101dd90..f7787d12871 100644
--- a/mozilla/rdf/base/src/nsNameSpaceMap.cpp
+++ b/mozilla/rdf/base/src/nsNameSpaceMap.cpp
@@ -40,7 +40,7 @@ nsNameSpaceMap::~nsNameSpaceMap()
 }
 
 nsresult
-nsNameSpaceMap::Put(const nsAReadableString& aURI, nsIAtom* aPrefix)
+nsNameSpaceMap::Put(const nsAString& aURI, nsIAtom* aPrefix)
 {
     Entry* entry;
 
@@ -60,7 +60,7 @@ nsNameSpaceMap::Put(const nsAReadableString& aURI, nsIAtom* aPrefix)
 }
 
 nsNameSpaceMap::const_iterator
-nsNameSpaceMap::GetNameSpaceOf(const nsAReadableString& aURI) const
+nsNameSpaceMap::GetNameSpaceOf(const nsAString& aURI) const
 {
     for (Entry* entry = mEntries; entry != nsnull; entry = entry->mNext) {
         if (Substring(aURI, 0, entry->mURI.Length()) == entry->mURI)
diff --git a/mozilla/rdf/base/src/nsNameSpaceMap.h b/mozilla/rdf/base/src/nsNameSpaceMap.h
index f372a5b8b73..ec1697e5cb1 100644
--- a/mozilla/rdf/base/src/nsNameSpaceMap.h
+++ b/mozilla/rdf/base/src/nsNameSpaceMap.h
@@ -31,7 +31,7 @@ class nsNameSpaceMap
 public:
     class Entry {
     public:
-        Entry(const nsAReadableString& aURI, nsIAtom* aPrefix)
+        Entry(const nsAString& aURI, nsIAtom* aPrefix)
             : mURI(aURI), mPrefix(aPrefix), mNext(nsnull) {
             MOZ_COUNT_CTOR(nsNameSpaceMap::Entry); }
 
@@ -47,7 +47,7 @@ public:
     ~nsNameSpaceMap();
 
     nsresult
-    Put(const nsAReadableString& aURI, nsIAtom* aPrefix);
+    Put(const nsAString& aURI, nsIAtom* aPrefix);
 
     class const_iterator {
     protected:
@@ -100,7 +100,7 @@ public:
     const_iterator last() const {
         return const_iterator(nsnull); }
 
-    const_iterator GetNameSpaceOf(const nsAReadableString& aURI) const;
+    const_iterator GetNameSpaceOf(const nsAString& aURI) const;
 
 protected:
     Entry* mEntries;
diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp
index 652796f9342..ede5daf04e7 100644
--- a/mozilla/rdf/base/src/nsRDFContentSink.cpp
+++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp
@@ -161,7 +161,7 @@ public:
     NS_IMETHOD WillResume(void);
     NS_IMETHOD SetParser(nsIParser* aParser);  
     NS_IMETHOD FlushPendingNotifications() { return NS_OK; }
-    NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; }
+    NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; }
 
     // nsIRDFContentSink
     NS_IMETHOD Init(nsIURI* aURL);
@@ -216,7 +216,7 @@ protected:
 
     // namespace management
     nsresult PushNameSpacesFrom(const PRUnichar** aAttributes);
-    PRBool   IsXMLNSDirective(const nsAReadableString& aAttributeKey, nsIAtom** aPrefix = nsnull);
+    PRBool   IsXMLNSDirective(const nsAString& aAttributeKey, nsIAtom** aPrefix = nsnull);
     nsresult PopNameSpaces();
 
     PRUnichar* mText;
@@ -252,12 +252,12 @@ protected:
     GetNameSpaceURI(nsIAtom* aPrefix, const char** aNameSpaceURI);
 
     nsresult
-    ParseTagString(const nsAReadableString& aTagName,
+    ParseTagString(const nsAString& aTagName,
                    const char** aNameSpaceURI,
                    nsIAtom** aTag);
 
     nsresult
-    ParseAttributeString(const nsAReadableString& aAttributeName,
+    ParseAttributeString(const nsAString& aAttributeName,
                          const char** aNameSpaceURI,
                          nsIAtom** aAttribute);
 
@@ -1462,7 +1462,7 @@ RDFContentSinkImpl::GetNameSpaceURI(nsIAtom* aPrefix, const char** aNameSpaceURI
 }
 
 nsresult
-RDFContentSinkImpl::ParseTagString(const nsAReadableString& aTagName,
+RDFContentSinkImpl::ParseTagString(const nsAString& aTagName,
                                    const char** aNameSpaceURI,
                                    nsIAtom** aTag)
 {
@@ -1477,7 +1477,7 @@ RDFContentSinkImpl::ParseTagString(const nsAReadableString& aTagName,
 
 
 nsresult
-RDFContentSinkImpl::ParseAttributeString(const nsAReadableString& aAttributeName,
+RDFContentSinkImpl::ParseAttributeString(const nsAString& aAttributeName,
                                          const char** aNameSpaceURI,
                                          nsIAtom** aAttribute)
 {
@@ -1661,7 +1661,7 @@ RDFContentSinkImpl::PopContext(nsIRDFResource         *&aResource,
 // Namespace management
 
 PRBool
-RDFContentSinkImpl::IsXMLNSDirective(const nsAReadableString& aAttributeKey, nsIAtom** aPrefix)
+RDFContentSinkImpl::IsXMLNSDirective(const nsAString& aAttributeKey, nsIAtom** aPrefix)
 {
     nsAutoString attr(aAttributeKey);
 
diff --git a/mozilla/rdf/base/src/nsRDFXMLParser.cpp b/mozilla/rdf/base/src/nsRDFXMLParser.cpp
index 37cd6c67240..f03f4b66abe 100644
--- a/mozilla/rdf/base/src/nsRDFXMLParser.cpp
+++ b/mozilla/rdf/base/src/nsRDFXMLParser.cpp
@@ -91,7 +91,7 @@ nsRDFXMLParser::ParseAsync(nsIRDFDataSource* aSink, nsIURI* aBaseURI, nsIStreamL
 }
 
 NS_IMETHODIMP
-nsRDFXMLParser::ParseString(nsIRDFDataSource* aSink, nsIURI* aBaseURI, const nsAReadableString& aString)
+nsRDFXMLParser::ParseString(nsIRDFDataSource* aSink, nsIURI* aBaseURI, const nsAString& aString)
 {
     nsresult rv;
 
diff --git a/mozilla/rdf/base/src/nsRDFXMLSerializer.cpp b/mozilla/rdf/base/src/nsRDFXMLSerializer.cpp
index d5866a3072a..3d1789d69e9 100644
--- a/mozilla/rdf/base/src/nsRDFXMLSerializer.cpp
+++ b/mozilla/rdf/base/src/nsRDFXMLSerializer.cpp
@@ -138,7 +138,7 @@ nsRDFXMLSerializer::Init(nsIRDFDataSource* aDataSource)
 }
 
 NS_IMETHODIMP
-nsRDFXMLSerializer::AddNameSpace(nsIAtom* aPrefix, const nsAReadableString& aURI)
+nsRDFXMLSerializer::AddNameSpace(nsIAtom* aPrefix, const nsAString& aURI)
 {
     mNameSpaces.Put(aURI, aPrefix);
     return NS_OK;
@@ -163,7 +163,7 @@ rdf_BlockingWrite(nsIOutputStream* stream, const char* buf, PRUint32 size)
 }
 
 static nsresult
-rdf_BlockingWrite(nsIOutputStream* stream, const nsAReadableString& s)
+rdf_BlockingWrite(nsIOutputStream* stream, const nsAString& s)
 {
     NS_ConvertUCS2toUTF8 utf8(s);
     return rdf_BlockingWrite(stream, utf8.get(), utf8.Length());
diff --git a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
index 80b89697527..c34ef5742d2 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
@@ -101,8 +101,8 @@ nsCOMPtr<nsIDOMNode> GetDOMNodeFromDocShell(nsIDocShell *aShell)
 }
 
 // generic "retrieve the value of a XUL attribute" function
-void GetAttribute(nsIXULWindow* aWindow, const nsAReadableString &anAttribute,
-                  nsAWritableString &outValue)
+void GetAttribute(nsIXULWindow* aWindow, const nsAString &anAttribute,
+                  nsAString &outValue)
 {
   nsCOMPtr<nsIDocShell> shell;
   if (aWindow &&
@@ -141,7 +141,7 @@ nsWindowInfo::~nsWindowInfo()
   
 // return true if the window described by this WindowInfo has a type
 // equal to the given type
-PRBool nsWindowInfo::TypeEquals(nsAReadableString &aType)
+PRBool nsWindowInfo::TypeEquals(const nsAString &aType)
 { 
   nsAutoString rtnString;
   GetWindowType(mWindow, rtnString);
diff --git a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.h b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.h
index f81f993a5e8..3ba5ba3b053 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.h
+++ b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.h
@@ -63,7 +63,7 @@ struct nsWindowInfo
   nsWindowInfo              *mLower,   // next lower in z-order
                             *mHigher;
   
-  PRBool TypeEquals(nsAReadableString &aType);
+  PRBool TypeEquals(const nsAString &aType);
   void   InsertAfter(nsWindowInfo *inOlder, nsWindowInfo *inHigher);
   void   Unlink(PRBool inAge, PRBool inZ);
   void   ReferenceSelf(PRBool inAge, PRBool inZ);
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index b229699150a..0a6d8e9ff2c 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -793,7 +793,7 @@ static nsresult DoOnShutdown()
   return rv;
 }
 
-static nsresult ConvertToUnicode(nsString& aCharset, const char* inString, nsAWritableString& outString)
+static nsresult ConvertToUnicode(nsString& aCharset, const char* inString, nsAString& outString)
 {
   nsresult rv;
 
diff --git a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp
index b4126f4582e..000b986ca1d 100644
--- a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp
+++ b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp
@@ -56,13 +56,13 @@ nsAutoCompleteItem::~nsAutoCompleteItem()
 {
 }
 
-NS_IMETHODIMP nsAutoCompleteItem::GetValue(nsAWritableString& aValue)
+NS_IMETHODIMP nsAutoCompleteItem::GetValue(nsAString& aValue)
 {
     aValue.Assign(mValue);
     return NS_OK;
 }
 
-NS_IMETHODIMP nsAutoCompleteItem::SetValue(const nsAReadableString& aValue)
+NS_IMETHODIMP nsAutoCompleteItem::SetValue(const nsAString& aValue)
 {
     mValue.Assign(aValue);
     return NS_OK;
diff --git a/mozilla/xpfe/components/find/src/nsFindService.cpp b/mozilla/xpfe/components/find/src/nsFindService.cpp
index f21ab10dee8..4010234f8b0 100644
--- a/mozilla/xpfe/components/find/src/nsFindService.cpp
+++ b/mozilla/xpfe/components/find/src/nsFindService.cpp
@@ -63,25 +63,25 @@ nsFindService::~nsFindService()
 NS_IMPL_ISUPPORTS1(nsFindService, nsIFindService);
 
 /* attribute AString searchString; */
-NS_IMETHODIMP nsFindService::GetSearchString(nsAWritableString & aSearchString)
+NS_IMETHODIMP nsFindService::GetSearchString(nsAString & aSearchString)
 {
     aSearchString = mSearchString;
     return NS_OK;
 }
 
-NS_IMETHODIMP nsFindService::SetSearchString(const nsAReadableString & aSearchString)
+NS_IMETHODIMP nsFindService::SetSearchString(const nsAString & aSearchString)
 {
     mSearchString = aSearchString;
     return NS_OK;
 }
 
 /* attribute AString replaceString; */
-NS_IMETHODIMP nsFindService::GetReplaceString(nsAWritableString & aReplaceString)
+NS_IMETHODIMP nsFindService::GetReplaceString(nsAString & aReplaceString)
 {
     aReplaceString = mReplaceString;
     return NS_OK;
 }
-NS_IMETHODIMP nsFindService::SetReplaceString(const nsAReadableString & aReplaceString)
+NS_IMETHODIMP nsFindService::SetReplaceString(const nsAString & aReplaceString)
 {
     mReplaceString = aReplaceString;
     return NS_OK;
diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
index 7531df9d0c0..128ffbaeb71 100644
--- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
+++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
@@ -201,7 +201,7 @@ struct searchQuery {
 };
 
 static nsresult
-PRInt64ToChars(const PRInt64& aValue, nsAWritableCString& aResult)
+PRInt64ToChars(const PRInt64& aValue, nsACString& aResult)
 {
   // Convert an unsigned 64-bit value to a string of up to aSize
   // decimal digits, placed in aBuf.
@@ -829,7 +829,7 @@ nsGlobalHistory::SetRowValue(nsIMdbRow *aRow, mdb_column aCol, const PRInt32 aVa
 
 nsresult
 nsGlobalHistory::GetRowValue(nsIMdbRow *aRow, mdb_column aCol,
-                             nsAWritableString& aResult)
+                             nsAString& aResult)
 {
   mdb_err err;
   
@@ -895,7 +895,7 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *aRow, mdb_column aCol,
 
 nsresult
 nsGlobalHistory::GetRowValue(nsIMdbRow *aRow, mdb_column aCol,
-                             nsAWritableCString& aResult)
+                             nsACString& aResult)
 {
   mdb_err err;
   
@@ -3535,7 +3535,7 @@ nsGlobalHistory::SearchEnumerator::~SearchEnumerator()
 void
 nsGlobalHistory::GetFindUriPrefix(const searchQuery& aQuery,
                                   const PRBool aDoGroupBy,
-                                  nsAWritableCString& aResult)
+                                  nsACString& aResult)
 {
   mdb_err err;
   
@@ -3976,7 +3976,7 @@ nsGlobalHistory::OnAutoComplete(const PRUnichar *searchString,
 //
 
 nsresult
-nsGlobalHistory::AutoCompleteSearch(const nsAReadableString& aSearchString,
+nsGlobalHistory::AutoCompleteSearch(const nsAString& aSearchString,
                                     AutocompleteExclude* aExclude,
                                     nsIAutoCompleteResults* aPrevResults,
                                     nsIAutoCompleteResults* aResults)
@@ -4076,7 +4076,7 @@ nsGlobalHistory::AutoCompleteSearch(const nsAReadableString& aSearchString,
 // If aURL begins with a protocol or domain prefix from our lists,
 // then mark their index in an AutocompleteExclude struct.
 void
-nsGlobalHistory::AutoCompleteGetExcludeInfo(nsAReadableString& aURL, AutocompleteExclude* aExclude)
+nsGlobalHistory::AutoCompleteGetExcludeInfo(const nsAString& aURL, AutocompleteExclude* aExclude)
 {
   aExclude->schemePrefix = -1;
   aExclude->hostnamePrefix = -1;
@@ -4104,7 +4104,7 @@ nsGlobalHistory::AutoCompleteGetExcludeInfo(nsAReadableString& aURL, Autocomplet
 // Cut any protocol and domain prefixes from aURL, except for those which
 // are specified in aExclude
 void
-nsGlobalHistory::AutoCompleteCutPrefix(nsAWritableString& aURL, AutocompleteExclude* aExclude)
+nsGlobalHistory::AutoCompleteCutPrefix(nsAString& aURL, AutocompleteExclude* aExclude)
 {
   // This comparison is case-sensitive.  Therefore, it assumes that aUserURL is a 
   // potential URL whose host name is in all lower case.
@@ -4139,7 +4139,7 @@ nsGlobalHistory::AutoCompleteCutPrefix(nsAWritableString& aURL, AutocompleteExcl
 }
 
 nsSharableString
-nsGlobalHistory::AutoCompletePrefilter(const nsAReadableString& aSearchString)
+nsGlobalHistory::AutoCompletePrefilter(const nsAString& aSearchString)
 {
   nsAutoString url(aSearchString);
 
@@ -4162,7 +4162,7 @@ nsGlobalHistory::AutoCompletePrefilter(const nsAReadableString& aSearchString)
 
 PRBool
 nsGlobalHistory::AutoCompleteCompare(nsAString& aHistoryURL, 
-                                     const nsAReadableString& aUserURL, 
+                                     const nsAString& aUserURL, 
                                      AutocompleteExclude* aExclude)
 {
   AutoCompleteCutPrefix(aHistoryURL, aExclude);
diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.h b/mozilla/xpfe/components/history/src/nsGlobalHistory.h
index 6c933aa5ca0..4ea1edfccec 100644
--- a/mozilla/xpfe/components/history/src/nsGlobalHistory.h
+++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.h
@@ -53,7 +53,7 @@
 #include "nsVoidArray.h"
 #include "nsHashtable.h"
 #include "nsCOMPtr.h"
-#include "nsAWritableString.h"
+#include "nsAString.h"
 #include "nsSharableString.h"
 #include "nsITimer.h"
 #include "nsIAutoCompleteSession.h"
@@ -190,7 +190,7 @@ protected:
   static PRBool IsFindResource(nsIRDFResource *aResource);
   void GetFindUriPrefix(const searchQuery& aQuery,
                         const PRBool aDoGroupBy,
-                        nsAWritableCString& aResult);
+                        nsACString& aResult);
   
   nsresult TokenListToSearchQuery(const nsVoidArray& tokens,
                                   searchQuery& aResult);
@@ -205,15 +205,15 @@ protected:
   nsStringArray mIgnoreSchemes;
   nsStringArray mIgnoreHostnames;
   
-  nsresult AutoCompleteSearch(const nsAReadableString& aSearchString,
+  nsresult AutoCompleteSearch(const nsAString& aSearchString,
                               AutocompleteExclude* aExclude,
                               nsIAutoCompleteResults* aPrevResults,
                               nsIAutoCompleteResults* aResults);
-  void AutoCompleteCutPrefix(nsAWritableString& aURL, AutocompleteExclude* aExclude);
-  void AutoCompleteGetExcludeInfo(nsAReadableString& aURL, AutocompleteExclude* aExclude);
-  nsSharableString AutoCompletePrefilter(const nsAReadableString& aSearchString);
+  void AutoCompleteCutPrefix(nsAString& aURL, AutocompleteExclude* aExclude);
+  void AutoCompleteGetExcludeInfo(const nsAString& aURL, AutocompleteExclude* aExclude);
+  nsSharableString AutoCompletePrefilter(const nsAString& aSearchString);
   PRBool AutoCompleteCompare(nsAString& aHistoryURL, 
-                             const nsAReadableString& aUserURL,
+                             const nsAString& aUserURL,
                              AutocompleteExclude* aExclude);
 
   // caching of PR_Now() so we don't call it every time we do
@@ -294,8 +294,8 @@ protected:
   nsresult SetRowValue(nsIMdbRow *aRow, mdb_column aCol, const char *aValue);
   nsresult SetRowValue(nsIMdbRow *aRow, mdb_column aCol, const PRUnichar *aValue);
 
-  nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, nsAWritableString& aResult);
-  nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, nsAWritableCString& aResult);
+  nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, nsAString& aResult);
+  nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, nsACString& aResult);
   nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, PRInt64* aResult);
   nsresult GetRowValue(nsIMdbRow *aRow, mdb_column aCol, PRInt32* aResult);
 
@@ -400,7 +400,7 @@ protected:
     mdb_column mTypedColumn;
     mdb_column mCommentColumn;
     AutocompleteExclude* mExclude;
-    const nsAReadableString& mSelectValue;
+    const nsAString& mSelectValue;
     PRBool mMatchOnlyTyped;
 
     virtual ~AutoCompleteEnumerator();
@@ -412,7 +412,7 @@ protected:
                            mdb_column aHiddenColumn,
                            mdb_column aTypedColumn,
                            PRBool aMatchOnlyTyped,
-                           const nsAReadableString& aSelectValue,
+                           const nsAString& aSelectValue,
                            AutocompleteExclude* aExclude) :
       mHistory(aHistory),
       mURLColumn(aURLColumn),
diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
index a02c71ddff2..926eb89f274 100755
--- a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
@@ -348,7 +348,7 @@ LocalSearchDataSource::parseResourceIntoFindTokens(nsIRDFResource *u, findTokenP
 
 PRBool
 LocalSearchDataSource::doMatch(nsIRDFLiteral *literal,
-                               const nsAReadableString &matchMethod,
+                               const nsAString &matchMethod,
                                const nsString &matchText)
 {
 	PRBool		found = PR_FALSE;
@@ -416,8 +416,8 @@ LocalSearchDataSource::doMatch(nsIRDFLiteral *literal,
 
 PRBool
 LocalSearchDataSource::doDateMatch(nsIRDFDate *aDate,
-                                   const nsAReadableString& matchMethod,
-                                   const nsAReadableString& matchText)
+                                   const nsAString& matchMethod,
+                                   const nsAString& matchText)
 {
     PRBool found = PR_FALSE;
     
@@ -435,7 +435,7 @@ LocalSearchDataSource::doDateMatch(nsIRDFDate *aDate,
 
 PRBool
 LocalSearchDataSource::doIntMatch(nsIRDFInt *aInt,
-                                  const nsAReadableString& matchMethod,
+                                  const nsAString& matchMethod,
                                   const nsString& matchText)
 {
     nsresult rv;
@@ -460,7 +460,7 @@ LocalSearchDataSource::doIntMatch(nsIRDFInt *aInt,
 }
 
 NS_METHOD
-LocalSearchDataSource::parseDate(const nsAReadableString& aDate,
+LocalSearchDataSource::parseDate(const nsAString& aDate,
                                  PRInt64 *aResult)
 {
     // date is in the form of msec since epoch, but use NSPR to
@@ -478,7 +478,7 @@ LocalSearchDataSource::parseDate(const nsAReadableString& aDate,
 
 PRBool
 LocalSearchDataSource::dateMatches(nsIRDFDate *aDate,
-                                   const nsAReadableString& method,
+                                   const nsAString& method,
                                    const PRInt64& matchDate)
 {
     PRInt64 date;
@@ -604,7 +604,7 @@ LocalSearchDataSource::parseFindURL(nsIRDFResource *u, nsISupportsArray *array)
 // to QI against that first
 PRBool
 LocalSearchDataSource::matchNode(nsIRDFNode *aValue,
-                                 const nsAReadableString& matchMethod,
+                                 const nsAString& matchMethod,
                                  const nsString& matchText)
 {
     nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface(aValue));
diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.h b/mozilla/xpfe/components/search/src/nsLocalSearchService.h
index 3f8f0be151b..f6e0992e7fe 100644
--- a/mozilla/xpfe/components/search/src/nsLocalSearchService.h
+++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.h
@@ -77,24 +77,24 @@ protected:
 
     // matching functions, based on type
 	PRBool doMatch(nsIRDFLiteral  *literal,
-                   const nsAReadableString& matchMethod,
+                   const nsAString& matchMethod,
                    const nsString& matchText);
     PRBool matchNode(nsIRDFNode *aNode,
-                     const nsAReadableString& matchMethod,
+                     const nsAString& matchMethod,
                      const nsString& matchText);
     
 	PRBool doDateMatch(nsIRDFDate *literal,
-                       const nsAReadableString& matchMethod,
-                       const nsAReadableString& matchText);
+                       const nsAString& matchMethod,
+                       const nsAString& matchText);
 	PRBool doIntMatch (nsIRDFInt  *literal,
-                       const nsAReadableString& matchMethod,
+                       const nsAString& matchMethod,
                        const nsString& matchText);
 
     PRBool dateMatches(nsIRDFDate *literal,
-                       const nsAReadableString& method,
+                       const nsAString& method,
                        const PRInt64& matchDate);
     
-    NS_METHOD   parseDate(const nsAReadableString& aDate, PRInt64* aResult);
+    NS_METHOD   parseDate(const nsAString& aDate, PRInt64* aResult);
     
 	NS_METHOD	parseFindURL(nsIRDFResource *u, nsISupportsArray *array);