Bug 1398039 - Port bug 1393230: Remove string forward declarations and fix improper string usage in Find(). rs=bustage-fix

--HG--
extra : amend_source : f59e736f1f0b8a65165e5e829963e44d1f7af217

mailnews/addrbook/src/nsAbOSXUtils.h

@@ -9,8 +9,6 @@
 #include <Foundation/NSString.h>
 #include "nsString.h"
 
-class nsString;
-class nsCString;
 class nsAbCardProperty;
 
 NSString *WrapString(const nsString &aString);

mailnews/db/msgdb/public/nsMsgHdr.h

@@ -14,7 +14,6 @@
 #include "nsTArray.h"
 
 class nsMsgDatabase;
-class nsCString;
 class nsIMsgThread;
 
 class nsMsgHdr : public nsIMsgDBHdr {

mailnews/imap/src/nsImapProtocol.cpp

@@ -7762,7 +7762,7 @@ bool nsImapProtocol::GetListSubscribedIsBrokenOnServer()
   if (GetServerStateParser().GetServerID().Find("\"NAME\" \"Zimbra\"", CaseInsensitiveCompare) != kNotFound) {
     nsCString serverID(GetServerStateParser().GetServerID());
     int start = serverID.Find("\"VERSION\" \"", CaseInsensitiveCompare) + 11;
-    int length = serverID.Find("\" ", start, CaseInsensitiveCompare);
+    int length = serverID.Find("\" ", /* aIgnoreCase = */ true, start);
     const nsDependentCSubstring serverVersionSubstring = Substring(serverID, start, length);
     nsCString serverVersionStr(serverVersionSubstring);
     Version serverVersion(serverVersionStr.get());

mailnews/imap/src/nsImapServerResponseParser.h

@@ -21,7 +21,6 @@ class nsIMAPBodyShell;
 class nsIMAPBodypart;
 class nsImapSearchResultIterator;
 class nsImapFlagAndUidState;
-class nsCString;
 
 #include "nsIMAPGenericParser.h"
 

mailnews/imap/src/nsImapService.h

@@ -10,13 +10,13 @@
 #include "nsIMsgMessageService.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
+#include "nsString.h"
 #include "nsIProtocolHandler.h"
 #include "nsIMsgProtocolInfo.h"
 #include "nsIContentHandler.h"
 #include "nsICacheStorage.h"
 
-class nsIImapHostSessionList; 
-class nsCString;
+class nsIImapHostSessionList;
 class nsIImapUrl;
 class nsIMsgFolder;
 class nsIMsgStatusFeedback;

mailnews/import/becky/src/nsBeckyFilters.h

@@ -8,12 +8,12 @@
 
 #include "nsIImportFilters.h"
 #include "nsIFile.h"
+#include "nsString.h"
 #include "nsIMsgIncomingServer.h"
 #include "nsMsgFilterCore.h"
 
 class nsIMsgFilter;
 class nsIMsgRuleAction;
-class nsCString;
 
 class nsBeckyFilters final : public nsIImportFilters
 {