Part of string clean-up bug 70143, move last three #includes of "nsString2.h" over to "nsString.h". r=bryner, sr=scc

netwerk/mime/src/nsXMLMIMEDataSource.cpp

@@ -22,7 +22,7 @@
  */
 #include "nsXMLMIMEDataSource.h"
 #include "nsVoidArray.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsMIMEInfoImpl.h"
 #include "nsIURL.h"
 #include "nsCOMPtr.h"

netwerk/streamconv/src/nsStreamConverterService.cpp

@@ -36,7 +36,7 @@
 #include "nsStreamConverterService.h"
 #include "nsIServiceManager.h"
 #include "nsIComponentManager.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsIAtom.h"
 #include "nsDeque.h"
 #include "nsIInputStream.h"

xpfe/bootstrap/appleevents/nsWindowUtils.cpp

@@ -43,7 +43,7 @@
 #include "nsIWindowMediator.h"
 #include "nsIURI.h"
 #include "nsIXULWindow.h"
-#include "nsString2.h"
+#include "nsString.h"
 #include "nsWindowUtils.h"
 #include "nsMacUtils.h"
 #include "nsXPIDLString.h"