Bug 1423773 - Part 1: Remove usage of nsStringGlue.h. r=glandium

EricRahm · EricRahm · commit 07c97a5afe5f · 2017-12-06T16:52:51.000-08:00
This removes an unnecessary level of indirection by replacing all
nsStringGlue.h instances with just nsString.h.

--HG--
extra : rebase_source : 340989240af4018f3ebfd92826ae11b0cb46d019
diff --git a/dom/base/NodeInfo.h b/dom/base/NodeInfo.h
@@ -23,7 +23,7 @@
 
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/dom/NameSpaceConstants.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "mozilla/Attributes.h"
 #include "nsAtom.h"
 
diff --git a/dom/base/nsAttrValue.h b/dom/base/nsAttrValue.h
@@ -15,7 +15,7 @@
 #include <type_traits>
 
 #include "nscore.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsStringBuffer.h"
 #include "nsColor.h"
 #include "nsCaseTreatment.h"
diff --git a/dom/base/nsDOMString.h b/dom/base/nsDOMString.h
@@ -7,7 +7,7 @@
 #ifndef nsDOMString_h___
 #define nsDOMString_h___
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 inline bool DOMStringIsNull(const nsAString& aString)
 {
diff --git a/dom/base/nsIScriptContext.h b/dom/base/nsIScriptContext.h
@@ -8,7 +8,7 @@
 #define nsIScriptContext_h__
 
 #include "nscore.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 #include "jspubtd.h"
diff --git a/dom/base/test/gtest/TestPlainTextSerializer.cpp b/dom/base/test/gtest/TestPlainTextSerializer.cpp
@@ -7,7 +7,7 @@
 #include "gtest/gtest.h"
 
 #include "nsServiceManagerUtils.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsIDocumentEncoder.h"
 #include "nsCRT.h"
 #include "nsIParserUtils.h"
diff --git a/dom/bindings/BindingDeclarations.h b/dom/bindings/BindingDeclarations.h
@@ -23,7 +23,7 @@
 #include "mozilla/dom/DOMString.h"
 
 #include "nsCOMPtr.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsTArray.h"
 
 class nsIPrincipal;
diff --git a/dom/bindings/DOMString.h b/dom/bindings/DOMString.h
@@ -7,7 +7,7 @@
 #ifndef mozilla_dom_DOMString_h
 #define mozilla_dom_DOMString_h
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsStringBuffer.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
diff --git a/dom/bindings/ErrorResult.h b/dom/bindings/ErrorResult.h
@@ -30,7 +30,7 @@
 #include "js/GCAnnotations.h"
 #include "js/Value.h"
 #include "nscore.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Move.h"
 #include "nsTArray.h"
diff --git a/dom/bindings/Exceptions.h b/dom/bindings/Exceptions.h
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include "jspubtd.h"
 #include "nsIException.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "jsapi.h"
 
 class nsIStackFrame;
diff --git a/dom/bindings/Record.h b/dom/bindings/Record.h
@@ -13,7 +13,7 @@
 
 #include "nsTHashtable.h"
 #include "nsHashKeys.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Move.h"
diff --git a/dom/bindings/nsIScriptError.idl b/dom/bindings/nsIScriptError.idl
@@ -14,7 +14,7 @@
 interface nsIURI;
 
 %{C++
-#include "nsStringGlue.h" // for nsDependentCString
+#include "nsString.h" // for nsDependentCString
 %}
 
 [scriptable, uuid(e8933fc9-c302-4e12-a55b-4f88611d9c6c)]
diff --git a/dom/filesystem/GetDirectoryListingTask.cpp b/dom/filesystem/GetDirectoryListingTask.cpp
@@ -17,7 +17,7 @@
 #include "mozilla/dom/UnionTypes.h"
 #include "nsIFile.h"
 #include "nsISimpleEnumerator.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/filesystem/GetFileOrDirectoryTask.cpp b/dom/filesystem/GetFileOrDirectoryTask.cpp
@@ -14,7 +14,7 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "nsIFile.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/filesystem/GetFilesTask.cpp b/dom/filesystem/GetFilesTask.cpp
@@ -15,7 +15,7 @@
 #include "mozilla/dom/PFileSystemParams.h"
 #include "mozilla/dom/Promise.h"
 #include "nsIFile.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/media/gmp/mozIGeckoMediaPluginService.idl b/dom/media/gmp/mozIGeckoMediaPluginService.idl
@@ -9,7 +9,7 @@
 %{C++
 #include "mozilla/UniquePtr.h"
 #include "nsTArray.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 class GMPDecryptorProxy;
 class GMPVideoDecoderProxy;
 class GMPVideoEncoderProxy;
diff --git a/dom/svg/SVGAttrValueWrapper.h b/dom/svg/SVGAttrValueWrapper.h
@@ -12,7 +12,7 @@
  * types don't need to be exported outside the SVG module.
  */
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 class nsSVGAngle;
 class nsSVGIntegerPair;
diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h
@@ -18,7 +18,7 @@
 #include "nsRect.h"                     // for mozilla::gfx::IntRect, nsRect
 #include "nsMargin.h"                   // for nsIntMargin
 #include "nsRegionFwd.h"                // for nsIntRegion
-#include "nsStringGlue.h"               // for nsCString
+#include "nsString.h"                   // for nsCString
 #include "xpcom-config.h"               // for CPP_THROW_NEW
 #include "mozilla/ArrayView.h"          // for ArrayView
 #include "mozilla/Move.h"               // for mozilla::Move
diff --git a/image/imgRequest.h b/image/imgRequest.h
@@ -15,7 +15,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsProxyRelease.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsError.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 #include "mozilla/Mutex.h"
diff --git a/intl/locale/DateTimeFormat.h b/intl/locale/DateTimeFormat.h
@@ -9,7 +9,7 @@
 
 #include <time.h>
 #include "gtest/MozGtestFriend.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "prtime.h"
 #include "unicode/udat.h"
 
diff --git a/intl/unicharutil/util/ICUUtils.cpp b/intl/unicharutil/util/ICUUtils.cpp
@@ -9,7 +9,7 @@
 #include "mozilla/intl/LocaleService.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "unicode/uloc.h"
 #include "unicode/unum.h"
 
diff --git a/intl/unicharutil/util/ICUUtils.h b/intl/unicharutil/util/ICUUtils.h
@@ -11,7 +11,7 @@
 #ifdef MOZILLA_INTERNAL_API
 
 #include "mozilla/Scoped.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "unicode/unum.h" // for UNumberFormat
 
 class nsIContent;
diff --git a/intl/unicharutil/util/nsBidiUtils.h b/intl/unicharutil/util/nsBidiUtils.h
@@ -6,7 +6,7 @@
 #ifndef nsBidiUtils_h__
 #define nsBidiUtils_h__
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
    /**
     *  Read ftp://ftp.unicode.org/Public/UNIDATA/ReadMe-Latest.txt
diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h
@@ -6,7 +6,7 @@
 #ifndef nsUnicharUtils_h__
 #define nsUnicharUtils_h__
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 /* (0x3131u <= (u) && (u) <= 0x318eu) => Hangul Compatibility Jamo */
 /* (0xac00u <= (u) && (u) <= 0xd7a3u) => Hangul Syllables          */
diff --git a/ipc/ipdl/ipdl/builtin.py b/ipc/ipdl/ipdl/builtin.py
@@ -49,7 +49,7 @@
     'IPCMessageStart.h',
     'ipc/IPCMessageUtils.h',
     'mozilla/RefPtr.h',
-    'nsStringGlue.h',
+    'nsString.h',
     'nsTArray.h',
     'mozilla/ipc/ProtocolUtils.h',
     'nsTHashtable.h',
diff --git a/js/xpconnect/loader/mozJSSubScriptLoader.cpp b/js/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -30,7 +30,7 @@
 #include "mozilla/scache/StartupCacheUtils.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsCycleCollectionParticipant.h"
 #include "GeckoProfiler.h"
 
diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp
@@ -11,7 +11,7 @@
 #include "jsprf.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Exceptions.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
@@ -18,7 +18,7 @@
 #include "nsIGlobalObject.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/dom/JSSlots.h"
 #include "mozilla/fallible.h"
diff --git a/js/xpconnect/tests/components/native/xpctest_private.h b/js/xpconnect/tests/components/native/xpctest_private.h
@@ -11,7 +11,7 @@
 
 #include "nsISupports.h"
 #include "nsMemory.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "xpctest_attributes.h"
 #include "xpctest_params.h"
 #include "xpctest_returncode.h"
diff --git a/js/xpconnect/wrappers/AccessCheck.h b/js/xpconnect/wrappers/AccessCheck.h
@@ -9,7 +9,7 @@
 
 #include "jswrapper.h"
 #include "js/Id.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 class nsIPrincipal;
 
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
@@ -37,7 +37,7 @@
 #include "nsITheme.h"
 #include "nsLayoutUtils.h"
 #include "nsQueryFrame.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsStyleContext.h"
 #include "nsStyleStruct.h"
 #include "Visibility.h"
diff --git a/layout/style/BindingStyleRule.h b/layout/style/BindingStyleRule.h
@@ -8,7 +8,7 @@
 #define mozilla_BindingStyleRule_h__
 
 #include "nscore.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "mozilla/css/Rule.h"
 #include "mozilla/NotNull.h"
 
diff --git a/netwerk/base/ReferrerPolicy.h b/netwerk/base/ReferrerPolicy.h
@@ -5,7 +5,7 @@
 #ifndef ReferrerPolicy_h__
 #define ReferrerPolicy_h__
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsIHttpChannel.h"
 #include "nsUnicharUtils.h"
 
diff --git a/netwerk/base/nsIURI.idl b/netwerk/base/nsIURI.idl
@@ -36,7 +36,7 @@
  */
 
 %{C++
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 #undef GetPort  // XXX Windows!
 #undef SetPort  // XXX Windows!
diff --git a/netwerk/base/nsIURIMutator.idl b/netwerk/base/nsIURIMutator.idl
@@ -9,7 +9,7 @@ interface nsIObjectInputStream;
 interface nsIURIMutator;
 
 %{C++
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsCOMPtr.h"
 
 #undef SetPort  // XXX Windows!
diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
@@ -11,7 +11,7 @@
 #include "ipc/IPCMessageUtils.h"
 #include "nsExceptionHandler.h"
 #include "nsPrintfCString.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "prio.h"
 #include "mozilla/net/DNS.h"
 #include "TimingStruct.h"
diff --git a/rdf/base/nsRDFResource.h b/rdf/base/nsRDFResource.h
@@ -10,7 +10,7 @@
 #include "nsIRDFNode.h"
 #include "nsIRDFResource.h"
 #include "nscore.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "rdf.h"
 
 class nsIRDFService;
diff --git a/storage/mozStorageHelper.h b/storage/mozStorageHelper.h
@@ -7,7 +7,7 @@
 #define MOZSTORAGEHELPER_H
 
 #include "nsAutoPtr.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "mozilla/DebugOnly.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
diff --git a/toolkit/components/telemetry/Telemetry.h b/toolkit/components/telemetry/Telemetry.h
@@ -10,7 +10,7 @@
 #include "mozilla/TimeStamp.h"
 #include "mozilla/StartupTimeline.h"
 #include "nsTArray.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsXULAppAPI.h"
 
 #include "mozilla/TelemetryHistogramEnums.h"
diff --git a/toolkit/crashreporter/nsExceptionHandler.h b/toolkit/crashreporter/nsExceptionHandler.h
@@ -18,7 +18,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "nsError.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 #if defined(XP_WIN32)
 #ifdef WIN32_LEAN_AND_MEAN
diff --git a/toolkit/system/osxproxy/ProxyUtils.h b/toolkit/system/osxproxy/ProxyUtils.h
@@ -6,7 +6,7 @@
 #ifndef mozilla_toolkit_system_osxproxy_ProxyUtils_h
 #define mozilla_toolkit_system_osxproxy_ProxyUtils_h
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace toolkit {
diff --git a/toolkit/system/windowsproxy/ProxyUtils.h b/toolkit/system/windowsproxy/ProxyUtils.h
@@ -6,7 +6,7 @@
 #ifndef mozilla_toolkit_system_windowsproxy_ProxyUtils_h
 #define mozilla_toolkit_system_windowsproxy_ProxyUtils_h
 
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace toolkit {
diff --git a/tools/fuzzing/libfuzzer/harness/LibFuzzerTestHarness.h b/tools/fuzzing/libfuzzer/harness/LibFuzzerTestHarness.h
@@ -20,7 +20,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
diff --git a/widget/ContentEvents.h b/widget/ContentEvents.h
@@ -13,7 +13,7 @@
 #include "mozilla/dom/EventTarget.h"
 #include "nsCOMPtr.h"
 #include "nsRect.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 class nsIContent;
 
diff --git a/widget/IMEData.h b/widget/IMEData.h
@@ -8,7 +8,7 @@
 
 #include "nsPoint.h"
 #include "nsRect.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsXULAppAPI.h"
 #include "Units.h"
 
diff --git a/widget/TextEvents.h b/widget/TextEvents.h
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
diff --git a/xpcom/base/nsVersionComparator.cpp b/xpcom/base/nsVersionComparator.cpp
diff --git a/xpcom/base/nsVersionComparator.h b/xpcom/base/nsVersionComparator.h
diff --git a/xpcom/ds/nsHashKeys.h b/xpcom/ds/nsHashKeys.h
diff --git a/xpcom/io/FileUtilsWin.h b/xpcom/io/FileUtilsWin.h
diff --git a/xpcom/io/nsStringStream.h b/xpcom/io/nsStringStream.h
diff --git a/xpcom/string/nsTextFormatter.h b/xpcom/string/nsTextFormatter.h
diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h
diff --git a/xpcom/threads/BlockingResourceBase.h b/xpcom/threads/BlockingResourceBase.h
diff --git a/xpcom/threads/nsThreadUtils.h b/xpcom/threads/nsThreadUtils.h

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#ifndef nsDOMString_h___`
`8`	`8`	`#define nsDOMString_h___`
`9`	`9`
`10`		`-#include "nsStringGlue.h"`
	`10`	`+#include "nsString.h"`
`11`	`11`
`12`	`12`	`inline bool DOMStringIsNull(const nsAString& aString)`
`13`	`13`	`{`