Bug 1120062 - Part 1: Remove most Nullptr.h includes. r=waldo

build/unix/elfhack/elfxx.h

@@ -2,8 +2,6 @@
  * 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 "mozilla/NullPtr.h"
-
 #include <stdexcept>
 #include <list>
 #include <vector>

dom/bluetooth/bluez/BluetoothDBusService.cpp

@@ -46,7 +46,6 @@
 #include "mozilla/LazyIdleThread.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/unused.h"
 

dom/bluetooth2/bluez/BluetoothDBusService.cpp

@@ -45,7 +45,6 @@
 #include "mozilla/ipc/RawDBusConnection.h"
 #include "mozilla/LazyIdleThread.h"
 #include "mozilla/Mutex.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/unused.h"
 

dom/media/compiledtest/TestAudioBuffers.cpp

@@ -5,7 +5,6 @@
 
 #include <stdint.h>
 #include <assert.h>
-#include <mozilla/NullPtr.h>
 #include "AudioBufferUtils.h"
 
 const uint32_t FRAMES = 256;

dom/media/eme/EMELog.cpp

@@ -5,7 +5,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "EMELog.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

dom/media/gmp-plugin/gmp-test-decryptor.cpp

@@ -17,7 +17,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 
 using namespace std;
 

dom/media/gmp-plugin/gmp-test-storage.cpp

@@ -8,7 +8,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 
 class WriteRecordClient : public GMPRecordClient {
 public:

dom/media/gmp/GMPLoader.cpp

@@ -7,7 +7,6 @@
 #include "GMPLoader.h"
 #include <stdio.h>
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 #include "gmp-entrypoints.h"
 #include "prlink.h"
 

dom/media/gstreamer/GStreamerLoader.cpp

@@ -7,7 +7,6 @@
 #include <stdio.h>
 
 #include "nsDebug.h"
-#include "mozilla/NullPtr.h"
 
 #include "GStreamerLoader.h"
 

dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaResourceHandler.h"
-#include "mozilla/NullPtr.h"
 
 namespace android {
 

dom/media/systemservices/OSXRunLoopSingleton.cpp

@@ -5,7 +5,6 @@
 
 #include "OSXRunLoopSingleton.h"
 #include <mozilla/StaticMutex.h>
-#include <mozilla/NullPtr.h>
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/AudioHardware.h>

dom/media/systemservices/OpenSLESProvider.cpp

@@ -6,7 +6,6 @@
 #include "OpenSLESProvider.h"
 #include "prlog.h"
 #include "nsDebug.h"
-#include "mozilla/NullPtr.h"
 
 #include <dlfcn.h>
 #include <SLES/OpenSLES_Android.h>

dom/plugins/test/testplugin/nptest.cpp

@@ -58,8 +58,6 @@
 #include <pthread.h>
 #endif
 
-#include "mozilla/NullPtr.h"
-
 using namespace std;
 
 #define PLUGIN_VERSION     "1.0.0.0"

dom/plugins/test/testplugin/nptest_gtk2.cpp

@@ -45,7 +45,6 @@
 #include <gtk/gtk.h>
 #include <unistd.h>
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/IntentionalCrash.h"
 
  using namespace std;

dom/plugins/test/testplugin/nptest_utils.cpp

@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "mozilla/NullPtr.h"
 
 NPUTF8*
 createCStringFromNPVariant(const NPVariant* variant)

gfx/2d/Types.h

@@ -6,7 +6,6 @@
 #ifndef MOZILLA_GFX_TYPES_H_
 #define MOZILLA_GFX_TYPES_H_
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/TypedEnum.h"
 
 #include <stddef.h>

gfx/layers/AtomicRefCountedWithFinalize.h

@@ -7,7 +7,6 @@
 #define MOZILLA_ATOMICREFCOUNTEDWITHFINALIZE_H_
 
 #include "mozilla/RefPtr.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/Likely.h"
 #include "MainThreadUtils.h"
 #include "base/message_loop.h"

gfx/thebes/nsUnicodeRange.cpp

@@ -5,7 +5,6 @@
 
 #include "nsUnicodeRange.h"
 #include "nsGkAtoms.h"
-#include "mozilla/NullPtr.h"
 
 // This table depends on unicode range definitions. 
 // Each item's index must correspond unicode range value

ipc/chromium/src/chrome/common/child_process_host.cc

@@ -53,7 +53,7 @@ ChildProcessHost::ChildProcessHost(ProcessType type)
       ChildProcessInfo(type),
       ALLOW_THIS_IN_INITIALIZER_LIST(listener_(this)),
       opening_channel_(false),
-      process_event_(NULL) {
+      process_event_(nullptr) {
   Singleton<ChildProcessList>::get()->push_back(this);
 }
 

js/public/CharacterEncoding.h

@@ -7,7 +7,6 @@
 #ifndef js_CharacterEncoding_h
 #define js_CharacterEncoding_h
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/Range.h"
 
 #include "js/TypeDecls.h"

js/public/Class.h

@@ -10,7 +10,6 @@
 #define js_Class_h
 
 #include "mozilla/DebugOnly.h"
-#include "mozilla/NullPtr.h"
 
 #include "jstypes.h"
 

js/public/GCAPI.h

@@ -7,8 +7,6 @@
 #ifndef js_GCAPI_h
 #define js_GCAPI_h
 
-#include "mozilla/NullPtr.h"
-
 #include "js/HeapAPI.h"
 
 namespace js {

js/public/HashTable.h

@@ -13,7 +13,6 @@
 #include "mozilla/Casting.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/ReentrancyGuard.h"
 #include "mozilla/TemplateLib.h"

js/public/Id.h

@@ -20,8 +20,6 @@
 // A jsid is not implicitly convertible to or from a jsval; JS_ValueToId or
 // JS_IdToValue must be used instead.
 
-#include "mozilla/NullPtr.h"
-
 #include "jstypes.h"
 
 #include "js/HeapAPI.h"

js/public/MemoryMetrics.h

@@ -11,7 +11,6 @@
 // at your own risk.
 
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/PodOperations.h"
 
 #include <string.h>

js/public/ProfilingStack.h

@@ -7,7 +7,6 @@
 #ifndef js_ProfilingStack_h
 #define js_ProfilingStack_h
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/TypedEnum.h"
 
 #include "jsbytecode.h"

js/public/StructuredClone.h

@@ -7,8 +7,6 @@
 #ifndef js_StructuredClone_h
 #define js_StructuredClone_h
 
-#include "mozilla/NullPtr.h"
-
 #include <stdint.h>
 
 #include "jstypes.h"

js/public/TracingAPI.h

@@ -7,8 +7,6 @@
 #ifndef js_TracingAPI_h
 #define js_TracingAPI_h
 
-#include "mozilla/NullPtr.h"
-
 #include "jsalloc.h"
 #include "jspubtd.h"
 

js/public/Utility.h

@@ -11,7 +11,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Compiler.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/Scoped.h"
 #include "mozilla/TemplateLib.h"
 #include "mozilla/UniquePtr.h"

js/src/asmjs/AsmJSFrameIterator.h

@@ -19,8 +19,6 @@
 #ifndef asmjs_AsmJSFrameIterator_h
 #define asmjs_AsmJSFrameIterator_h
 
-#include "mozilla/NullPtr.h"
-
 #include <stdint.h>
 
 #include "js/ProfilingFrameIterator.h"

js/src/jit/JSONSpewer.h

@@ -7,8 +7,6 @@
 #ifndef jit_JSONSpewer_h
 #define jit_JSONSpewer_h
 
-#include "mozilla/NullPtr.h"
-
 #include <stdio.h>
 
 #include "js/TypeDecls.h"

js/src/jspubtd.h

@@ -13,7 +13,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/LinkedList.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/PodOperations.h"
 
 #include "jsprototypes.h"

js/xpconnect/src/XPCLog.cpp

@@ -10,7 +10,6 @@
 #include "prlog.h"
 #include "prprf.h"
 #include "mozilla/mozalloc.h"
-#include "mozilla/NullPtr.h"
 #include <string.h>
 #include <stdarg.h>
 

layout/base/StackArena.h

@@ -8,7 +8,6 @@
 #include "nsError.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

layout/style/CounterStyleManager.h

@@ -12,7 +12,6 @@
 
 #include "nsStyleConsts.h"
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/Attributes.h"
 
 #include "nsCSSValue.h"

media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp

@@ -12,7 +12,6 @@
 #include "gmp-task-utils.h"
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 using namespace mozilla;
 using namespace std;

media/gmp-clearkey/0.1/ClearKeyStorage.cpp

@@ -8,7 +8,6 @@
 #include "gmp-task-utils.h"
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/ArrayUtils.h"
 
 #include <vector>

media/gmp-clearkey/0.1/ClearKeyUtils.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Endian.h"
-#include "mozilla/NullPtr.h"
 #include "openaes/oaes_lib.h"
 
 using namespace std;

media/gmp-clearkey/0.1/gmp-clearkey.cpp

@@ -10,7 +10,6 @@
 #include "gmp-api/gmp-decryption.h"
 #include "gmp-api/gmp-platform.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 
 static GMPPlatformAPI* sPlatform = nullptr;
 GMPPlatformAPI*

media/mtransport/nriceresolverfake.h

@@ -49,7 +49,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "nspr.h"
 #include "prnetdb.h"
-#include "mozilla/NullPtr.h"
 
 typedef struct nr_resolver_ nr_resolver;
 typedef struct nr_resolver_vtbl_ nr_resolver_vtbl;

media/mtransport/rlogringbuffer.cpp

@@ -16,7 +16,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Move.h" // Pinch hitting for <utility> and std::move
 #include "mozilla/Mutex.h"
-#include "mozilla/NullPtr.h"
 #include <vector>
 
 extern "C" {

memory/build/replace_malloc_bridge.h

@@ -50,7 +50,6 @@ struct ReplaceMallocBridge;
 
 #ifdef __cplusplus
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/Types.h"
 
 #ifndef REPLACE_MALLOC_IMPL

memory/mozalloc/VolatileBuffer.h

@@ -8,7 +8,6 @@
 #include "mozilla/mozalloc.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/NullPtr.h"
 
 /* VolatileBuffer
  *

memory/mozalloc/VolatileBufferAshmem.cpp

@@ -4,7 +4,6 @@
 
 #include "VolatileBuffer.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/mozalloc.h"
 
 #include <fcntl.h>

memory/mozalloc/VolatileBufferFallback.cpp

@@ -4,7 +4,6 @@
 
 #include "VolatileBuffer.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/mozalloc.h"
 
 #ifdef MOZ_MEMORY

memory/mozalloc/mozalloc.h

@@ -21,7 +21,6 @@
 
 #if defined(__cplusplus)
 #include "mozilla/fallible.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/TemplateLib.h"
 #endif
 #include "mozilla/Attributes.h"

memory/mozalloc/tests/TestVolatileBuffer.cpp

@@ -4,7 +4,6 @@
 
 #include "TestHarness.h"
 #include "mozilla/VolatileBuffer.h"
-#include "mozilla/NullPtr.h"
 #include <string.h>
 
 #if defined(ANDROID)

memory/replace/logalloc/FdPrintf.cpp

@@ -13,7 +13,6 @@
 #endif
 #include <cstring>
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 /* Template class allowing a limited number of increments on a value */
 template <typename T>

memory/replace/logalloc/LogAlloc.cpp

@@ -19,7 +19,6 @@
 
 #include "replace_malloc.h"
 #include "FdPrintf.h"
-#include "mozilla/NullPtr.h"
 
 #include "base/lock.h"
 

memory/replace/logalloc/replay/Replay.cpp

@@ -23,7 +23,6 @@ typedef int ssize_t;
 #include <cstring>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 #include "FdPrintf.h"
 
 static void

mfbt/AllocPolicy.h

@@ -12,7 +12,6 @@
 #ifndef mozilla_AllocPolicy_h
 #define mozilla_AllocPolicy_h
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/TemplateLib.h"
 
 #include <stddef.h>

mfbt/AlreadyAddRefed.h

@@ -12,7 +12,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

mfbt/GuardObjects.h

@@ -10,7 +10,6 @@
 #define mozilla_GuardObjects_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/Types.h"
 
 #ifdef __cplusplus

mfbt/LinkedList.h

@@ -64,7 +64,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 
 #ifdef __cplusplus
 

mfbt/Range.h

@@ -7,7 +7,6 @@
 #ifndef mozilla_Range_h
 #define mozilla_Range_h
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/RangedPtr.h"
 
 #include <stddef.h>

mfbt/RangedPtr.h

@@ -15,7 +15,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 
 #include <stdint.h>
 

mfbt/RefPtr.h

@@ -12,7 +12,6 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/RefCountType.h"
 #include "mozilla/TypeTraits.h"
 #if defined(MOZILLA_INTERNAL_API)

mfbt/Scoped.h

@@ -58,7 +58,6 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

mfbt/SplayTree.h

@@ -13,7 +13,6 @@
 #define mozilla_SplayTree_h
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

mfbt/TaggedAnonymousMemory.cpp

@@ -15,7 +15,6 @@
 #include <unistd.h>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 // These constants are copied from <sys/prctl.h>, because the headers
 // used for building may not have them even though the running kernel

mfbt/ThreadLocal.h

@@ -29,7 +29,6 @@ __declspec(dllimport) unsigned long __stdcall TlsAlloc();
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/TypeTraits.h"
 
 namespace mozilla {

mfbt/Vector.h

@@ -17,7 +17,6 @@
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/Move.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/ReentrancyGuard.h"
 #include "mozilla/TemplateLib.h"
 #include "mozilla/TypeTraits.h"

mfbt/WeakPtr.h

@@ -70,7 +70,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/TypeTraits.h"
 

mfbt/decimal/moz-decimal-utils.h

@@ -14,7 +14,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Casting.h"
 #include "mozilla/FloatingPoint.h"
-#include "mozilla/NullPtr.h"
 
 #include <cmath>
 #include <cstring>

mfbt/tests/TestArrayUtils.cpp

@@ -6,7 +6,6 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 using mozilla::IsInRange;
 

mfbt/tests/TestPoisonArea.cpp

@@ -80,7 +80,6 @@
  */
 
 #include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/NullPtr.h"
 
 // MAP_ANON(YMOUS) is not in any standard.  Add defines as necessary.
 #define _GNU_SOURCE 1

mozglue/build/arm.cpp

@@ -4,8 +4,6 @@
 
 /* compile-time and runtime tests for whether to use various ARM extensions */
 
-#include "mozilla/NullPtr.h"
-
 #include "arm.h"
 
 #if defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)

netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp

@@ -30,7 +30,6 @@
 
 #include <arpa/inet.h>
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/mozalloc.h"
 #include "nsTArray.h"
 #include "prnetdb.h"

netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp

@@ -31,7 +31,6 @@
 #include <media/stagefright/MetaData.h>
 #include <utils/ByteOrder.h>
 
-#include "mozilla/NullPtr.h"
 #include "NetworkActivityMonitor.h"
 
 using namespace mozilla::net;

netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h

@@ -36,7 +36,6 @@
 #include <media/stagefright/OMXCodec.h>
 #endif
 
-#include "mozilla/NullPtr.h"
 #include "prnetdb.h"
 #include "prerr.h"
 

netwerk/protocol/rtsp/rtsp/UDPPusher.cpp

@@ -24,7 +24,6 @@
 #include <media/stagefright/foundation/AMessage.h>
 #include <utils/ByteOrder.h>
 
-#include "mozilla/NullPtr.h"
 #include "prnetdb.h"
 #include "prerr.h"
 #include "NetworkActivityMonitor.h"

parser/html/jArray.h

@@ -25,7 +25,6 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/BinarySearch.h"
-#include "mozilla/NullPtr.h"
 #include "nsDebug.h"
 
 template<class T, class L>
@@ -92,7 +91,7 @@ class autoJArray {
       arr = other.arr;
       length = other.length;
     }
-    void operator=(mozilla::NullptrT n) {
+    void operator=(decltype(nullptr) n) {
       // Make assigning null to an array in Java delete the buffer in C++
       MOZ_ASSERT(n == nullptr);
       delete[] arr;

security/sandbox/linux/Sandbox.cpp

@@ -25,7 +25,6 @@
 #include <fcntl.h>
 
 #include "mozilla/Atomics.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/SandboxInfo.h"
 #include "mozilla/unused.h"
 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h"

security/sandbox/linux/SandboxAssembler.cpp

@@ -9,7 +9,6 @@
 #include <errno.h>
 #include <utility>
 
-#include "mozilla/NullPtr.h"
 #include "sandbox/linux/seccomp-bpf/codegen.h"
 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
 

security/sandbox/linux/SandboxFilter.cpp

@@ -17,7 +17,6 @@
 #include <unistd.h>
 
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/NullPtr.h"
 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
 #include "sandbox/linux/services/linux_syscalls.h"
 

security/sandbox/linux/common/SandboxInfo.cpp

@@ -12,7 +12,6 @@
 
 #include "sandbox/linux/seccomp-bpf/linux_seccomp.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

security/sandbox/linux/glue/SandboxCrash.cpp

@@ -15,7 +15,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include "mozilla/NullPtr.h"
 #include "mozilla/unused.h"
 #include "mozilla/dom/Exceptions.h"
 #include "nsContentUtils.h"

testing/gtest/mozilla/GTestRunner.cpp

@@ -6,7 +6,6 @@
 #include "GTestRunner.h"
 #include "gtest/gtest.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 #ifdef MOZ_CRASHREPORTER
 #include "nsICrashReporter.h"
 #endif

testing/tools/screenshot/gdk-screenshot.cpp

@@ -42,7 +42,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include "mozilla/NullPtr.h"
 
 gboolean save_to_stdout(const gchar *buf, gsize count,
                         GError **error, gpointer data)

toolkit/components/finalizationwitness/FinalizationWitnessService.cpp

@@ -12,7 +12,6 @@
 
 #include "mozilla/Scoped.h"
 #include "mozilla/Services.h"
-#include "mozilla/NullPtr.h"
 #include "nsIObserverService.h"
 #include "nsThreadUtils.h"
 

toolkit/crashreporter/client/crashreporter.cpp

@@ -16,7 +16,6 @@
 #include <time.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mozilla/NullPtr.h"
 
 using std::string;
 using std::istream;

toolkit/crashreporter/client/crashreporter_gtk_common.cpp

@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 
-#include "mozilla/NullPtr.h"
 #include "common/linux/http_upload.h"
 #include "crashreporter.h"
 #include "crashreporter_gtk_common.h"

toolkit/crashreporter/client/crashreporter_linux.cpp

@@ -11,7 +11,6 @@
 
 #include <cctype>
 
-#include "mozilla/NullPtr.h"
 #include "crashreporter.h"
 #include "crashreporter_gtk_common.h"
 

toolkit/crashreporter/client/crashreporter_win.cpp

@@ -23,7 +23,6 @@
 #include "resource.h"
 #include "client/windows/sender/crash_report_sender.h"
 #include "common/windows/string_utils-inl.h"
-#include "mozilla/NullPtr.h"
 
 #define CRASH_REPORTER_VALUE L"Enabled"
 #define SUBMIT_REPORT_VALUE  L"SubmitCrashReport"

toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp

@@ -1,5 +1,4 @@
 #include "mozilla/Module.h"
-#include "mozilla/NullPtr.h"
 
 /* Ensure end_kPStaticModules is at the end of the .kPStaticModules section
  * on Windows. Somehow, placing the object last is not enough with PGO/LTCG. */

toolkit/library/StaticXULComponentsStart.cpp

@@ -1,4 +1,3 @@
 #include "mozilla/Module.h"
-#include "mozilla/NullPtr.h"
 
 NSMODULE_DEFN(start_kPStaticModules) = nullptr;

toolkit/mozapps/update/common/readstrings.h

@@ -7,8 +7,6 @@
 #ifndef READSTRINGS_H__
 #define READSTRINGS_H__
 
-#include "mozilla/NullPtr.h"
-
 #define MAX_TEXT_LEN 600
 
 #ifdef XP_WIN

toolkit/mozapps/update/tests/TestAUSHelper.cpp

@@ -50,7 +50,6 @@
 # define LOG_S "%s"
 #endif
 
-#include "mozilla/NullPtr.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

toolkit/mozapps/update/updater/archivereader.h

@@ -7,7 +7,6 @@
 #ifndef ArchiveReader_h__
 #define ArchiveReader_h__
 
-#include "mozilla/NullPtr.h"
 #include <stdio.h>
 #include "mar.h"
 

tools/profiler/AutoObjectMapper.cpp

@@ -11,7 +11,6 @@
 #include <fcntl.h>
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 #include "PlatformMacros.h"
 #include "AutoObjectMapper.h"

tools/profiler/GeckoProfiler.h

@@ -49,7 +49,6 @@
 #ifndef SAMPLER_H
 #define SAMPLER_H
 
-#include "mozilla/NullPtr.h"
 #include "js/TypeDecls.h"
 
 namespace mozilla {

tools/profiler/GeckoProfilerFunc.h

@@ -6,7 +6,6 @@
 #ifndef PROFILER_FUNCS_H
 #define PROFILER_FUNCS_H
 
-#include "mozilla/NullPtr.h"
 #include "js/TypeDecls.h"
 #include "js/ProfilingStack.h"
 #include <stdint.h>

tools/profiler/LulCommonExt.h

@@ -70,7 +70,6 @@
 #include <cstddef>            // for std::ptrdiff_t
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 namespace lul {
 

tools/profiler/LulExidx.cpp

@@ -95,7 +95,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 //   src/common/arm_ex_reader.cc
 
 #include "mozilla/Assertions.h"
-#include "mozilla/NullPtr.h"
 
 #include "LulExidxExt.h"
 

tools/profiler/LulRWLock.cpp

@@ -6,7 +6,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/NullPtr.h"
 
 #include "LulRWLock.h"
 

tools/profiler/PseudoStack.h

@@ -7,7 +7,6 @@
 #define PROFILER_PSEUDO_STACK_H_
 
 #include "mozilla/ArrayUtils.h"
-#include "mozilla/NullPtr.h"
 #include <stdint.h>
 #include "js/ProfilingStack.h"
 #include <stdlib.h>

widget/gonk/libdisplay/BootAnimation.cpp

@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <vector>
 #include "mozilla/FileUtils.h"
-#include "mozilla/NullPtr.h"
 #include "png.h"
 
 #include "android/log.h"

widget/gonk/libdisplay/GonkDisplayICS.cpp

@@ -24,7 +24,6 @@
 #include <fcntl.h>
 
 #include "mozilla/FileUtils.h"
-#include "mozilla/NullPtr.h"
 #include "mozilla/FileUtils.h"
 
 #include "BootAnimation.h"

xpcom/base/StaticPtr.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
-#include "mozilla/NullPtr.h"
 
 namespace mozilla {
 

xpcom/base/nscore.h

@@ -26,10 +26,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#ifdef __cplusplus
-#  include "mozilla/NullPtr.h"
-#endif
-
 #include "mozilla/RefCountType.h"
 
 /* Core XPCOM declarations. */