Bug 1332639 - Remove the external string API: nsStringAPI.h/cpp and nsEmbedString.h, r=glandium

MozReview-Commit-ID: 9dZcmMAI0Vk

--HG--
extra : rebase_source : 5561cf7f3318c60f082fff02c5e78aba661f6437

Author: bsmedberg

dom/media/webrtc/PeerIdentity.h

@@ -7,11 +7,7 @@
 #ifndef PeerIdentity_h
 #define PeerIdentity_h
 
-#ifdef MOZILLA_INTERNAL_API
 #include "nsString.h"
-#else
-#include "nsStringAPI.h"
-#endif
 
 template <class T> class nsCOMPtr;
 class nsIIDNService;

gfx/thebes/gfxASurface.h

@@ -14,11 +14,7 @@
 #include "nsSize.h"
 #include "mozilla/gfx/Rect.h"
 
-#ifdef MOZILLA_INTERNAL_API
 #include "nsStringFwd.h"
-#else
-#include "nsStringAPI.h"
-#endif
 
 class gfxImageSurface;
 struct gfxRect;

netwerk/base/nsNetUtil.h

@@ -18,7 +18,9 @@
 #include "mozilla/Services.h"
 #include "mozilla/Unused.h"
 #include "nsNetCID.h"
+#include "nsReadableUtils.h"
 #include "nsServiceManagerUtils.h"
+#include "nsString.h"
 
 class nsIURI;
 class nsIPrincipal;
@@ -54,27 +56,10 @@ namespace mozilla { class OriginAttributes; }
 template <class> class nsCOMPtr;
 template <typename> struct already_AddRefed;
 
-#ifdef MOZILLA_INTERNAL_API
-#include "nsReadableUtils.h"
-#include "nsString.h"
-#else
-#include "nsStringAPI.h"
-#endif
-
-#ifdef MOZILLA_INTERNAL_API
 already_AddRefed<nsIIOService> do_GetIOService(nsresult *error = 0);
 
 already_AddRefed<nsINetUtil> do_GetNetUtil(nsresult *error = 0);
 
-#else
-// Helper, to simplify getting the I/O service.
-const nsGetServiceByContractIDWithError do_GetIOService(nsresult *error = 0);
-
-// An alias to do_GetIOService
-const nsGetServiceByContractIDWithError do_GetNetUtil(nsresult *error = 0);
-
-#endif
-
 // private little helper function... don't call this directly!
 nsresult net_EnsureIOService(nsIIOService **ios, nsCOMPtr<nsIIOService> &grip);
 
@@ -559,15 +544,10 @@ nsresult NS_ReadInputStreamToBuffer(nsIInputStream *aInputStream,
                                     void **aDest,
                                     uint32_t aCount);
 
-// external code can't see fallible_t
-#ifdef MOZILLA_INTERNAL_API
-
 nsresult NS_ReadInputStreamToString(nsIInputStream *aInputStream,
                                     nsACString &aDest,
                                     uint32_t aCount);
 
-#endif
-
 nsresult
 NS_LoadPersistentPropertiesFromURISpec(nsIPersistentProperties **outResult,
                                        const nsACString         &aSpec);
@@ -979,9 +959,4 @@ bool InScriptableRange(uint64_t val);
 } // namespace net
 } // namespace mozilla
 
-// Include some function bodies for callers with external linkage
-#ifndef MOZILLA_INTERNAL_API
-#include "nsNetUtilInlines.h"
-#endif
-
 #endif // !nsNetUtil_h__

toolkit/profile/ProfileUnlockerWin.h

@@ -11,7 +11,7 @@
 #include <restartmanager.h>
 
 #include "nsIProfileUnlocker.h"
-#include "nsProfileStringTypes.h"
+#include "nsString.h"
 #include "nsWindowsHelpers.h"
 
 namespace mozilla {

toolkit/profile/nsProfileLock.cpp

@@ -3,10 +3,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsProfileStringTypes.h"
 #include "nsProfileLock.h"
 #include "nsCOMPtr.h"
 #include "nsQueryObject.h"
+#include "nsString.h"
 
 #if defined(XP_WIN)
 #include "ProfileUnlockerWin.h"

toolkit/profile/nsProfileStringTypes.h

@@ -8,7 +8,6 @@
 #include <stdio.h>
 
 #include "nscore.h"
-#include "nsStringGlue.h"
 #include "private/pprio.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/FileUtils.h"
@@ -36,7 +35,9 @@
 
 // Functions that are not to be used in standalone glue must be implemented
 // within this #if block
-#if !defined(XPCOM_GLUE)
+#if defined(MOZILLA_INTERNAL_API)
+
+#include "nsString.h"
 
 bool
 mozilla::fallocate(PRFileDesc* aFD, int64_t aLength)

xpcom/glue/FileUtils.cpp

@@ -50,7 +50,7 @@ struct ScopedCloseFDTraits
 };
 typedef Scoped<ScopedCloseFDTraits> ScopedClose;
 
-#if !defined(XPCOM_GLUE)
+#if defined(MOZILLA_INTERNAL_API)
 
 /**
  * AutoFDClose is a RAII wrapper for PRFileDesc.
@@ -119,7 +119,7 @@ void ReadAheadFile(nsIFile* aFile, const size_t aOffset = 0,
                    const size_t aCount = SIZE_MAX,
                    filedesc_t* aOutFd = nullptr);
 
-#endif // !defined(XPCOM_GLUE)
+#endif // MOZILLA_INTERNAL_API
 
 /**
  * Use readahead to preload shared libraries into the file cache before loading.

xpcom/glue/FileUtils.h

@@ -10,7 +10,6 @@ with Files('nsString*'):
 DIRS += ['standalone']
 
 EXPORTS += [
-    'nsStringAPI.h',
     'nsStringGlue.h',
 ]
 

xpcom/glue/moz.build

@@ -14,11 +14,11 @@
 #ifndef nsStringGlue_h__
 #define nsStringGlue_h__
 
-#ifdef MOZILLA_INTERNAL_API
+#ifndef MOZILLA_INTERNAL_API
+#error "Using XPCOM strings is limited to code linked into libxul."
+#endif
+
 #include "nsString.h"
 #include "nsReadableUtils.h"
-#else
-#include "nsStringAPI.h"
-#endif
 
 #endif // nsStringGlue_h__