Remove #define nsString2 nsString and #define nsAutoString2 nsAutoString and fix last few uses of them. r=dbradley, rs=scc

mailnews/absync/src/nsAbSync.cpp

@@ -33,6 +33,7 @@
 #include "nsIDirectoryService.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsXPIDLString.h"
+#include "nsReadableUtils.h"
 #include "nsEscape.h"
 #include "nsSyncDecoderRing.h"
 #include "plstr.h"
@@ -816,7 +817,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
         char *pVal = PR_smprintf("phone%d", phoneCount);
         if (pVal)
         {
-          char      *utfString = nsString2(aName).ToNewUTF8String();
+          char *utfString = ToNewUTF8String(nsDependentString(aName));
 
           // Now, URL Encode the value string....
           char *myTStr = nsEscape(utfString, url_Path);
@@ -846,7 +847,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
       }
       else    // Good ole' normal tag...
       {
-        char      *utfString = nsString2(aName).ToNewUTF8String();
+        char *utfString = ToNewUTF8String(nsDependentString(aName));
 
         // Now, URL Encode the value string....
         char *myTStr = nsEscape(utfString, url_Path);
@@ -887,7 +888,7 @@ nsAbSync::GenerateProtocolForCard(nsIAbCard *aCard, PRBool aAddId, nsString &pro
       // Just some sanity...
       if (aName)
       {
-        char      *utfString = nsString2(aName).ToNewUTF8String();
+        char *utfString = ToNewUTF8String(nsDependentString(aName));
       
         // Now, URL Encode the value string....
         char *myTStr = nsEscape(utfString, url_Path);

netwerk/protocol/http/src/nsHttpChannel.cpp

@@ -37,7 +37,7 @@
 #include "nsIMIMEService.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsReadableUtils.h"
 #include "plstr.h"
 #include "prprf.h"

string/obsolete/nsString2.h

@@ -64,9 +64,6 @@
 class nsISizeOfHandler;
 
 
-#define nsString2     nsString
-#define nsAutoString2 nsAutoString
-
 class NS_COM nsString :
   public nsAFlatString,
   public nsStr {

xpcom/string/obsolete/nsString2.h

@@ -64,9 +64,6 @@
 class nsISizeOfHandler;
 
 
-#define nsString2     nsString
-#define nsAutoString2 nsAutoString
-
 class NS_COM nsString :
   public nsAFlatString,
   public nsStr {