Bug 1391803 - Use nsStringFwd.h for forward declaring string classes. r=froydnj

We should not be declaring forward declarations for nsString classes directly,
instead we should use nsStringFwd.h. This will make changing the underlying
types easier.

--HG--
extra : rebase_source : b2c7554e8632f078167ff2f609392e63a136c299

accessible/base/Platform.h

@@ -8,8 +8,7 @@
 #define mozilla_a11y_Platform_h
 
 #include <stdint.h>
-
-class nsString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace a11y {

accessible/mac/MacUtils.h

@@ -7,8 +7,9 @@
 #ifndef _MacUtils_H_
 #define _MacUtils_H_
 
+#include "nsStringFwd.h"
+
 @class NSString;
-class nsString;
 
 namespace mozilla {
 namespace a11y {

caps/nsScriptSecurityManager.h

@@ -16,12 +16,12 @@
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsServiceManagerUtils.h"
+#include "nsStringFwd.h"
 #include "plstr.h"
 #include "js/TypeDecls.h"
 
 #include <stdint.h>
 
-class nsCString;
 class nsIIOService;
 class nsIStringBundle;
 class SystemPrincipal;

docshell/base/nsWebNavigationInfo.h

@@ -10,10 +10,9 @@
 #include "nsIWebNavigationInfo.h"
 #include "nsCOMPtr.h"
 #include "nsICategoryManager.h"
+#include "nsStringFwd.h"
 #include "mozilla/Attributes.h"
 
-class nsCString;
-
 #define NS_WEBNAVIGATION_INFO_CID \
  { 0xf30bc0a2, 0x958b, 0x4287,{0xbf, 0x62, 0xce, 0x38, 0xba, 0x0c, 0x81, 0x1e}}
 

dom/animation/AnimationPerformanceWarning.h

@@ -10,10 +10,9 @@
 #include <initializer_list>
 
 #include "mozilla/Maybe.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
-class nsAString;
-
 namespace mozilla {
 
 // Represents the reason why we can't run the CSS property on the compositor.

dom/base/DOMException.h

@@ -26,7 +26,6 @@
 #include "mozilla/dom/BindingDeclarations.h"
 
 class nsIStackFrame;
-class nsString;
 
 nsresult
 NS_GetNameAndMessageForDOMNSResult(nsresult aNSResult, nsACString& aName,

dom/base/DirectionalityUtils.h

@@ -8,9 +8,9 @@
 #define DirectionalityUtils_h___
 
 #include "nscore.h"
+#include "nsStringFwd.h"
 
 class nsIContent;
-class nsAString;
 class nsAttrValue;
 class nsTextNode;
 

dom/base/DocumentFragment.h

@@ -11,9 +11,9 @@
 #include "mozilla/dom/BorrowedAttrInfo.h"
 #include "mozilla/dom/FragmentOrElement.h"
 #include "nsIDOMDocumentFragment.h"
+#include "nsStringFwd.h"
 
 class nsIAtom;
-class nsAString;
 class nsIDocument;
 class nsIContent;
 

dom/base/nsAttrValue.h

@@ -21,6 +21,7 @@
 #include "nsCaseTreatment.h"
 #include "nsMargin.h"
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 #include "SVGAttrValueWrapper.h"
 #include "nsTArrayForwardDeclare.h"
 #include "nsIAtom.h"
@@ -31,7 +32,6 @@
 // Undefine LoadImage to prevent naming conflict with Windows.
 #undef LoadImage
 
-class nsAString;
 class nsIDocument;
 class nsStyledElement;
 struct MiscContainer;

dom/base/nsContentListDeclarations.h

@@ -9,14 +9,12 @@
 
 #include <stdint.h>
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 
 class nsContentList;
 class nsIAtom;
 class nsIContent;
 class nsINode;
-// Can't use nsStringFwd.h because that's internal-API-only.
-class nsString;
-class nsAString;
 
 namespace mozilla {
 namespace dom {

dom/base/nsContentPolicyUtils.h

@@ -20,12 +20,12 @@
 #include "nsIScriptSecurityManager.h"
 #include "nsIURI.h"
 #include "nsServiceManagerUtils.h"
+#include "nsStringFwd.h"
 
 //XXXtw sadly, this makes consumers of nsContentPolicyUtils depend on widget
 #include "nsIDocument.h"
 #include "nsPIDOMWindow.h"
 
-class nsACString;
 class nsIPrincipal;
 
 #define NS_CONTENTPOLICY_CONTRACTID   "@mozilla.org/layout/content-policy;1"

dom/base/nsCopySupport.h

@@ -8,6 +8,7 @@
 
 #include "nsError.h"
 #include "nsIDocument.h"
+#include "nsStringFwd.h"
 #include "mozilla/EventForwards.h"
 
 class nsINode;
@@ -16,8 +17,6 @@ class nsIDocument;
 class nsIImageLoadingContent;
 class nsIContent;
 class nsITransferable;
-class nsACString;
-class nsAString;
 class nsIPresShell;
 class nsILoadContext;
 

dom/base/nsIContent.h

@@ -10,9 +10,9 @@
 #include "mozilla/dom/BorrowedAttrInfo.h"
 #include "nsCaseTreatment.h" // for enum, cannot be forward-declared
 #include "nsINode.h"
+#include "nsStringFwd.h"
 
 // Forward declarations
-class nsAString;
 class nsIAtom;
 class nsIURI;
 class nsRuleWalker;

dom/base/nsIContentSerializer.h

@@ -8,10 +8,10 @@
 #define nsIContentSerializer_h
 
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 
 class nsIContent;
 class nsIDocument;
-class nsAString;
 
 namespace mozilla {
 class Encoding;

dom/base/nsIDocument.h

@@ -21,6 +21,7 @@
 #include "nsIUUIDGenerator.h"
 #include "nsPIDOMWindow.h"               // for use in inline functions
 #include "nsPropertyTable.h"             // for member
+#include "nsStringFwd.h"
 #include "nsDataHashtable.h"             // for member
 #include "nsURIHashKey.h"                // for member
 #include "mozilla/net/ReferrerPolicy.h"  // for member
@@ -54,7 +55,6 @@ class ElementCreationOptionsOrString;
 
 class gfxUserFontSet;
 class imgIRequest;
-class nsAString;
 class nsBindingManager;
 class nsIDocShell;
 class nsDocShell;

dom/base/nsIGlobalObject.h

@@ -9,6 +9,7 @@
 
 #include "mozilla/dom/DispatcherTrait.h"
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "js/TypeDecls.h"
 
@@ -16,8 +17,6 @@
 { 0x11afa8be, 0xd997, 0x4e07, \
 { 0xa6, 0xa3, 0x6f, 0x87, 0x2e, 0xc3, 0xee, 0x7f } }
 
-class nsACString;
-class nsCString;
 class nsCycleCollectionTraversalCallback;
 class nsIPrincipal;
 

dom/base/nsNameSpaceManager.h

@@ -12,12 +12,11 @@
 #include "nsIAtom.h"
 #include "nsIDocument.h"
 #include "nsIObserver.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
 #include "mozilla/StaticPtr.h"
 
-class nsAString;
-
 /**
  * The Name Space Manager tracks the association between a NameSpace
  * URI and the int32_t runtime id. Mappings between NameSpaces and

dom/base/nsNodeInfoManager.h

@@ -14,9 +14,9 @@
 #include "mozilla/Attributes.h"           // for final
 #include "nsCOMPtr.h"                     // for member
 #include "nsCycleCollectionParticipant.h" // for NS_DECL_CYCLE_*
+#include "nsStringFwd.h"
 #include "plhash.h"                       // for typedef PLHashNumber
 
-class nsAString;
 class nsBindingManager;
 class nsIAtom;
 class nsIDocument;

dom/base/nsTextFragment.h

@@ -20,8 +20,6 @@
 #include "nsReadableUtils.h"
 #include "nsISupportsImpl.h"
 
-class nsString;
-
 // XXX should this normalize the code to keep a \u0000 at the end?
 
 // XXX nsTextFragmentPool?

dom/console/nsIConsoleReportCollector.h

@@ -9,11 +9,10 @@
 
 #include "nsContentUtils.h"
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 
-class nsACString;
 class nsIDocument;
-class nsString;
 
 #define NS_NSICONSOLEREPORTCOLLECTOR_IID \
   {0xdd98a481, 0xd2c4, 0x4203, {0x8d, 0xfa, 0x85, 0xbf, 0xd7, 0xdc, 0xd7, 0x05}}

dom/events/AnimationEvent.h

@@ -10,8 +10,7 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/AnimationEventBinding.h"
 #include "nsIDOMAnimationEvent.h"
-
-class nsAString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace dom {

dom/events/TouchEvent.h

@@ -13,10 +13,9 @@
 #include "mozilla/EventForwards.h"
 #include "mozilla/TouchEvents.h"
 #include "nsJSEnvironment.h"
+#include "nsStringFwd.h"
 #include "nsWrapperCache.h"
 
-class nsAString;
-
 namespace mozilla {
 namespace dom {
 

dom/events/TransitionEvent.h

@@ -10,8 +10,7 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/TransitionEventBinding.h"
 #include "nsIDOMTransitionEvent.h"
-
-class nsAString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace dom {

dom/html/nsIFormProcessor.h

@@ -15,9 +15,9 @@
 #define nsIFormProcessor_h__
 
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 
-class nsString;
 class nsIDOMHTMLElement;
 
 // {0ae53c0f-8ea2-4916-bedc-717443c3e185}

dom/html/nsIHTMLCollection.h

@@ -8,13 +8,13 @@
 #define nsIHTMLCollection_h___
 
 #include "nsIDOMHTMLCollection.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 #include "nsWrapperCache.h"
 #include "js/GCAPI.h"
 #include "js/TypeDecls.h"
 
 class nsINode;
-class nsString;
 
 namespace mozilla {
 namespace dom {

dom/html/nsITextControlElement.h

@@ -9,8 +9,8 @@
 
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 class nsIContent;
-class nsAString;
 class nsISelectionController;
 class nsFrameSelection;
 class nsTextControlFrame;

dom/indexedDB/IDBEvents.h

@@ -11,13 +11,11 @@
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/Nullable.h"
+#include "nsStringFwd.h"
 
 #define IDBVERSIONCHANGEEVENT_IID \
   {0x3b65d4c3, 0x73ad, 0x492e, {0xb1, 0x2d, 0x15, 0xf9, 0xda, 0xc2, 0x08, 0x4b}}
 
-class nsAString;
-class nsDependentString;
-
 namespace mozilla {
 
 class ErrorResult;

dom/indexedDB/ScriptErrorHelper.h

@@ -8,9 +8,7 @@
 #define mozilla_dom_indexeddb_scripterrorhelper_h__
 
 #include <inttypes.h>
-
-class nsACString;
-class nsAString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace dom {
@@ -41,4 +39,4 @@ public:
 } // namespace dom
 } // namespace mozilla
 
-#endif // mozilla_dom_indexeddb_scripterrorhelper_h__
+#endif // mozilla_dom_indexeddb_scripterrorhelper_h__

dom/ipc/nsIContentChild.h

@@ -10,6 +10,7 @@
 #include "mozilla/dom/ipc/IdType.h"
 
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 #include "mozilla/dom/CPOWManagerGetter.h"
 #include "mozilla/ipc/Shmem.h"
@@ -19,8 +20,6 @@
   { 0x4eed2e73, 0x94ba, 0x48a8,                                 \
     { 0xa2, 0xd1, 0xa5, 0xed, 0x86, 0xd7, 0xbb, 0xe4 } }
 
-class nsString;
-
 namespace IPC {
 class Principal;
 } // namespace IPC

dom/media/DecoderTraits.h

@@ -8,9 +8,7 @@
 #define DecoderTraits_h_
 
 #include "nsCOMPtr.h"
-
-class nsAString;
-class nsACString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 

dom/media/fmp4/MP4Decoder.h

@@ -6,7 +6,7 @@
 #if !defined(MP4Decoder_h_)
 #define MP4Decoder_h_
 
-class nsACString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 

dom/media/gmp/GMPUtils.h

@@ -9,6 +9,7 @@
 #include "mozilla/UniquePtr.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/AbstractThread.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsCOMPtr.h"
 #include "nsClassHashtable.h"
@@ -16,7 +17,6 @@
 #define CHROMIUM_CDM_API "chromium-cdm8-host4"
 
 class nsIFile;
-class nsCString;
 class nsISimpleEnumerator;
 
 namespace mozilla {

dom/media/platforms/omx/OmxPlatformLayer.h

@@ -10,10 +10,9 @@
 #include "OMX_Core.h"
 #include "OMX_Types.h"
 
+#include "nsStringFwd.h"
 #include "OmxPromiseLayer.h"
 
-class nsACString;
-
 namespace mozilla {
 
 class TaskQueue;

dom/plugins/ipc/PluginLibrary.h

@@ -11,13 +11,13 @@
 #include "npapi.h"
 #include "npfunctions.h"
 #include "nscore.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nsError.h"
 #include "mozilla/EventForwards.h"
 #include "nsSize.h"
 #include "nsRect.h"
 
-class nsCString;
 class nsNPAPIPlugin;
 
 namespace mozilla {

dom/presentation/interfaces/nsIPresentationService.idl

@@ -20,9 +20,9 @@ interface nsIPrincipal;
 #define PRESENTATION_SERVICE_CONTRACTID \
   "@mozilla.org/presentation/presentationservice;1"
 
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
-class nsString;
 %}
 
 [ref] native URLArrayRef(const nsTArray<nsString>);

dom/security/test/gtest/TestCSPParser.cpp

@@ -9,30 +9,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifndef MOZILLA_INTERNAL_API
-// some of the includes make use of internal string types
-#define nsAString_h___
-#define nsString_h___
-#define nsStringFwd_h___
-#define nsReadableUtils_h___
-class nsACString;
-class nsAString;
-class nsString;
-class nsCString;
-template<class T> class nsReadingIterator;
-#endif
-
 #include "nsIContentSecurityPolicy.h"
 #include "nsNetUtil.h"
 #include "mozilla/dom/nsCSPContext.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
-
-#ifndef MOZILLA_INTERNAL_API
-#undef nsString_h___
-#undef nsAString_h___
-#undef nsReadableUtils_h___
-#endif
+#include "nsStringFwd.h"
 
 /*
  * Testing the parser is non trivial, especially since we can not call

dom/smil/nsISMILAttr.h

@@ -8,10 +8,10 @@
 #define NS_ISMILATTR_H_
 
 #include "nscore.h"
+#include "nsStringFwd.h"
 
 class nsSMILValue;
 class nsIContent;
-class nsAString;
 
 namespace mozilla {
 namespace dom {

dom/smil/nsSMILCSSValueType.h

@@ -11,10 +11,9 @@
 
 #include "nsISMILType.h"
 #include "nsCSSPropertyID.h"
+#include "nsStringFwd.h"
 #include "mozilla/Attributes.h"
 
-class nsAString;
-
 namespace mozilla {
 struct AnimationValue;
 namespace dom {

dom/smil/nsSMILTimeValueSpec.h

@@ -9,10 +9,10 @@
 
 #include "mozilla/Attributes.h"
 #include "nsSMILTimeValueSpecParams.h"
+#include "nsStringFwd.h"
 #include "nsReferencedElement.h"
 #include "nsIDOMEventListener.h"
 
-class nsAString;
 class nsSMILTimeValue;
 class nsSMILTimedElement;
 class nsSMILTimeContainer;

dom/svg/SVGMotionSMILPathUtils.h

@@ -16,9 +16,9 @@
 #include "mozilla/RefPtr.h"
 #include "nsDebug.h"
 #include "nsSMILParserUtils.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
-class nsAString;
 class nsSVGElement;
 
 namespace mozilla {

dom/svg/SVGTests.h

@@ -13,7 +13,6 @@
 
 class nsAttrValue;
 class nsIAtom;
-class nsString;
 
 namespace mozilla {
 class DOMSVGStringList;

dom/workers/ScriptLoader.h

@@ -9,12 +9,12 @@
 
 #include "Workers.h"
 #include "nsIContentPolicy.h"
+#include "nsStringFwd.h"
 
 class nsIPrincipal;
 class nsIURI;
 class nsIDocument;
 class nsILoadGroup;
-class nsString;
 class nsIChannel;
 
 namespace mozilla {

dom/xbl/nsXBLService.h

@@ -19,7 +19,6 @@ class nsXBLBinding;
 class nsXBLDocumentInfo;
 class nsIContent;
 class nsIDocument;
-class nsString;
 class nsIURI;
 class nsIPrincipal;
 

dom/xslt/base/txCore.h

@@ -9,8 +9,7 @@
 #include "nscore.h"
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
-
-class nsAString;
+#include "nsStringFwd.h"
 
 class txObject
 {

dom/xslt/nsIDocumentTransformer.h

@@ -6,11 +6,11 @@
 #define nsIDocumentTransformer_h__
 
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 
 class nsIDocument;
 class nsIDOMNode;
 class nsIURI;
-class nsString;
 
 #define NS_ITRANSFORMOBSERVER_IID \
 { 0x04b2d17c, 0xe98d, 0x45f5, \

dom/xul/nsXULElement.h

@@ -29,6 +29,7 @@
 #include "nsLayoutCID.h"
 #include "nsAttrAndChildArray.h"
 #include "nsGkAtoms.h"
+#include "nsStringFwd.h"
 #include "nsStyledElement.h"
 #include "nsIFrameLoader.h"
 #include "nsFrameLoader.h" // Needed because we return an
@@ -41,7 +42,6 @@
 #include "mozilla/dom/DOMString.h"
 
 class nsIDocument;
-class nsString;
 class nsXULPrototypeDocument;
 
 class nsIObjectInputStream;

editor/composer/nsComposerCommands.h

@@ -8,12 +8,12 @@
 
 #include "nsIControllerCommand.h"
 #include "nsISupportsImpl.h"            // for NS_DECL_ISUPPORTS_INHERITED, etc
+#include "nsStringFwd.h"
 #include "nscore.h"                     // for nsresult, NS_IMETHOD
 
 class nsIAtom;
 class nsICommandParams;
 class nsISupports;
-class nsString;
 
 namespace mozilla {
 class HTMLEditor;

editor/libeditor/CSSEditUtils.h

@@ -8,6 +8,7 @@
 
 #include "mozilla/ChangeStyleTransaction.h" // for ChangeStyleTransaction
 #include "nsCOMPtr.h"               // for already_AddRefed
+#include "nsStringFwd.h"
 #include "nsTArray.h"               // for nsTArray
 #include "nscore.h"                 // for nsAString, nsresult, nullptr
 
@@ -18,7 +19,6 @@ class nsIDOMCSSStyleDeclaration;
 class nsIDOMElement;
 class nsIDOMNode;
 class nsINode;
-class nsString;
 
 namespace mozilla {
 

editor/libeditor/ChangeStyleTransaction.h

@@ -11,7 +11,6 @@
 #include "nsCycleCollectionParticipant.h" // various macros
 #include "nsString.h"                     // nsString members
 
-class nsAString;
 class nsIAtom;
 
 namespace mozilla {

editor/libeditor/EditorBase.h

@@ -48,7 +48,6 @@ class nsISupports;
 class nsITransaction;
 class nsIWidget;
 class nsRange;
-class nsString;
 class nsTransactionManager;
 
 // This is int32_t instead of int16_t because nsIInlineSpellChecker.idl's

editor/txtsvc/nsISpellChecker.h

@@ -8,6 +8,7 @@
 
 #include "mozilla/MozPromise.h"
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
 #define NS_SPELLCHECKER_CONTRACTID "@mozilla.org/spellchecker;1"
@@ -18,7 +19,6 @@
   { 0x9f, 0x5d, 0xaf, 0x0c, 0xdd, 0x21, 0x18, 0x68 } }
 
 class nsITextServicesDocument;
-class nsString;
 
 /**
  * A generic interface for a spelling checker.

editor/txtsvc/nsITextServicesDocument.h

@@ -7,11 +7,11 @@
 #define nsITextServicesDocument_h__
 
 #include "nsISupports.h"
+#include "nsStringFwd.h"
 
 class nsIDOMDocument;
 class nsIDOMRange;
 class nsIEditor;
-class nsString;
 class nsITextServicesFilter;
 
 /*

editor/txtsvc/nsTextServicesDocument.h

@@ -12,6 +12,7 @@
 #include "nsISupportsImpl.h"
 #include "nsITextServicesDocument.h"
 #include "nsIWeakReferenceUtils.h"
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 #include "nscore.h"
 
@@ -27,7 +28,6 @@ class nsIEditor;
 class nsISelection;
 class nsISelectionController;
 class nsITextServicesFilter;
-class nsString;
 
 /** implementation of a text services object.
  *

gfx/src/nsColor.h

@@ -10,9 +10,7 @@
 #include <stdint.h>                     // for uint8_t, uint32_t
 #include "nscore.h"                     // for nsAString
 #include "nsCoord.h"                    // for NSToIntRound
-
-class nsAString;
-class nsString;
+#include "nsStringFwd.h"
 
 // A color is a 32 bit unsigned integer with four components: R, G, B
 // and A.

gfx/thebes/PrintTarget.h

@@ -9,6 +9,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/gfx/2D.h"
 #include "nsISupportsImpl.h"
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace gfx {

image/ImageFactory.h

@@ -9,8 +9,8 @@
 
 #include "nsCOMPtr.h"
 #include "nsProxyRelease.h"
+#include "nsStringFwd.h"
 
-class nsCString;
 class nsIRequest;
 
 namespace mozilla {

ipc/chromium/src/base/message_pump_libevent.h

@@ -10,13 +10,12 @@
 #include "base/message_pump.h"
 #include "base/time.h"
 #include "mozilla/UniquePtr.h"
+#include "nsStringFwd.h"
 
 // Declare structs we need from libevent.h rather than including it
 struct event_base;
 struct event;
 
-class nsDependentCSubstring;
-
 namespace base {
 
 // Class to monitor sockets and issue callbacks when sockets are ready for I/O

ipc/contentproc/plugin-container.cpp

@@ -6,7 +6,6 @@
 
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
-#include "nsAutoPtr.h"
 #include "mozilla/Bootstrap.h"
 
 #ifdef XP_WIN

layout/base/RestyleManager.h

@@ -10,8 +10,8 @@
 #include "mozilla/OverflowChangedTracker.h"
 #include "nsChangeHint.h"
 #include "nsPresContext.h"
+#include "nsStringFwd.h"
 
-class nsCString;
 class nsCSSFrameConstructor;
 class nsStyleChangeList;
 

layout/base/nsIPresShell.h

@@ -23,6 +23,7 @@
 #include "nsIContent.h"
 #include "nsISelectionController.h"
 #include "nsQueryFrame.h"
+#include "nsStringFwd.h"
 #include "nsCoord.h"
 #include "nsColor.h"
 #include "nsFrameManagerBase.h"
@@ -49,7 +50,6 @@ class nsViewManager;
 class nsView;
 class nsIPageSequenceFrame;
 class nsCanvasFrame;
-class nsAString;
 class nsCaret;
 namespace mozilla {
 class AccessibleCaretEventHub;

layout/base/nsPresContext.h

@@ -17,6 +17,7 @@
 #include "nsCOMPtr.h"
 #include "nsIPresShell.h"
 #include "nsRect.h"
+#include "nsStringFwd.h"
 #include "nsFont.h"
 #include "gfxFontConstants.h"
 #include "nsIAtom.h"
@@ -46,7 +47,6 @@
 #include "mozilla/StaticPresData.h"
 #include "mozilla/StyleBackendType.h"
 
-class nsAString;
 class nsBidi;
 class nsIPrintSettings;
 class nsDocShell;

layout/forms/nsIFormControlFrame.h

@@ -7,8 +7,8 @@
 #define nsIFormControlFrame_h___
 
 #include "nsQueryFrame.h"
+#include "nsStringFwd.h"
 
-class nsAString;
 class nsIAtom;
 
 /**

layout/forms/nsIListControlFrame.h

@@ -7,8 +7,7 @@
 #define nsIListControlFrame_h___
 
 #include "nsQueryFrame.h"
-
-class nsAString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace dom {

layout/generic/nsHTMLCanvasFrame.h

@@ -10,6 +10,7 @@
 
 #include "mozilla/Attributes.h"
 #include "nsContainerFrame.h"
+#include "nsStringFwd.h"
 #include "FrameLayerBuilder.h"
 
 namespace mozilla {
@@ -21,7 +22,6 @@ class LayerManager;
 
 class nsPresContext;
 class nsDisplayItem;
-class nsAString;
 
 nsIFrame* NS_NewHTMLCanvasFrame (nsIPresShell* aPresShell, nsStyleContext* aContext);
 

layout/generic/nsVideoFrame.h

@@ -12,6 +12,7 @@
 #include "mozilla/Attributes.h"
 #include "nsContainerFrame.h"
 #include "nsIAnonymousContentCreator.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 #include "FrameLayerBuilder.h"
 
@@ -22,7 +23,6 @@ class LayerManager;
 } // namespace layers
 } // namespace mozilla
 
-class nsAString;
 class nsPresContext;
 class nsDisplayItem;
 

layout/inspector/inISearchProcess.idl

@@ -5,7 +5,6 @@
 
 #include "nsISupports.idl"
 
-interface nsAString;
 interface inISearchObserver;
 
 [scriptable, uuid(D5FA765B-2448-4686-B7C1-5FF13ACB0FC9)]

layout/style/ImportRule.h

@@ -13,8 +13,9 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/CSSImportRule.h"
 
+#include "nsStringFwd.h"
+
 class nsMediaList;
-class nsString;
 
 namespace mozilla {
 

layout/style/nsMediaList.h

@@ -16,11 +16,11 @@
 #include "nsTArray.h"
 #include "nsIAtom.h"
 #include "nsCSSValue.h"
+#include "nsStringFwd.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/MediaList.h"
 
 class nsPresContext;
-class nsAString;
 struct nsMediaFeature;
 
 namespace mozilla {

layout/style/nsStyleUtil.h

@@ -10,11 +10,11 @@
 #include "nsString.h"
 #include "nsTArrayForwardDeclare.h"
 #include "gfxFontFamilyList.h"
+#include "nsStringFwd.h"
 #include "nsStyleStruct.h"
 #include "nsCRT.h"
 
 class nsCSSValue;
-class nsStringComparator;
 class nsStyleCoord;
 class nsIContent;
 class nsIPrincipal;

netwerk/base/nsILoadInfo.idl

@@ -16,8 +16,7 @@ interface nsIURI;
 #include "nsTArray.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/LoadTainting.h"
-
-class nsCString;
+#include "nsStringFwd.h"
 %}
 
 [ref] native nsIRedirectHistoryEntryArray(const nsTArray<nsCOMPtr<nsIRedirectHistoryEntry>>);

netwerk/base/nsIURIClassifier.idl

@@ -5,8 +5,8 @@
 #include "nsISupports.idl"
 
 %{C++
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
-class nsCString;
 %}
 [ref] native StringArrayRef(nsTArray<nsCString>);
 

netwerk/cache/nsCacheDevice.h

@@ -10,9 +10,9 @@
 #include "nspr.h"
 #include "nsError.h"
 #include "nsICache.h"
+#include "nsStringFwd.h"
 
 class nsIFile;
-class nsCString;
 class nsCacheEntry;
 class nsICacheVisitor;
 class nsIInputStream;

netwerk/cache2/CacheFileUtils.h

@@ -13,7 +13,6 @@
 #include "mozilla/TimeStamp.h"
 
 class nsILoadContextInfo;
-class nsACString;
 
 namespace mozilla {
 namespace net {

netwerk/protocol/about/nsAboutCacheEntry.h

@@ -17,7 +17,6 @@ class nsIAsyncOutputStream;
 class nsIInputStream;
 class nsILoadContextInfo;
 class nsIURI;
-class nsCString;
 
 class nsAboutCacheEntry final : public nsIAboutModule
 {

netwerk/protocol/http/PSpdyPush.h

@@ -28,8 +28,7 @@
 #include "nsAutoPtr.h"
 #include "nsDataHashtable.h"
 #include "nsISupports.h"
-
-class nsCString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 namespace net {

netwerk/protocol/http/nsHttpAuthCache.h

@@ -10,11 +10,10 @@
 #include "nsTArray.h"
 #include "nsAutoPtr.h"
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 #include "plhash.h"
 #include "nsIObserver.h"
 
-class nsCString;
-
 namespace mozilla {
 
 class OriginAttributesPattern;

netwerk/protocol/http/nsIHttpChannelInternal.idl

@@ -6,9 +6,9 @@
 #include "nsISupports.idl"
 
 %{C++
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 template<class T> class nsCOMArray;
-class nsCString;
 %}
 [ptr] native StringArray(nsTArray<nsCString>);
 [ref] native StringArrayRef(const nsTArray<nsCString>);

netwerk/socket/nsISSLSocketControl.idl

@@ -10,8 +10,8 @@ interface nsIInterfaceRequestor;
 interface nsIX509Cert;
 
 %{C++
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
-class nsCString;
 %}
 [ref] native nsCStringTArrayRef(nsTArray<nsCString>);
 

netwerk/streamconv/nsStreamConverterService.h

@@ -10,9 +10,9 @@
 
 #include "nsClassHashtable.h"
 #include "nsCOMArray.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 
-class nsCString;
 class nsIAtom;
 
 class nsStreamConverterService : public nsIStreamConverterService {

parser/html/nsHtml5ArrayCopy.h

@@ -23,8 +23,8 @@
 #ifndef nsHtml5ArrayCopy_h
 #define nsHtml5ArrayCopy_h
 
+#include "nsStringFwd.h"
 
-class nsString;
 class nsHtml5StackNode;
 class nsHtml5AttributeName;
 

parser/htmlparser/nsIParser.h

@@ -33,7 +33,6 @@
 
 class nsIContentSink;
 class nsIRequestObserver;
-class nsString;
 class nsIURI;
 class nsIChannel;
 namespace mozilla {

rdf/base/nsIRDFXMLSink.idl

@@ -16,8 +16,8 @@
 [ptr] native nsIAtomPtr(nsIAtom);
 [ref] native nsStringRef(nsString);
 %{C++
+#include "nsStringFwd.h"
 class nsIAtom;
-class nsString;
 %}
 
 interface nsIRDFXMLSink;

rdf/base/rdfutil.h

@@ -22,9 +22,7 @@
 #ifndef rdfutil_h__
 #define rdfutil_h__
 
-
-class nsACString;
-class nsCString;
+#include "nsStringFwd.h"
 
 nsresult
 rdf_MakeRelativeRef(const nsACString& aBaseURI, nsCString& aURI);

security/manager/ssl/nsISiteSecurityService.idl

@@ -11,8 +11,8 @@ interface nsISSLStatus;
 interface nsISimpleEnumerator;
 
 %{C++
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
-class nsCString;
 namespace mozilla
 {
   namespace pkix

security/manager/ssl/nsNSSCertificate.h

@@ -17,6 +17,7 @@
 #include "nsIX509CertDB.h"
 #include "nsIX509CertList.h"
 #include "nsNSSShutDown.h"
+#include "nsStringFwd.h"
 
 namespace mozilla { namespace pkix { class DERArray; } }
 

security/manager/ssl/nsNSSCertificateDB.h

@@ -15,7 +15,6 @@
 #include "nsNSSShutDown.h"
 #include "nsString.h"
 
-class nsCString;
 class nsIArray;
 
 class nsNSSCertificateDB final : public nsIX509CertDB

toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.h

@@ -8,12 +8,11 @@
 
 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Maybe.h"
+#include "nsStringFwd.h"
 #include "TelemetryComms.h"
 
 class nsIRunnable;
 class nsITimer;
-class nsAString;
-class nsCString;
 
 namespace mozilla {
 

toolkit/components/windowwatcher/nsDialogParamBlock.h

@@ -10,13 +10,12 @@
 #include "nsIDialogParamBlock.h"
 #include "nsIMutableArray.h"
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 
 // {4E4AAE11-8901-46cc-8217-DAD7C5415873}
 #define NS_DIALOGPARAMBLOCK_CID \
   {0x4e4aae11, 0x8901, 0x46cc, {0x82, 0x17, 0xda, 0xd7, 0xc5, 0x41, 0x58, 0x73}}
 
-class nsString;
-
 class nsDialogParamBlock : public nsIDialogParamBlock
 {
 public:

toolkit/xre/nsAppRunner.h

@@ -24,6 +24,7 @@
 #endif
 #endif
 
+#include "nsStringFwd.h"
 #include "nsXULAppAPI.h"
 
 // This directory service key is a lot like NS_APP_LOCALSTORE_50_FILE,
@@ -38,7 +39,6 @@ class nsIFile;
 class nsIProfileLock;
 class nsIProfileUnlocker;
 class nsIFactory;
-class nsString;
 
 extern nsXREDirProvider* gDirServiceProvider;
 

tools/profiler/gecko/nsIProfiler.idl

@@ -7,7 +7,7 @@
 
 %{C++
 #include "nsTArrayForwardDeclare.h"
-class nsCString;
+#include "nsStringFwd.h"
 %}
 
 [ref] native nsCString(const nsCString);

tools/profiler/public/ChildProfilerController.h

@@ -8,10 +8,9 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/RefPtr.h"
+#include "nsStringFwd.h"
 #include "base/process.h"
 
-class nsCString;
-
 namespace mozilla {
 
 class ProfilerChild;

tools/profiler/tasktracer/GeckoTaskTracer.h

@@ -13,6 +13,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "nsCOMPtr.h"
+#include "nsStringFwd.h"
 #include "nsTArrayForwardDeclare.h"
 
 /**
@@ -30,7 +31,6 @@
  */
 
 class nsIRunnable;
-class nsCString;
 
 namespace mozilla {
 

widget/EventForwards.h

@@ -8,10 +8,9 @@
 
 #include <stdint.h>
 
+#include "nsStringFwd.h"
 #include "nsTArray.h"
 
-class nsCString;
-
 /**
  * XXX Following enums should be in BasicEvents.h.  However, currently, it's
  *     impossible to use foward delearation for enum.

widget/cocoa/nsMenuItemX.h

@@ -10,10 +10,10 @@
 #include "nsMenuBaseX.h"
 #include "nsMenuGroupOwnerX.h"
 #include "nsChangeObserver.h"
+#include "nsStringFwd.h"
 
 #import <Cocoa/Cocoa.h>
 
-class nsString;
 class nsMenuItemIconX;
 class nsMenuX;
 

widget/cocoa/nsMenuUtilsX.h

@@ -8,11 +8,11 @@
 
 #include "nscore.h"
 #include "nsMenuBaseX.h"
+#include "nsStringFwd.h"
 
 #import <Cocoa/Cocoa.h>
 
 class nsIContent;
-class nsString;
 class nsMenuBarX;
 
 // Namespace containing utility functions used in our native menu implementation.

widget/nsTransferable.h

@@ -14,7 +14,6 @@
 #include "nsIPrincipal.h"
 
 class nsIMutableArray;
-class nsString;
 
 //
 // DataStruct

widget/tests/TestChromeMargin.cpp

@@ -17,26 +17,12 @@
 #include "TestHarness.h"
 
 #ifndef MOZILLA_INTERNAL_API
-// some of the includes make use of internal string types
-#define nsAString_h___
-#define nsString_h___
-#define nsStringFwd_h___
-#define nsReadableUtils_h___
-class nsACString;
-class nsAString;
-class nsString;
-class nsCString;
-template<class T> class nsReadingIterator;
+#error This test needs MOZILLA_INTERNAL_API (see bug 652123)
 #endif
 
 #include "nscore.h"
 #include "nsContentUtils.h"
-
-#ifndef MOZILLA_INTERNAL_API
-#undef nsString_h___
-#undef nsAString_h___
-#undef nsReadableUtils_h___
-#endif
+#include "nsString.h"
 
 struct DATA {
   bool shouldfail;

widget/windows/WinModifierKeyState.h

@@ -8,10 +8,9 @@
 
 #include "mozilla/RefPtr.h"
 #include "mozilla/EventForwards.h"
+#include "nsStringFwd.h"
 #include <windows.h>
 
-class nsCString;
-
 namespace mozilla {
 namespace widget {
 

xpcom/base/ErrorNames.h

@@ -8,8 +8,7 @@
 #define mozilla_ErrorNames_h
 
 #include "nsError.h"
-
-class nsACString;
+#include "nsStringFwd.h"
 
 namespace mozilla {
 

xpcom/base/nsrootidl.idl

@@ -15,8 +15,7 @@ typedef int64_t PRTime;
 /*
  * Forward declarations for new string types
  */
-class nsAString;
-class nsACString;
+#include "nsStringFwd.h"
 
 /* 
  * Start commenting out the C++ versions of the below in the output header