diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index bf62e92ffa5..4bf9e27c233 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -755,8 +755,8 @@ void nsCString::AssignWithConversion( const nsAString& aString ) {
   PRInt32 count = aString.Length();
 
   if(count){   
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       PRUint32 fraglen = start.size_forward();
@@ -778,8 +778,8 @@ void nsCString::AppendWithConversion( const nsAString& aString ) {
   PRInt32 count = aString.Length();
 
   if(count){   
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       PRUint32 fraglen = start.size_forward();
@@ -1345,8 +1345,8 @@ void nsCString::DebugDump(void) const {
 
 NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAString& aString )
   {
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       nsReadableFragment<PRUnichar> frag(start.fragment());
diff --git a/mozilla/string/public/nsDependentSubstring.h b/mozilla/string/public/nsDependentSubstring.h
index 3a277d5252d..2169831810d 100644
--- a/mozilla/string/public/nsDependentSubstring.h
+++ b/mozilla/string/public/nsDependentSubstring.h
@@ -166,14 +166,14 @@ Substring( const nsAString& aString, PRUint32 aStartPos, PRUint32 aSubstringLeng
 
 inline
 const nsDependentCSubstring
-Substring( const nsReadingIterator<char>& aStart, const nsReadingIterator<char>& aEnd )
+Substring( const nsACString::const_iterator& aStart, const nsACString::const_iterator& aEnd )
   {
     return nsDependentCSubstring(aStart, aEnd);
   }
 
 inline
 const nsDependentSubstring
-Substring( const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+Substring( const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     return nsDependentSubstring(aStart, aEnd);
   }
diff --git a/mozilla/string/public/nsReadableUtils.h b/mozilla/string/public/nsReadableUtils.h
index 54927d7f623..df3e264d960 100755
--- a/mozilla/string/public/nsReadableUtils.h
+++ b/mozilla/string/public/nsReadableUtils.h
@@ -40,8 +40,8 @@
 #endif
 
 
-NS_COM size_t Distance( const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
-NS_COM size_t Distance( const nsReadingIterator<char>&, const nsReadingIterator<char>& );
+NS_COM size_t Distance( const nsAString::const_iterator&, const nsAString::const_iterator& );
+NS_COM size_t Distance( const nsACString::const_iterator&, const nsACString::const_iterator& );
 
 
 NS_COM void CopyUCS2toASCII( const nsAString& aSource, nsACString& aDest );
@@ -140,8 +140,8 @@ NS_COM PRUnichar* CopyUnicodeTo( const nsAString& aSource,
    * @param aSrcEnd end source iterator
    * @param aDest destination for the copy
    */
-NS_COM void CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                           const nsReadingIterator<PRUnichar>& aSrcEnd,
+NS_COM void CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                           const nsAString::const_iterator& aSrcEnd,
                            nsAString& aDest );
 
   /**
@@ -154,8 +154,8 @@ NS_COM void CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
    * @param aSrcEnd end source iterator
    * @param aDest destination for the copy
    */
-NS_COM void AppendUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                             const nsReadingIterator<PRUnichar>& aSrcEnd,
+NS_COM void AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                             const nsAString::const_iterator& aSrcEnd,
                              nsAString& aDest );
 
   /**
@@ -185,11 +185,11 @@ NS_COM void ToLowerCase( nsACString& );
    * Currently, this is equivalent to the O(m*n) implementation previously on |ns[C]String|.
    * If we need something faster, then we can implement that later.
    */
-NS_COM PRBool FindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool FindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool FindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool FindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
-NS_COM PRBool CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool CaseInsensitiveFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
 
   /**
@@ -200,8 +200,8 @@ NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadi
    * Currently, this is equivalent to the O(m*n) implementation previously on |ns[C]String|.
    * If we need something faster, then we can implement that later.
    */
-NS_COM PRBool RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool RFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
    /**
    * Finds the leftmost occurance of |aChar|, if any in the range 
@@ -211,8 +211,8 @@ NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsReadingIterator<cha
    * point to the match.  If no match was found, returns |PR_FALSE| and 
    * makes |aSearchStart == aSearchEnd|.
    */
-NS_COM PRBool FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart, const nsReadingIterator<PRUnichar>& aSearchEnd );
-NS_COM PRBool FindCharInReadable( char aChar, nsReadingIterator<char>& aSearchStart, const nsReadingIterator<char>& aSearchEnd );
+NS_COM PRBool FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd );
+NS_COM PRBool FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd );
 
     /**
     * Finds the number of occurences of |aChar| in the string |aStr|
diff --git a/mozilla/string/public/nsSharedBufferList.h b/mozilla/string/public/nsSharedBufferList.h
index ab587778056..fcd1be881cd 100755
--- a/mozilla/string/public/nsSharedBufferList.h
+++ b/mozilla/string/public/nsSharedBufferList.h
@@ -116,7 +116,7 @@ class NS_COM nsSharedBufferList
 
             // iff |aIter| is a valid iterator into a |nsSharedBufferList|
           explicit
-          Position( const nsReadingIterator<PRUnichar>& aIter )
+          Position( const nsAString::const_iterator& aIter )
               : mBuffer( NS_CONST_CAST(Buffer*, NS_REINTERPRET_CAST(const Buffer*, aIter.fragment().mFragmentIdentifier)) ),
                 mPosInBuffer( NS_CONST_CAST(PRUnichar*, aIter.get()) )
             {
@@ -125,7 +125,7 @@ class NS_COM nsSharedBufferList
 
             // iff |aIter| is a valid iterator into a |nsSharedBufferList|
           Position&
-          operator=( const nsReadingIterator<PRUnichar>& aIter )
+          operator=( const nsAString::const_iterator& aIter )
             {
               mBuffer       = NS_CONST_CAST(Buffer*, NS_REINTERPRET_CAST(const Buffer*, aIter.fragment().mFragmentIdentifier));
               mPosInBuffer  = NS_CONST_CAST(PRUnichar*, aIter.get());
diff --git a/mozilla/string/public/nsSlidingString.h b/mozilla/string/public/nsSlidingString.h
index abe764b0413..5c4901319b0 100755
--- a/mozilla/string/public/nsSlidingString.h
+++ b/mozilla/string/public/nsSlidingString.h
@@ -92,16 +92,16 @@ class NS_COM nsSlidingSubstring
         }
 
       nsSlidingSubstring( const nsSlidingSubstring& );  // copy-constructor
-      nsSlidingSubstring( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd );
+      nsSlidingSubstring( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd );
       nsSlidingSubstring( const nsSlidingString& );
-      nsSlidingSubstring( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd );
+      nsSlidingSubstring( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd );
       explicit nsSlidingSubstring( const nsAString& );
         // copy the supplied string into a new buffer ... there will be no modifying instance over this buffer list
 
       void Rebind( const nsSlidingSubstring& );
-      void Rebind( const nsSlidingSubstring&, const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
+      void Rebind( const nsSlidingSubstring&, const nsAString::const_iterator&, const nsAString::const_iterator& );
       void Rebind( const nsSlidingString& );
-      void Rebind( const nsSlidingString&, const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
+      void Rebind( const nsSlidingString&, const nsAString::const_iterator&, const nsAString::const_iterator& );
       void Rebind( const nsAString& );
 
      ~nsSlidingSubstring();
@@ -177,14 +177,14 @@ class NS_COM nsSlidingString
 
 //    void Append( ... ); do you want some |Append|s that copy the supplied data?
 
-      void DiscardPrefix( const nsReadingIterator<PRUnichar>& );
+      void DiscardPrefix( const nsAString::const_iterator& );
         // any other way you want to do this?
 
     protected:
       virtual const PRUnichar* GetReadableFragment( nsReadableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) const;
       virtual       PRUnichar* GetWritableFragment( nsWritableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) { return 0; }
 
-      void InsertReadable( const nsAString&, const nsReadingIterator<PRUnichar>& ); // ...to implement |nsScannerString::UngetReadable| 
+      void InsertReadable( const nsAString&, const nsAString::const_iterator& ); // ...to implement |nsScannerString::UngetReadable| 
 
     private:
 
diff --git a/mozilla/string/src/nsReadableUtils.cpp b/mozilla/string/src/nsReadableUtils.cpp
index 8198eccc774..1ace64cdee3 100755
--- a/mozilla/string/src/nsReadableUtils.cpp
+++ b/mozilla/string/src/nsReadableUtils.cpp
@@ -94,14 +94,14 @@ Distance_Impl( const nsReadingIterator<CharT>& aStart,
 
 NS_COM
 size_t
-Distance( const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+Distance( const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     return Distance_Impl(aStart, aEnd);
   }
 
 NS_COM
 size_t
-Distance( const nsReadingIterator<char>& aStart, const nsReadingIterator<char>& aEnd )
+Distance( const nsACString::const_iterator& aStart, const nsACString::const_iterator& aEnd )
   {
     return Distance_Impl(aStart, aEnd);
   }
@@ -150,9 +150,9 @@ CopyUCS2toASCII( const nsAString& aSource, nsACString& aDest )
       // right now, this won't work on multi-fragment destinations
     aDest.SetLength(aSource.Length());
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
 
-    nsWritingIterator<char> toBegin;
+    nsACString::iterator toBegin;
     LossyConvertEncoding<PRUnichar, char> converter(aDest.BeginWriting(toBegin).get());
     
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
@@ -165,9 +165,9 @@ CopyASCIItoUCS2( const nsACString& aSource, nsAString& aDest )
       // right now, this won't work on multi-fragment destinations
     aDest.SetLength(aSource.Length());
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
 
-    nsWritingIterator<PRUnichar> toBegin;
+    nsAString::iterator toBegin;
     LossyConvertEncoding<char, PRUnichar> converter(aDest.BeginWriting(toBegin).get());
 
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
@@ -196,7 +196,7 @@ ToNewCString( const nsAString& aSource )
   {
     char* result = AllocateStringCopy(aSource, (char*)0);
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     LossyConvertEncoding<PRUnichar, char> converter(result);
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter).write_terminator();
     return result;
@@ -234,7 +234,7 @@ ToNewCString( const nsACString& aSource )
 
     char* result = AllocateStringCopy(aSource, (char*)0);
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
     char* toBegin = result;
     *copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), toBegin) = char(0);
     return result;
@@ -248,7 +248,7 @@ ToNewUnicode( const nsAString& aSource )
 
     PRUnichar* result = AllocateStringCopy(aSource, (PRUnichar*)0);
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     PRUnichar* toBegin = result;
     *copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), toBegin) = PRUnichar(0);
     return result;
@@ -260,7 +260,7 @@ ToNewUnicode( const nsACString& aSource )
   {
     PRUnichar* result = AllocateStringCopy(aSource, (PRUnichar*)0);
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
     LossyConvertEncoding<char, PRUnichar> converter(result);
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter).write_terminator();
     return result;
@@ -270,7 +270,7 @@ NS_COM
 PRUnichar*
 CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest, PRUint32 aLength )
   {
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     PRUnichar* toBegin = aDest;    
     copy_string(aSource.BeginReading(fromBegin).advance( PRInt32(aSrcOffset) ), aSource.BeginReading(fromEnd).advance( PRInt32(aSrcOffset+aLength) ), toBegin);
     return aDest;
@@ -278,29 +278,29 @@ CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest,
 
 NS_COM 
 void 
-CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-               const nsReadingIterator<PRUnichar>& aSrcEnd,
+CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
+               const nsAString::const_iterator& aSrcEnd,
                nsAString& aDest )
   {
-    nsWritingIterator<PRUnichar> writer;
+    nsAString::iterator writer;
     aDest.SetLength(Distance(aSrcStart, aSrcEnd));
     aDest.BeginWriting(writer);
-    nsReadingIterator<PRUnichar> fromBegin(aSrcStart);
+    nsAString::const_iterator fromBegin(aSrcStart);
     
     copy_string(fromBegin, aSrcEnd, writer);
   }
 
 NS_COM 
 void 
-AppendUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                 const nsReadingIterator<PRUnichar>& aSrcEnd,
+AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                 const nsAString::const_iterator& aSrcEnd,
                  nsAString& aDest )
   {
-    nsWritingIterator<PRUnichar> writer;
+    nsAString::iterator writer;
     PRUint32 oldLength = aDest.Length();
     aDest.SetLength(oldLength + Distance(aSrcStart, aSrcEnd));
     aDest.BeginWriting(writer).advance(oldLength);
-    nsReadingIterator<PRUnichar> fromBegin(aSrcStart);
+    nsAString::const_iterator fromBegin(aSrcStart);
     
     copy_string(fromBegin, aSrcEnd, writer);
   }
@@ -314,12 +314,12 @@ IsASCII( const nsAString& aString )
 
     // Don't want to use |copy_string| for this task, since we can stop at the first non-ASCII character
 
-    nsReadingIterator<PRUnichar> done_reading;
+    nsAString::const_iterator done_reading;
     aString.EndReading(done_reading);
 
       // for each chunk of |aString|...
     PRUint32 fragmentLength = 0;
-    nsReadingIterator<PRUnichar> iter;
+    nsAString::const_iterator iter;
     for ( aString.BeginReading(iter); iter != done_reading; iter.advance( PRInt32(fragmentLength) ) )
       {
         fragmentLength = PRUint32(iter.size_forward());
@@ -503,28 +503,28 @@ class CaseInsensitiveCharComparator
 
 NS_COM
 PRBool
-FindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+FindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseSensitivePRUnicharComparator());
   }
 
 NS_COM
 PRBool
-FindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+FindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseSensitiveCharComparator());
   }
 
 NS_COM
 PRBool
-CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+CaseInsensitiveFindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseInsensitivePRUnicharComparator());
   }
 
 NS_COM
 PRBool
-CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseInsensitiveCharComparator());
   }
@@ -536,12 +536,12 @@ CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<cha
    */
 NS_COM
 PRBool
-RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+RFindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     PRBool found_it = PR_FALSE;
 
-    nsReadingIterator<PRUnichar> savedSearchEnd(aSearchEnd);
-    nsReadingIterator<PRUnichar> searchStart(aSearchStart), searchEnd(aSearchEnd);
+    nsAString::const_iterator savedSearchEnd(aSearchEnd);
+    nsAString::const_iterator searchStart(aSearchStart), searchEnd(aSearchEnd);
 
     while ( searchStart != searchEnd )
       {
@@ -569,12 +569,12 @@ RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearc
 
 NS_COM
 PRBool
-RFindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+RFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     PRBool found_it = PR_FALSE;
 
-    nsReadingIterator<char> savedSearchEnd(aSearchEnd);
-    nsReadingIterator<char> searchStart(aSearchStart), searchEnd(aSearchEnd);
+    nsACString::const_iterator savedSearchEnd(aSearchEnd);
+    nsACString::const_iterator searchStart(aSearchStart), searchEnd(aSearchEnd);
 
     while ( searchStart != searchEnd )
       {
@@ -629,10 +629,10 @@ nsSubstituteString::MaxLength() const
 void
 nsSubstituteString::CountMatches() const
   {
-    nsReadingIterator<PRUnichar> textEnd;
-    nsReadingIterator<PRUnichar> searchEnd = mText.EndReading(textEnd);
+    nsAString::const_iterator textEnd;
+    nsAString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<PRUnichar> searchStart;
+    nsAString::const_iterator searchStart;
     mText.BeginReading(searchStart);
 
     PRInt32 numberOfMatches = 0;
@@ -657,14 +657,14 @@ nsSubstituteString::Length() const
 PRUnichar*
 nsSubstituteString::operator()( PRUnichar* aDestBuffer ) const
   {
-    nsReadingIterator<PRUnichar> replacementEnd;
+    nsAString::const_iterator replacementEnd;
     mReplacement.EndReading(replacementEnd);
 
-    nsReadingIterator<PRUnichar> textEnd;
-    nsReadingIterator<PRUnichar> searchEnd = mText.EndReading(textEnd);
+    nsAString::const_iterator textEnd;
+    nsAString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<PRUnichar> uncopiedStart;
-    nsReadingIterator<PRUnichar> searchStart = mText.BeginReading(uncopiedStart);
+    nsAString::const_iterator uncopiedStart;
+    nsAString::const_iterator searchStart = mText.BeginReading(uncopiedStart);
 
     while ( FindInReadable(mPattern, searchStart, searchEnd) )
       {
@@ -674,7 +674,7 @@ nsSubstituteString::operator()( PRUnichar* aDestBuffer ) const
         copy_string(uncopiedStart, searchStart, aDestBuffer);  // updates |aDestBuffer|
 
           // copy the replacement
-        nsReadingIterator<PRUnichar> replacementStart;
+        nsAString::const_iterator replacementStart;
         copy_string(mReplacement.BeginReading(replacementStart), replacementEnd, aDestBuffer);
 
           // start searching from where the current match ends
@@ -716,10 +716,10 @@ nsSubstituteCString::MaxLength() const
 void
 nsSubstituteCString::CountMatches() const
   {
-    nsReadingIterator<char> textEnd;
-    nsReadingIterator<char> searchEnd = mText.EndReading(textEnd);
+    nsACString::const_iterator textEnd;
+    nsACString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<char> searchStart;
+    nsACString::const_iterator searchStart;
     mText.BeginReading(searchStart);
 
     PRInt32 numberOfMatches = 0;
@@ -744,14 +744,14 @@ nsSubstituteCString::Length() const
 char*
 nsSubstituteCString::operator()( char* aDestBuffer ) const
   {
-    nsReadingIterator<char> replacementEnd;
+    nsACString::const_iterator replacementEnd;
     mReplacement.EndReading(replacementEnd);
 
-    nsReadingIterator<char> textEnd;
-    nsReadingIterator<char> searchEnd = mText.EndReading(textEnd);
+    nsACString::const_iterator textEnd;
+    nsACString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<char> uncopiedStart;
-    nsReadingIterator<char> searchStart = mText.BeginReading(uncopiedStart);
+    nsACString::const_iterator uncopiedStart;
+    nsACString::const_iterator searchStart = mText.BeginReading(uncopiedStart);
 
     while ( FindInReadable(mPattern, searchStart, searchEnd) )
       {
@@ -761,7 +761,7 @@ nsSubstituteCString::operator()( char* aDestBuffer ) const
         copy_string(uncopiedStart, searchStart, aDestBuffer);  // updates |aDestBuffer|
 
           // copy the replacement
-        nsReadingIterator<char> replacementStart;
+        nsACString::const_iterator replacementStart;
         copy_string(mReplacement.BeginReading(replacementStart), replacementEnd, aDestBuffer);
 
           // start searching from where the current match ends
@@ -776,7 +776,7 @@ nsSubstituteCString::operator()( char* aDestBuffer ) const
 
 NS_COM 
 PRBool 
-FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart, const nsReadingIterator<PRUnichar>& aSearchEnd )
+FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd )
   {
     while ( aSearchStart != aSearchEnd )
       {
@@ -800,7 +800,7 @@ FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart,
 
 NS_COM 
 PRBool 
-FindCharInReadable( char aChar, nsReadingIterator<char>& aSearchStart, const nsReadingIterator<char>& aSearchEnd )
+FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd )
   {
     while ( aSearchStart != aSearchEnd )
       {
@@ -828,7 +828,7 @@ CountCharInReadable( const nsAString& aStr,
                      PRUnichar aChar )
 {
   PRUint32 count = 0;
-  nsReadingIterator<PRUnichar> begin, end;
+  nsAString::const_iterator begin, end;
   
   aStr.BeginReading(begin);
   aStr.EndReading(end);
@@ -849,7 +849,7 @@ CountCharInReadable( const nsACString& aStr,
                      char aChar )
 {
   PRUint32 count = 0;
-  nsReadingIterator<char> begin, end;
+  nsACString::const_iterator begin, end;
   
   aStr.BeginReading(begin);
   aStr.EndReading(end);
diff --git a/mozilla/string/src/nsSlidingString.cpp b/mozilla/string/src/nsSlidingString.cpp
index 51a5842581d..be8d01cb1f6 100755
--- a/mozilla/string/src/nsSlidingString.cpp
+++ b/mozilla/string/src/nsSlidingString.cpp
@@ -62,7 +62,7 @@ nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString )
     acquire_ownership_of_buffer_list();
   }
 
-nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
     : mStart(aStart),
       mEnd(aEnd),
       mBufferList(aString.mBufferList),
@@ -80,7 +80,7 @@ nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString )
     acquire_ownership_of_buffer_list();
   }
 
-nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
     : mStart(aStart),
       mEnd(aEnd),
       mBufferList(aString.mBufferList),
@@ -122,7 +122,7 @@ AllocateContiguousHandleWithData( Buffer_ptr aDummyHandlePtr, const nsAString& a
         PRUnichar* string_start_ptr = PRUnichar_ptr(NS_STATIC_CAST(unsigned char*, handle_ptr) + handle_size);
         PRUnichar* string_end_ptr   = string_start_ptr + string_length;
 
-        nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+        nsAString::const_iterator fromBegin, fromEnd;
         PRUnichar* toBegin = string_start_ptr;
         copy_string(aDataSource.BeginReading(fromBegin), aDataSource.EndReading(fromEnd), toBegin);
         result = new (handle_ptr) nsSharedBufferList::Buffer(string_start_ptr, string_end_ptr, string_start_ptr, string_end_ptr+1, PR_TRUE);
@@ -151,7 +151,7 @@ nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString )
   }
 
 void
-nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     release_ownership_of_buffer_list();
 
@@ -176,7 +176,7 @@ nsSlidingSubstring::Rebind( const nsSlidingString& aString )
   }
 
 void
-nsSlidingSubstring::Rebind( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::Rebind( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     release_ownership_of_buffer_list();
 
@@ -291,7 +291,7 @@ nsSlidingString::AppendBuffer( PRUnichar* aStorageStart, PRUnichar* aDataEnd, PR
   }
 
 void
-nsSlidingString::InsertReadable( const nsAString& aReadable, const nsReadingIterator<PRUnichar>& aInsertPoint )
+nsSlidingString::InsertReadable( const nsAString& aReadable, const nsAString::const_iterator& aInsertPoint )
     /*
      * Warning: this routine manipulates the shared buffer list in an unexpected way.
      *  The original design did not really allow for insertions, but this call promises
@@ -319,7 +319,7 @@ nsSlidingString::InsertReadable( const nsAString& aReadable, const nsReadingIter
   }
 
 void
-nsSlidingString::DiscardPrefix( const nsReadingIterator<PRUnichar>& aIter )
+nsSlidingString::DiscardPrefix( const nsAString::const_iterator& aIter )
   {
     Position old_start(mStart);
     mStart = aIter;
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index bf62e92ffa5..4bf9e27c233 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -755,8 +755,8 @@ void nsCString::AssignWithConversion( const nsAString& aString ) {
   PRInt32 count = aString.Length();
 
   if(count){   
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       PRUint32 fraglen = start.size_forward();
@@ -778,8 +778,8 @@ void nsCString::AppendWithConversion( const nsAString& aString ) {
   PRInt32 count = aString.Length();
 
   if(count){   
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       PRUint32 fraglen = start.size_forward();
@@ -1345,8 +1345,8 @@ void nsCString::DebugDump(void) const {
 
 NS_ConvertUCS2toUTF8::NS_ConvertUCS2toUTF8( const nsAString& aString )
   {
-    nsReadingIterator<PRUnichar> start; aString.BeginReading(start);
-    nsReadingIterator<PRUnichar> end;   aString.EndReading(end);
+    nsAString::const_iterator start; aString.BeginReading(start);
+    nsAString::const_iterator end;   aString.EndReading(end);
     
     while (start != end) {
       nsReadableFragment<PRUnichar> frag(start.fragment());
diff --git a/mozilla/xpcom/string/public/nsDependentSubstring.h b/mozilla/xpcom/string/public/nsDependentSubstring.h
index 3a277d5252d..2169831810d 100644
--- a/mozilla/xpcom/string/public/nsDependentSubstring.h
+++ b/mozilla/xpcom/string/public/nsDependentSubstring.h
@@ -166,14 +166,14 @@ Substring( const nsAString& aString, PRUint32 aStartPos, PRUint32 aSubstringLeng
 
 inline
 const nsDependentCSubstring
-Substring( const nsReadingIterator<char>& aStart, const nsReadingIterator<char>& aEnd )
+Substring( const nsACString::const_iterator& aStart, const nsACString::const_iterator& aEnd )
   {
     return nsDependentCSubstring(aStart, aEnd);
   }
 
 inline
 const nsDependentSubstring
-Substring( const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+Substring( const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     return nsDependentSubstring(aStart, aEnd);
   }
diff --git a/mozilla/xpcom/string/public/nsReadableUtils.h b/mozilla/xpcom/string/public/nsReadableUtils.h
index 54927d7f623..df3e264d960 100755
--- a/mozilla/xpcom/string/public/nsReadableUtils.h
+++ b/mozilla/xpcom/string/public/nsReadableUtils.h
@@ -40,8 +40,8 @@
 #endif
 
 
-NS_COM size_t Distance( const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
-NS_COM size_t Distance( const nsReadingIterator<char>&, const nsReadingIterator<char>& );
+NS_COM size_t Distance( const nsAString::const_iterator&, const nsAString::const_iterator& );
+NS_COM size_t Distance( const nsACString::const_iterator&, const nsACString::const_iterator& );
 
 
 NS_COM void CopyUCS2toASCII( const nsAString& aSource, nsACString& aDest );
@@ -140,8 +140,8 @@ NS_COM PRUnichar* CopyUnicodeTo( const nsAString& aSource,
    * @param aSrcEnd end source iterator
    * @param aDest destination for the copy
    */
-NS_COM void CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                           const nsReadingIterator<PRUnichar>& aSrcEnd,
+NS_COM void CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                           const nsAString::const_iterator& aSrcEnd,
                            nsAString& aDest );
 
   /**
@@ -154,8 +154,8 @@ NS_COM void CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
    * @param aSrcEnd end source iterator
    * @param aDest destination for the copy
    */
-NS_COM void AppendUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                             const nsReadingIterator<PRUnichar>& aSrcEnd,
+NS_COM void AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                             const nsAString::const_iterator& aSrcEnd,
                              nsAString& aDest );
 
   /**
@@ -185,11 +185,11 @@ NS_COM void ToLowerCase( nsACString& );
    * Currently, this is equivalent to the O(m*n) implementation previously on |ns[C]String|.
    * If we need something faster, then we can implement that later.
    */
-NS_COM PRBool FindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool FindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool FindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool FindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
-NS_COM PRBool CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool CaseInsensitiveFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
 
   /**
@@ -200,8 +200,8 @@ NS_COM PRBool CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadi
    * Currently, this is equivalent to the O(m*n) implementation previously on |ns[C]String|.
    * If we need something faster, then we can implement that later.
    */
-NS_COM PRBool RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>&, nsReadingIterator<PRUnichar>& );
-NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsReadingIterator<char>&, nsReadingIterator<char>& );
+NS_COM PRBool RFindInReadable( const nsAString& aPattern, nsAString::const_iterator&, nsAString::const_iterator& );
+NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsACString::const_iterator&, nsACString::const_iterator& );
 
    /**
    * Finds the leftmost occurance of |aChar|, if any in the range 
@@ -211,8 +211,8 @@ NS_COM PRBool RFindInReadable( const nsACString& aPattern, nsReadingIterator<cha
    * point to the match.  If no match was found, returns |PR_FALSE| and 
    * makes |aSearchStart == aSearchEnd|.
    */
-NS_COM PRBool FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart, const nsReadingIterator<PRUnichar>& aSearchEnd );
-NS_COM PRBool FindCharInReadable( char aChar, nsReadingIterator<char>& aSearchStart, const nsReadingIterator<char>& aSearchEnd );
+NS_COM PRBool FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd );
+NS_COM PRBool FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd );
 
     /**
     * Finds the number of occurences of |aChar| in the string |aStr|
diff --git a/mozilla/xpcom/string/public/nsSharedBufferList.h b/mozilla/xpcom/string/public/nsSharedBufferList.h
index ab587778056..fcd1be881cd 100755
--- a/mozilla/xpcom/string/public/nsSharedBufferList.h
+++ b/mozilla/xpcom/string/public/nsSharedBufferList.h
@@ -116,7 +116,7 @@ class NS_COM nsSharedBufferList
 
             // iff |aIter| is a valid iterator into a |nsSharedBufferList|
           explicit
-          Position( const nsReadingIterator<PRUnichar>& aIter )
+          Position( const nsAString::const_iterator& aIter )
               : mBuffer( NS_CONST_CAST(Buffer*, NS_REINTERPRET_CAST(const Buffer*, aIter.fragment().mFragmentIdentifier)) ),
                 mPosInBuffer( NS_CONST_CAST(PRUnichar*, aIter.get()) )
             {
@@ -125,7 +125,7 @@ class NS_COM nsSharedBufferList
 
             // iff |aIter| is a valid iterator into a |nsSharedBufferList|
           Position&
-          operator=( const nsReadingIterator<PRUnichar>& aIter )
+          operator=( const nsAString::const_iterator& aIter )
             {
               mBuffer       = NS_CONST_CAST(Buffer*, NS_REINTERPRET_CAST(const Buffer*, aIter.fragment().mFragmentIdentifier));
               mPosInBuffer  = NS_CONST_CAST(PRUnichar*, aIter.get());
diff --git a/mozilla/xpcom/string/public/nsSlidingString.h b/mozilla/xpcom/string/public/nsSlidingString.h
index abe764b0413..5c4901319b0 100755
--- a/mozilla/xpcom/string/public/nsSlidingString.h
+++ b/mozilla/xpcom/string/public/nsSlidingString.h
@@ -92,16 +92,16 @@ class NS_COM nsSlidingSubstring
         }
 
       nsSlidingSubstring( const nsSlidingSubstring& );  // copy-constructor
-      nsSlidingSubstring( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd );
+      nsSlidingSubstring( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd );
       nsSlidingSubstring( const nsSlidingString& );
-      nsSlidingSubstring( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd );
+      nsSlidingSubstring( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd );
       explicit nsSlidingSubstring( const nsAString& );
         // copy the supplied string into a new buffer ... there will be no modifying instance over this buffer list
 
       void Rebind( const nsSlidingSubstring& );
-      void Rebind( const nsSlidingSubstring&, const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
+      void Rebind( const nsSlidingSubstring&, const nsAString::const_iterator&, const nsAString::const_iterator& );
       void Rebind( const nsSlidingString& );
-      void Rebind( const nsSlidingString&, const nsReadingIterator<PRUnichar>&, const nsReadingIterator<PRUnichar>& );
+      void Rebind( const nsSlidingString&, const nsAString::const_iterator&, const nsAString::const_iterator& );
       void Rebind( const nsAString& );
 
      ~nsSlidingSubstring();
@@ -177,14 +177,14 @@ class NS_COM nsSlidingString
 
 //    void Append( ... ); do you want some |Append|s that copy the supplied data?
 
-      void DiscardPrefix( const nsReadingIterator<PRUnichar>& );
+      void DiscardPrefix( const nsAString::const_iterator& );
         // any other way you want to do this?
 
     protected:
       virtual const PRUnichar* GetReadableFragment( nsReadableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) const;
       virtual       PRUnichar* GetWritableFragment( nsWritableFragment<PRUnichar>&, nsFragmentRequest, PRUint32 ) { return 0; }
 
-      void InsertReadable( const nsAString&, const nsReadingIterator<PRUnichar>& ); // ...to implement |nsScannerString::UngetReadable| 
+      void InsertReadable( const nsAString&, const nsAString::const_iterator& ); // ...to implement |nsScannerString::UngetReadable| 
 
     private:
 
diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp
index 8198eccc774..1ace64cdee3 100755
--- a/mozilla/xpcom/string/src/nsReadableUtils.cpp
+++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp
@@ -94,14 +94,14 @@ Distance_Impl( const nsReadingIterator<CharT>& aStart,
 
 NS_COM
 size_t
-Distance( const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+Distance( const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     return Distance_Impl(aStart, aEnd);
   }
 
 NS_COM
 size_t
-Distance( const nsReadingIterator<char>& aStart, const nsReadingIterator<char>& aEnd )
+Distance( const nsACString::const_iterator& aStart, const nsACString::const_iterator& aEnd )
   {
     return Distance_Impl(aStart, aEnd);
   }
@@ -150,9 +150,9 @@ CopyUCS2toASCII( const nsAString& aSource, nsACString& aDest )
       // right now, this won't work on multi-fragment destinations
     aDest.SetLength(aSource.Length());
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
 
-    nsWritingIterator<char> toBegin;
+    nsACString::iterator toBegin;
     LossyConvertEncoding<PRUnichar, char> converter(aDest.BeginWriting(toBegin).get());
     
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
@@ -165,9 +165,9 @@ CopyASCIItoUCS2( const nsACString& aSource, nsAString& aDest )
       // right now, this won't work on multi-fragment destinations
     aDest.SetLength(aSource.Length());
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
 
-    nsWritingIterator<PRUnichar> toBegin;
+    nsAString::iterator toBegin;
     LossyConvertEncoding<char, PRUnichar> converter(aDest.BeginWriting(toBegin).get());
 
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
@@ -196,7 +196,7 @@ ToNewCString( const nsAString& aSource )
   {
     char* result = AllocateStringCopy(aSource, (char*)0);
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     LossyConvertEncoding<PRUnichar, char> converter(result);
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter).write_terminator();
     return result;
@@ -234,7 +234,7 @@ ToNewCString( const nsACString& aSource )
 
     char* result = AllocateStringCopy(aSource, (char*)0);
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
     char* toBegin = result;
     *copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), toBegin) = char(0);
     return result;
@@ -248,7 +248,7 @@ ToNewUnicode( const nsAString& aSource )
 
     PRUnichar* result = AllocateStringCopy(aSource, (PRUnichar*)0);
 
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     PRUnichar* toBegin = result;
     *copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), toBegin) = PRUnichar(0);
     return result;
@@ -260,7 +260,7 @@ ToNewUnicode( const nsACString& aSource )
   {
     PRUnichar* result = AllocateStringCopy(aSource, (PRUnichar*)0);
 
-    nsReadingIterator<char> fromBegin, fromEnd;
+    nsACString::const_iterator fromBegin, fromEnd;
     LossyConvertEncoding<char, PRUnichar> converter(result);
     copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter).write_terminator();
     return result;
@@ -270,7 +270,7 @@ NS_COM
 PRUnichar*
 CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest, PRUint32 aLength )
   {
-    nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+    nsAString::const_iterator fromBegin, fromEnd;
     PRUnichar* toBegin = aDest;    
     copy_string(aSource.BeginReading(fromBegin).advance( PRInt32(aSrcOffset) ), aSource.BeginReading(fromEnd).advance( PRInt32(aSrcOffset+aLength) ), toBegin);
     return aDest;
@@ -278,29 +278,29 @@ CopyUnicodeTo( const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest,
 
 NS_COM 
 void 
-CopyUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-               const nsReadingIterator<PRUnichar>& aSrcEnd,
+CopyUnicodeTo( const nsAString::const_iterator& aSrcStart,
+               const nsAString::const_iterator& aSrcEnd,
                nsAString& aDest )
   {
-    nsWritingIterator<PRUnichar> writer;
+    nsAString::iterator writer;
     aDest.SetLength(Distance(aSrcStart, aSrcEnd));
     aDest.BeginWriting(writer);
-    nsReadingIterator<PRUnichar> fromBegin(aSrcStart);
+    nsAString::const_iterator fromBegin(aSrcStart);
     
     copy_string(fromBegin, aSrcEnd, writer);
   }
 
 NS_COM 
 void 
-AppendUnicodeTo( const nsReadingIterator<PRUnichar>& aSrcStart,
-                 const nsReadingIterator<PRUnichar>& aSrcEnd,
+AppendUnicodeTo( const nsAString::const_iterator& aSrcStart,
+                 const nsAString::const_iterator& aSrcEnd,
                  nsAString& aDest )
   {
-    nsWritingIterator<PRUnichar> writer;
+    nsAString::iterator writer;
     PRUint32 oldLength = aDest.Length();
     aDest.SetLength(oldLength + Distance(aSrcStart, aSrcEnd));
     aDest.BeginWriting(writer).advance(oldLength);
-    nsReadingIterator<PRUnichar> fromBegin(aSrcStart);
+    nsAString::const_iterator fromBegin(aSrcStart);
     
     copy_string(fromBegin, aSrcEnd, writer);
   }
@@ -314,12 +314,12 @@ IsASCII( const nsAString& aString )
 
     // Don't want to use |copy_string| for this task, since we can stop at the first non-ASCII character
 
-    nsReadingIterator<PRUnichar> done_reading;
+    nsAString::const_iterator done_reading;
     aString.EndReading(done_reading);
 
       // for each chunk of |aString|...
     PRUint32 fragmentLength = 0;
-    nsReadingIterator<PRUnichar> iter;
+    nsAString::const_iterator iter;
     for ( aString.BeginReading(iter); iter != done_reading; iter.advance( PRInt32(fragmentLength) ) )
       {
         fragmentLength = PRUint32(iter.size_forward());
@@ -503,28 +503,28 @@ class CaseInsensitiveCharComparator
 
 NS_COM
 PRBool
-FindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+FindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseSensitivePRUnicharComparator());
   }
 
 NS_COM
 PRBool
-FindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+FindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseSensitiveCharComparator());
   }
 
 NS_COM
 PRBool
-CaseInsensitiveFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+CaseInsensitiveFindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseInsensitivePRUnicharComparator());
   }
 
 NS_COM
 PRBool
-CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+CaseInsensitiveFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     return FindInReadable_Impl(aPattern, aSearchStart, aSearchEnd, CaseInsensitiveCharComparator());
   }
@@ -536,12 +536,12 @@ CaseInsensitiveFindInReadable( const nsACString& aPattern, nsReadingIterator<cha
    */
 NS_COM
 PRBool
-RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearchStart, nsReadingIterator<PRUnichar>& aSearchEnd )
+RFindInReadable( const nsAString& aPattern, nsAString::const_iterator& aSearchStart, nsAString::const_iterator& aSearchEnd )
   {
     PRBool found_it = PR_FALSE;
 
-    nsReadingIterator<PRUnichar> savedSearchEnd(aSearchEnd);
-    nsReadingIterator<PRUnichar> searchStart(aSearchStart), searchEnd(aSearchEnd);
+    nsAString::const_iterator savedSearchEnd(aSearchEnd);
+    nsAString::const_iterator searchStart(aSearchStart), searchEnd(aSearchEnd);
 
     while ( searchStart != searchEnd )
       {
@@ -569,12 +569,12 @@ RFindInReadable( const nsAString& aPattern, nsReadingIterator<PRUnichar>& aSearc
 
 NS_COM
 PRBool
-RFindInReadable( const nsACString& aPattern, nsReadingIterator<char>& aSearchStart, nsReadingIterator<char>& aSearchEnd )
+RFindInReadable( const nsACString& aPattern, nsACString::const_iterator& aSearchStart, nsACString::const_iterator& aSearchEnd )
   {
     PRBool found_it = PR_FALSE;
 
-    nsReadingIterator<char> savedSearchEnd(aSearchEnd);
-    nsReadingIterator<char> searchStart(aSearchStart), searchEnd(aSearchEnd);
+    nsACString::const_iterator savedSearchEnd(aSearchEnd);
+    nsACString::const_iterator searchStart(aSearchStart), searchEnd(aSearchEnd);
 
     while ( searchStart != searchEnd )
       {
@@ -629,10 +629,10 @@ nsSubstituteString::MaxLength() const
 void
 nsSubstituteString::CountMatches() const
   {
-    nsReadingIterator<PRUnichar> textEnd;
-    nsReadingIterator<PRUnichar> searchEnd = mText.EndReading(textEnd);
+    nsAString::const_iterator textEnd;
+    nsAString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<PRUnichar> searchStart;
+    nsAString::const_iterator searchStart;
     mText.BeginReading(searchStart);
 
     PRInt32 numberOfMatches = 0;
@@ -657,14 +657,14 @@ nsSubstituteString::Length() const
 PRUnichar*
 nsSubstituteString::operator()( PRUnichar* aDestBuffer ) const
   {
-    nsReadingIterator<PRUnichar> replacementEnd;
+    nsAString::const_iterator replacementEnd;
     mReplacement.EndReading(replacementEnd);
 
-    nsReadingIterator<PRUnichar> textEnd;
-    nsReadingIterator<PRUnichar> searchEnd = mText.EndReading(textEnd);
+    nsAString::const_iterator textEnd;
+    nsAString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<PRUnichar> uncopiedStart;
-    nsReadingIterator<PRUnichar> searchStart = mText.BeginReading(uncopiedStart);
+    nsAString::const_iterator uncopiedStart;
+    nsAString::const_iterator searchStart = mText.BeginReading(uncopiedStart);
 
     while ( FindInReadable(mPattern, searchStart, searchEnd) )
       {
@@ -674,7 +674,7 @@ nsSubstituteString::operator()( PRUnichar* aDestBuffer ) const
         copy_string(uncopiedStart, searchStart, aDestBuffer);  // updates |aDestBuffer|
 
           // copy the replacement
-        nsReadingIterator<PRUnichar> replacementStart;
+        nsAString::const_iterator replacementStart;
         copy_string(mReplacement.BeginReading(replacementStart), replacementEnd, aDestBuffer);
 
           // start searching from where the current match ends
@@ -716,10 +716,10 @@ nsSubstituteCString::MaxLength() const
 void
 nsSubstituteCString::CountMatches() const
   {
-    nsReadingIterator<char> textEnd;
-    nsReadingIterator<char> searchEnd = mText.EndReading(textEnd);
+    nsACString::const_iterator textEnd;
+    nsACString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<char> searchStart;
+    nsACString::const_iterator searchStart;
     mText.BeginReading(searchStart);
 
     PRInt32 numberOfMatches = 0;
@@ -744,14 +744,14 @@ nsSubstituteCString::Length() const
 char*
 nsSubstituteCString::operator()( char* aDestBuffer ) const
   {
-    nsReadingIterator<char> replacementEnd;
+    nsACString::const_iterator replacementEnd;
     mReplacement.EndReading(replacementEnd);
 
-    nsReadingIterator<char> textEnd;
-    nsReadingIterator<char> searchEnd = mText.EndReading(textEnd);
+    nsACString::const_iterator textEnd;
+    nsACString::const_iterator searchEnd = mText.EndReading(textEnd);
 
-    nsReadingIterator<char> uncopiedStart;
-    nsReadingIterator<char> searchStart = mText.BeginReading(uncopiedStart);
+    nsACString::const_iterator uncopiedStart;
+    nsACString::const_iterator searchStart = mText.BeginReading(uncopiedStart);
 
     while ( FindInReadable(mPattern, searchStart, searchEnd) )
       {
@@ -761,7 +761,7 @@ nsSubstituteCString::operator()( char* aDestBuffer ) const
         copy_string(uncopiedStart, searchStart, aDestBuffer);  // updates |aDestBuffer|
 
           // copy the replacement
-        nsReadingIterator<char> replacementStart;
+        nsACString::const_iterator replacementStart;
         copy_string(mReplacement.BeginReading(replacementStart), replacementEnd, aDestBuffer);
 
           // start searching from where the current match ends
@@ -776,7 +776,7 @@ nsSubstituteCString::operator()( char* aDestBuffer ) const
 
 NS_COM 
 PRBool 
-FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart, const nsReadingIterator<PRUnichar>& aSearchEnd )
+FindCharInReadable( PRUnichar aChar, nsAString::const_iterator& aSearchStart, const nsAString::const_iterator& aSearchEnd )
   {
     while ( aSearchStart != aSearchEnd )
       {
@@ -800,7 +800,7 @@ FindCharInReadable( PRUnichar aChar, nsReadingIterator<PRUnichar>& aSearchStart,
 
 NS_COM 
 PRBool 
-FindCharInReadable( char aChar, nsReadingIterator<char>& aSearchStart, const nsReadingIterator<char>& aSearchEnd )
+FindCharInReadable( char aChar, nsACString::const_iterator& aSearchStart, const nsACString::const_iterator& aSearchEnd )
   {
     while ( aSearchStart != aSearchEnd )
       {
@@ -828,7 +828,7 @@ CountCharInReadable( const nsAString& aStr,
                      PRUnichar aChar )
 {
   PRUint32 count = 0;
-  nsReadingIterator<PRUnichar> begin, end;
+  nsAString::const_iterator begin, end;
   
   aStr.BeginReading(begin);
   aStr.EndReading(end);
@@ -849,7 +849,7 @@ CountCharInReadable( const nsACString& aStr,
                      char aChar )
 {
   PRUint32 count = 0;
-  nsReadingIterator<char> begin, end;
+  nsACString::const_iterator begin, end;
   
   aStr.BeginReading(begin);
   aStr.EndReading(end);
diff --git a/mozilla/xpcom/string/src/nsSlidingString.cpp b/mozilla/xpcom/string/src/nsSlidingString.cpp
index 51a5842581d..be8d01cb1f6 100755
--- a/mozilla/xpcom/string/src/nsSlidingString.cpp
+++ b/mozilla/xpcom/string/src/nsSlidingString.cpp
@@ -62,7 +62,7 @@ nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString )
     acquire_ownership_of_buffer_list();
   }
 
-nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::nsSlidingSubstring( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
     : mStart(aStart),
       mEnd(aEnd),
       mBufferList(aString.mBufferList),
@@ -80,7 +80,7 @@ nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString )
     acquire_ownership_of_buffer_list();
   }
 
-nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::nsSlidingSubstring( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
     : mStart(aStart),
       mEnd(aEnd),
       mBufferList(aString.mBufferList),
@@ -122,7 +122,7 @@ AllocateContiguousHandleWithData( Buffer_ptr aDummyHandlePtr, const nsAString& a
         PRUnichar* string_start_ptr = PRUnichar_ptr(NS_STATIC_CAST(unsigned char*, handle_ptr) + handle_size);
         PRUnichar* string_end_ptr   = string_start_ptr + string_length;
 
-        nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+        nsAString::const_iterator fromBegin, fromEnd;
         PRUnichar* toBegin = string_start_ptr;
         copy_string(aDataSource.BeginReading(fromBegin), aDataSource.EndReading(fromEnd), toBegin);
         result = new (handle_ptr) nsSharedBufferList::Buffer(string_start_ptr, string_end_ptr, string_start_ptr, string_end_ptr+1, PR_TRUE);
@@ -151,7 +151,7 @@ nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString )
   }
 
 void
-nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::Rebind( const nsSlidingSubstring& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     release_ownership_of_buffer_list();
 
@@ -176,7 +176,7 @@ nsSlidingSubstring::Rebind( const nsSlidingString& aString )
   }
 
 void
-nsSlidingSubstring::Rebind( const nsSlidingString& aString, const nsReadingIterator<PRUnichar>& aStart, const nsReadingIterator<PRUnichar>& aEnd )
+nsSlidingSubstring::Rebind( const nsSlidingString& aString, const nsAString::const_iterator& aStart, const nsAString::const_iterator& aEnd )
   {
     release_ownership_of_buffer_list();
 
@@ -291,7 +291,7 @@ nsSlidingString::AppendBuffer( PRUnichar* aStorageStart, PRUnichar* aDataEnd, PR
   }
 
 void
-nsSlidingString::InsertReadable( const nsAString& aReadable, const nsReadingIterator<PRUnichar>& aInsertPoint )
+nsSlidingString::InsertReadable( const nsAString& aReadable, const nsAString::const_iterator& aInsertPoint )
     /*
      * Warning: this routine manipulates the shared buffer list in an unexpected way.
      *  The original design did not really allow for insertions, but this call promises
@@ -319,7 +319,7 @@ nsSlidingString::InsertReadable( const nsAString& aReadable, const nsReadingIter
   }
 
 void
-nsSlidingString::DiscardPrefix( const nsReadingIterator<PRUnichar>& aIter )
+nsSlidingString::DiscardPrefix( const nsAString::const_iterator& aIter )
   {
     Position old_start(mStart);
     mStart = aIter;