Bug 1188696 - Hoist nsRefPtr.h into MFBT. r=froydnj

2024-11-24 05:11:16 +00:00 · 2015-07-28 17:52:52 -07:00 · 2015-07-28 17:52:52 -07:00 · 97b9240b34
commit 97b9240b34
parent 4762225b99
92 changed files with 93 additions and 93 deletions
--- a/docshell/base/timeline/AutoGlobalTimelineMarker.h
+++ b/docshell/base/timeline/AutoGlobalTimelineMarker.h
@ -8,7 +8,7 @@
 #define mozilla_AutoGlobalTimelineMarker_h_

 #include "mozilla/GuardObjects.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsDocShell;

--- a/docshell/base/timeline/AutoTimelineMarker.h
+++ b/docshell/base/timeline/AutoTimelineMarker.h
@ -8,7 +8,7 @@
 #define mozilla_AutoTimelineMarker_h_

 #include "mozilla/GuardObjects.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIDocShell;
 class nsDocShell;
--- a/docshell/base/timeline/ObservedDocShell.h
+++ b/docshell/base/timeline/ObservedDocShell.h
@ -9,7 +9,7 @@

 #include "GeckoProfiler.h"
 #include "nsTArray.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsDocShell;
 class TimelineMarker;
--- a/dom/base/PostMessageEvent.h
+++ b/dom/base/PostMessageEvent.h
@ -9,7 +9,7 @@

 #include "mozilla/dom/StructuredCloneHelper.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"

--- a/dom/base/SameProcessMessageQueue.h
+++ b/dom/base/SameProcessMessageQueue.h
@ -8,7 +8,7 @@
 #define mozilla_dom_SameProcessMessageQueue_h

 #include "nsIRunnable.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"

 namespace mozilla {
--- a/dom/bindings/OwningNonNull.h
+++ b/dom/bindings/OwningNonNull.h
@ -147,7 +147,7 @@ nsCOMPtr<T>::operator=(const mozilla::dom::OwningNonNull<U>& aOther)
  return operator=(aOther.get());
 }

-// Declared in nsRefPtr.h
+// Declared in mozilla/nsRefPtr.h
 template<class T> template<class U>
 nsRefPtr<T>::nsRefPtr(const mozilla::dom::OwningNonNull<U>& aOther)
  : nsRefPtr(aOther.get())
--- a/dom/broadcastchannel/BroadcastChannel.h
+++ b/dom/broadcastchannel/BroadcastChannel.h
@ -12,7 +12,7 @@
 #include "nsIIPCBackgroundChildCreateCallback.h"
 #include "nsIObserver.h"
 #include "nsTArray.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsPIDOMWindow;

--- a/dom/cache/ActorChild.h
+++ b/dom/cache/ActorChild.h
@ -7,7 +7,7 @@
 #ifndef mozilla_dom_cache_ActioChild_h
 #define mozilla_dom_cache_ActioChild_h

-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {
 namespace dom {
--- a/dom/cache/CacheOpChild.h
+++ b/dom/cache/CacheOpChild.h
@ -10,7 +10,7 @@
 #include "mozilla/dom/cache/ActorChild.h"
 #include "mozilla/dom/cache/PCacheOpChild.h"
 #include "mozilla/dom/cache/TypeUtils.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIGlobalObject;

--- a/dom/cache/DBAction.h
+++ b/dom/cache/DBAction.h
@ -8,7 +8,7 @@
 #define mozilla_dom_cache_DBAction_h

 #include "mozilla/dom/cache/Action.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"

 class mozIStorageConnection;
--- a/dom/cache/Manager.h
+++ b/dom/cache/Manager.h
@ -10,7 +10,7 @@
 #include "mozilla/dom/cache/Types.h"
 #include "nsCOMPtr.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"

--- a/dom/cache/ManagerId.cpp
+++ b/dom/cache/ManagerId.cpp
@ -7,7 +7,7 @@
 #include "mozilla/dom/cache/ManagerId.h"
 #include "nsIPrincipal.h"
 #include "nsProxyRelease.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsThreadUtils.h"

 namespace mozilla {
--- a/dom/cache/ReadStream.h
+++ b/dom/cache/ReadStream.h
@ -12,7 +12,7 @@
 #include "nsID.h"
 #include "nsIInputStream.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArrayForwardDeclare.h"

 namespace mozilla {
--- a/dom/cache/StreamControl.h
+++ b/dom/cache/StreamControl.h
@ -8,7 +8,7 @@
 #define mozilla_dom_cache_StreamControl_h

 #include "mozilla/dom/cache/ReadStream.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTObserverArray.h"

 struct nsID;
--- a/dom/cache/StreamList.h
+++ b/dom/cache/StreamList.h
@ -9,7 +9,7 @@

 #include "mozilla/dom/cache/Context.h"
 #include "mozilla/dom/cache/Types.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"

 class nsIInputStream;
--- a/dom/canvas/WebGL2ContextUniforms.cpp
+++ b/dom/canvas/WebGL2ContextUniforms.cpp
@ -7,7 +7,7 @@

 #include "GLContext.h"
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
 #include "WebGLProgram.h"
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@ -21,7 +21,6 @@

 #include "nsDebug.h"
 #include "nsReadableUtils.h"
-#include "../../xpcom/base/nsRefPtr.h"
 #include "nsString.h"

 #include "gfxContext.h"
@ -51,6 +50,7 @@
 #include "mozilla/dom/ImageData.h"
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/Endian.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/dom/canvas/WebGLContextUnchecked.h
+++ b/dom/canvas/WebGLContextUnchecked.h
@ -8,7 +8,7 @@
 #define WEBGLCONTEXTUNCHECKED_H

 #include "GLDefs.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "WebGLTypes.h"

 namespace mozilla {
--- a/dom/canvas/WebGLProgram.cpp
+++ b/dom/canvas/WebGLProgram.cpp
@ -9,7 +9,7 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "WebGLActiveInfo.h"
 #include "WebGLContext.h"
 #include "WebGLShader.h"
--- a/dom/fetch/FetchDriver.h
+++ b/dom/fetch/FetchDriver.h
@ -12,7 +12,7 @@
 #include "nsIChannelEventSink.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIStreamListener.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "mozilla/DebugOnly.h"
 #include "mozilla/net/ReferrerPolicy.h"
--- a/dom/media/AbstractThread.h
+++ b/dom/media/AbstractThread.h
@ -11,7 +11,7 @@
 #include "nsIRunnable.h"
 #include "nsISupportsImpl.h"
 #include "nsIThread.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "mozilla/ThreadLocal.h"

--- a/dom/media/AudioSink.h
+++ b/dom/media/AudioSink.h
@ -7,7 +7,7 @@
 #define AudioSink_h__

 #include "MediaInfo.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsISupportsImpl.h"

 #include "mozilla/dom/AudioChannelBinding.h"
--- a/dom/media/DecodedStream.h
+++ b/dom/media/DecodedStream.h
@ -7,7 +7,7 @@
 #ifndef DecodedStream_h_
 #define DecodedStream_h_

-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"
 #include "MediaInfo.h"

--- a/dom/media/MediaData.h
+++ b/dom/media/MediaData.h
@ -12,7 +12,7 @@
 #include "AudioSampleFormat.h"
 #include "nsIMemoryReporter.h"
 #include "SharedBuffer.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"

 namespace mozilla {
--- a/dom/media/MediaDataDemuxer.h
+++ b/dom/media/MediaDataDemuxer.h
@ -14,7 +14,7 @@
 #include "MediaInfo.h"
 #include "TimeUnits.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"

 namespace mozilla {
--- a/dom/media/MediaInfo.h
+++ b/dom/media/MediaInfo.h
@ -8,7 +8,7 @@

 #include "mozilla/UniquePtr.h"
 #include "nsRect.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsSize.h"
 #include "nsString.h"
 #include "nsTArray.h"
--- a/dom/media/MediaStreamError.h
+++ b/dom/media/MediaStreamError.h
@ -12,7 +12,7 @@
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
 #include "nsPIDOMWindow.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #if defined(XP_WIN) && defined(GetMessage)
 #undef GetMessage
--- a/dom/media/MediaTimer.h
+++ b/dom/media/MediaTimer.h
@ -14,7 +14,7 @@
 #include <queue>

 #include "nsITimer.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/dom/media/mediasource/ContainerParser.h
+++ b/dom/media/mediasource/ContainerParser.h
@ -7,7 +7,7 @@
 #ifndef MOZILLA_CONTAINERPARSER_H_
 #define MOZILLA_CONTAINERPARSER_H_

-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"
 #include "MediaResource.h"

--- a/dom/media/omx/MediaCodecProxy.h
+++ b/dom/media/omx/MediaCodecProxy.h
@ -14,7 +14,7 @@

 #include "mozilla/media/MediaSystemResourceClient.h"
 #include "mozilla/Monitor.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace android {
 // This class is intended to be a proxy for MediaCodec with codec resource
--- a/dom/media/omx/OMXCodecProxy.h
+++ b/dom/media/omx/OMXCodecProxy.h
@ -14,7 +14,7 @@
 #include <utils/threads.h>

 #include "mozilla/media/MediaSystemResourceClient.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace android {

--- a/dom/media/omx/OMXCodecWrapper.h
+++ b/dom/media/omx/OMXCodecWrapper.h
@ -16,7 +16,7 @@
 #include "GonkNativeWindow.h"
 #include "GonkNativeWindowClient.h"
 #include "mozilla/media/MediaSystemResourceClient.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include <speex/speex_resampler.h>

--- a/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
+++ b/dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
@ -8,7 +8,7 @@
 #define MediaDataDecoderProxy_h_

 #include "PlatformDecoderModule.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsThreadUtils.h"
 #include "nscore.h"

--- a/dom/media/systemservices/MediaSystemResourceClient.h
+++ b/dom/media/systemservices/MediaSystemResourceClient.h
@ -12,7 +12,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/media/MediaSystemResourceTypes.h"
 #include "mozilla/Monitor.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/dom/media/webrtc/RTCIdentityProviderRegistrar.h
+++ b/dom/media/webrtc/RTCIdentityProviderRegistrar.h
@ -6,7 +6,7 @@
 #ifndef RTCIDENTITYPROVIDER_H_
 #define RTCIDENTITYPROVIDER_H_

-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsCOMPtr.h"
 #include "nsISupportsImpl.h"
 #include "nsIGlobalObject.h"
--- a/dom/presentation/provider/MulticastDNSDeviceProvider.h
+++ b/dom/presentation/provider/MulticastDNSDeviceProvider.h
@ -11,7 +11,7 @@
 #include "nsIDNSServiceDiscovery.h"
 #include "nsIPresentationDeviceProvider.h"
 #include "nsITCPPresentationServer.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"
 #include "nsWeakPtr.h"

--- a/dom/promise/PromiseDebugging.h
+++ b/dom/promise/PromiseDebugging.h
@ -9,7 +9,7 @@

 #include "js/TypeDecls.h"
 #include "nsTArray.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/dom/push/PushManager.h
+++ b/dom/push/PushManager.h
@ -38,7 +38,7 @@
 #include "mozilla/dom/BindingDeclarations.h"

 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "jsapi.h"

 class nsIGlobalObject;
--- a/dom/workers/WorkerThread.h
+++ b/dom/workers/WorkerThread.h
@ -11,7 +11,7 @@
 #include "mozilla/CondVar.h"
 #include "mozilla/DebugOnly.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsThread.h"

 class nsIRunnable;
--- a/gfx/layers/apz/src/HitTestingTreeNode.h
+++ b/gfx/layers/apz/src/HitTestingTreeNode.h
@ -12,7 +12,7 @@
 #include "mozilla/gfx/Matrix.h"             // for Matrix4x4
 #include "mozilla/layers/LayersTypes.h"     // for EventRegions
 #include "mozilla/Maybe.h"                  // for Maybe
-#include "nsRefPtr.h"                       // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                       // for nsRefPtr

 namespace mozilla {
 namespace layers {
--- a/gfx/layers/apz/util/APZEventState.h
+++ b/gfx/layers/apz/util/APZEventState.h
@ -15,7 +15,7 @@
 #include "nsCOMPtr.h"
 #include "nsISupportsImpl.h"  // for NS_INLINE_DECL_REFCOUNTING
 #include "nsIWeakReferenceUtils.h"  // for nsWeakPtr
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 template <class> class nsCOMPtr;
 class nsIDocument;
--- a/gfx/layers/apz/util/ChromeProcessController.h
+++ b/gfx/layers/apz/util/ChromeProcessController.h
@ -8,7 +8,7 @@

 #include "mozilla/layers/GeckoContentController.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIDOMWindowUtils;
 class nsIDocument;
--- a/gfx/layers/composite/AsyncCompositionManager.h
+++ b/gfx/layers/composite/AsyncCompositionManager.h
@ -16,7 +16,7 @@
 #include "mozilla/gfx/Matrix.h"         // for Matrix4x4
 #include "mozilla/layers/FrameUniformityData.h" // For FrameUniformityData
 #include "mozilla/layers/LayersMessages.h"  // for TargetConfig
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsISupportsImpl.h"            // for LayerManager::AddRef, etc

 namespace mozilla {
--- a/gfx/layers/composite/CanvasLayerComposite.cpp
+++ b/gfx/layers/composite/CanvasLayerComposite.cpp
@ -15,7 +15,7 @@
 #include "mozilla/layers/Effects.h"     // for EffectChain
 #include "mozilla/mozalloc.h"           // for operator delete
 #include "nsAString.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsString.h"                   // for nsAutoCString
 #include "gfxVR.h"
--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@ -14,7 +14,7 @@
 #include "mozilla/layers/ImageContainerParent.h"
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
 #include "mozilla/layers/TextureHost.h"  // for TextureHost, etc
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsDebug.h"                    // for NS_WARNING
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "gfxPlatform.h"                // for gfxPlatform
--- a/gfx/layers/composite/ContainerLayerComposite.cpp
+++ b/gfx/layers/composite/ContainerLayerComposite.cpp
@ -24,7 +24,7 @@
 #include "mozilla/layers/AsyncCompositionManager.h" // for ViewTransform
 #include "mozilla/layers/LayerMetricsWrapper.h" // for LayerMetricsWrapper
 #include "mozilla/mozalloc.h"           // for operator delete, etc
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsISupportsUtils.h"           // for NS_ADDREF, NS_RELEASE
--- a/gfx/layers/composite/FrameUniformityData.h
+++ b/gfx/layers/composite/FrameUniformityData.h
@ -8,7 +8,7 @@

 #include "ipc/IPCMessageUtils.h"
 #include "js/TypeDecls.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {
 namespace layers {
--- a/gfx/layers/composite/ImageLayerComposite.cpp
+++ b/gfx/layers/composite/ImageLayerComposite.cpp
@ -18,7 +18,7 @@
 #include "mozilla/layers/TextureHost.h"  // for TextureHost, etc
 #include "mozilla/mozalloc.h"           // for operator delete
 #include "nsAString.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsString.h"                   // for nsAutoCString
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@ -44,7 +44,7 @@
 #include "ipc/ShadowLayerUtils.h"
 #include "mozilla/mozalloc.h"           // for operator new, etc
 #include "nsAppRunner.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_WARNING, NS_RUNTIMEABORT, etc
 #include "nsISupportsImpl.h"            // for Layer::AddRef, etc
--- a/gfx/layers/composite/LayerManagerComposite.h
+++ b/gfx/layers/composite/LayerManagerComposite.h
@ -25,7 +25,7 @@
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
 #include "nsAString.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsISupportsImpl.h"            // for Layer::AddRef, etc
--- a/gfx/layers/composite/PaintedLayerComposite.cpp
+++ b/gfx/layers/composite/PaintedLayerComposite.cpp
@ -18,7 +18,7 @@
 #include "mozilla/layers/Effects.h"     // for EffectChain
 #include "mozilla/mozalloc.h"           // for operator delete
 #include "nsAString.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsISupportsImpl.h"            // for MOZ_COUNT_CTOR, etc
 #include "nsMathUtils.h"                // for NS_lround
 #include "nsString.h"                   // for nsAutoCString
--- a/gfx/layers/composite/TextureHost.cpp
+++ b/gfx/layers/composite/TextureHost.cpp
@ -17,7 +17,7 @@
 #include "mozilla/layers/TextureHostOGL.h"  // for TextureHostOGL
 #include "mozilla/layers/YCbCrImageDataSerializer.h"
 #include "nsAString.h"
-#include "nsRefPtr.h"                   // for nsRefPtr
+#include "mozilla/nsRefPtr.h"                   // for nsRefPtr
 #include "nsPrintfCString.h"            // for nsPrintfCString
 #include "mozilla/layers/PTextureParent.h"
 #include "mozilla/unused.h"
--- a/gfx/layers/ipc/FenceUtils.h
+++ b/gfx/layers/ipc/FenceUtils.h
@ -9,7 +9,7 @@
 #define IPC_FencerUtils_h

 #include "ipc/IPCMessageUtils.h"
-#include "nsRefPtr.h"             // for nsRefPtr
+#include "mozilla/nsRefPtr.h"             // for nsRefPtr

 namespace mozilla {
 namespace layers {
--- a/gfx/src/nsRenderingContext.h
+++ b/gfx/src/nsRenderingContext.h
@ -9,7 +9,7 @@
 #include "gfxContext.h"
 #include "mozilla/Attributes.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {
 namespace gfx {
--- a/gfx/tests/gtest/TestVsync.cpp
+++ b/gfx/tests/gtest/TestVsync.cpp
@ -9,7 +9,7 @@
 #include "gfxPrefs.h"
 #include "MainThreadUtils.h"
 #include "nsIThread.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "SoftwareVsyncSource.h"
 #include "VsyncSource.h"
 #include "mozilla/Monitor.h"
--- a/gfx/thebes/VsyncSource.h
+++ b/gfx/thebes/VsyncSource.h
@ -7,7 +7,7 @@
 #define GFX_VSYNCSOURCE_H

 #include "nsTArray.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/TimeStamp.h"
 #include "nsISupportsImpl.h"
--- a/gfx/vr/gfxVR.h
+++ b/gfx/vr/gfxVR.h
@ -10,7 +10,7 @@
 #include "nsIScreen.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "mozilla/gfx/2D.h"
 #include "mozilla/EnumeratedArray.h"
--- a/gfx/vr/gfxVROculus.h
+++ b/gfx/vr/gfxVROculus.h
@ -9,7 +9,7 @@
 #include "nsTArray.h"
 #include "nsIScreen.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "mozilla/gfx/2D.h"
 #include "mozilla/EnumeratedArray.h"
--- a/image/DecodePool.h
+++ b/image/DecodePool.h
@ -16,7 +16,7 @@
 #include "nsCOMPtr.h"
 #include "nsIEventTarget.h"
 #include "nsIObserver.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIThread;
 class nsIThreadPool;
--- a/image/DecoderFactory.cpp
+++ b/image/DecoderFactory.cpp
@ -6,7 +6,7 @@
 #include "DecoderFactory.h"

 #include "nsMimeTypes.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"

 #include "Decoder.h"
--- a/image/SourceBuffer.h
+++ b/image/SourceBuffer.h
@ -18,7 +18,7 @@
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"

 namespace mozilla {
--- a/ipc/glue/BackgroundParentImpl.cpp
+++ b/ipc/glue/BackgroundParentImpl.cpp
@ -24,7 +24,7 @@
 #include "nsIAppsService.h"
 #include "nsNetUtil.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsThreadUtils.h"
 #include "nsTraceRefcnt.h"
 #include "nsXULAppAPI.h"
--- a/ipc/ipdl/ipdl/builtin.py
+++ b/ipc/ipdl/ipdl/builtin.py
@ -46,7 +46,7 @@ HeaderIncludes = (
    'prtime.h',
    'IPCMessageStart.h',
    'ipc/IPCMessageUtils.h',
-    'nsRefPtr.h',
+    'mozilla/nsRefPtr.h',
    'nsStringGlue.h',
    'nsTArray.h',
    'mozilla/ipc/ProtocolUtils.h',
--- a/layout/base/AccessibleCaret.h
+++ b/layout/base/AccessibleCaret.h
@ -15,7 +15,7 @@
 #include "nsISupportsBase.h"
 #include "nsISupportsImpl.h"
 #include "nsRect.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"

 class nsIDocument;
--- a/layout/base/AccessibleCaretEventHub.h
+++ b/layout/base/AccessibleCaretEventHub.h
@ -16,7 +16,7 @@
 #include "nsIScrollObserver.h"
 #include "nsISelectionListener.h"
 #include "nsPoint.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsWeakReference.h"

 class nsDocShell;
--- a/layout/base/AccessibleCaretManager.h
+++ b/layout/base/AccessibleCaretManager.h
@ -11,7 +11,7 @@
 #include "nsCoord.h"
 #include "nsIFrame.h"
 #include "nsISelectionListener.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsWeakReference.h"
 #include "mozilla/dom/CaretStateChangedEvent.h"
 #include "mozilla/EventForwards.h"
--- a/layout/ipc/VsyncChild.h
+++ b/layout/ipc/VsyncChild.h
@ -8,7 +8,7 @@

 #include "mozilla/layout/PVsyncChild.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/layout/ipc/VsyncParent.h
+++ b/layout/ipc/VsyncParent.h
@ -9,7 +9,7 @@
 #include "mozilla/layout/PVsyncParent.h"
 #include "mozilla/VsyncDispatcher.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIThread;

--- a/media/libstagefright/binding/Index.cpp
+++ b/media/libstagefright/binding/Index.cpp
@ -8,7 +8,7 @@
 #include "mp4_demuxer/MoofParser.h"
 #include "mp4_demuxer/SinfParser.h"
 #include "nsAutoPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include <algorithm>
 #include <limits>
--- a/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/DecoderData.h
@ -9,7 +9,7 @@
 #include "MediaInfo.h"
 #include "mozilla/Types.h"
 #include "mozilla/Vector.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsString.h"
--- a/media/libstagefright/binding/include/mp4_demuxer/ResourceStream.h
+++ b/media/libstagefright/binding/include/mp4_demuxer/ResourceStream.h
@ -7,7 +7,7 @@

 #include "MediaResource.h"
 #include "mp4_demuxer/Stream.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mp4_demuxer
 {
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@ -57,6 +57,7 @@ EXPORTS.mozilla = [
    'MemoryChecking.h',
    'MemoryReporting.h',
    'Move.h',
+    'nsRefPtr.h',
    'NullPtr.h',
    'NumericLimits.h',
    'Pair.h',
--- a/xpcom/base/nsRefPtr.h
+++ b/xpcom/base/nsRefPtr.h
@ -4,8 +4,8 @@
 * 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/. */

-#ifndef nsRefPtr_h
-#define nsRefPtr_h
+#ifndef mozilla_nsRefPtr_h
+#define mozilla_nsRefPtr_h

 #include "mozilla/AlreadyAddRefed.h"
 #include "mozilla/Assertions.h"
@ -519,4 +519,4 @@ do_AddRef(T*&& aObj)
  return ref.forget();
 }

-#endif // !defined(nsRefPtr_h)
+#endif /* mozilla_nsRefPtr_h */
--- a/modules/libjar/InterceptedJARChannel.h
+++ b/modules/libjar/InterceptedJARChannel.h
@ -13,7 +13,7 @@
 #include "nsIInputStreamPump.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIOutputStream.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "mozilla/Maybe.h"

--- a/netwerk/base/Predictor.h
+++ b/netwerk/base/Predictor.h
@ -17,7 +17,7 @@
 #include "nsIInterfaceRequestor.h"
 #include "nsIObserver.h"
 #include "nsISpeculativeConnect.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"
 #include "nsTArray.h"

--- a/netwerk/dns/mdns/libmdns/MDNSResponderOperator.h
+++ b/netwerk/dns/mdns/libmdns/MDNSResponderOperator.h
@ -11,7 +11,7 @@
 #include "nsCOMPtr.h"
 #include "nsIDNSServiceDiscovery.h"
 #include "nsIThread.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsString.h"

 namespace mozilla {
--- a/netwerk/dns/mdns/libmdns/MDNSResponderReply.h
+++ b/netwerk/dns/mdns/libmdns/MDNSResponderReply.h
@ -10,7 +10,7 @@
 #include "MDNSResponderOperator.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIThread.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsThreadUtils.h"

 namespace mozilla {
--- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h
+++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h
@ -8,7 +8,7 @@

 #include "nsIDNSServiceDiscovery.h"
 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsRefPtrHashtable.h"

 namespace mozilla {
--- a/netwerk/protocol/http/InterceptedChannel.h
+++ b/netwerk/protocol/http/InterceptedChannel.h
@ -8,7 +8,7 @@
 #define InterceptedChannel_h

 #include "nsINetworkInterceptController.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "mozilla/Maybe.h"

 class nsICacheEntry;
--- a/security/manager/ssl/nsProtectedAuthThread.cpp
+++ b/security/manager/ssl/nsProtectedAuthThread.cpp
@ -4,7 +4,7 @@

 #include "pk11func.h"
 #include "mozilla/DebugOnly.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsCOMPtr.h"
 #include "PSMRunnable.h"
 #include "nsString.h"
--- a/toolkit/components/url-classifier/LookupCache.h
+++ b/toolkit/components/url-classifier/LookupCache.h
@ -12,7 +12,7 @@
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
 #include "nsIFileStreams.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsUrlClassifierPrefixSet.h"
 #include "mozilla/Logging.h"

--- a/widget/ContentCache.cpp
+++ b/widget/ContentCache.cpp
@ -11,7 +11,7 @@
 #include "mozilla/TextComposition.h"
 #include "mozilla/TextEvents.h"
 #include "nsIWidget.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/widget/VsyncDispatcher.h
+++ b/widget/VsyncDispatcher.h
@ -10,7 +10,7 @@
 #include "mozilla/TimeStamp.h"
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 namespace mozilla {

--- a/widget/gonk/GeckoTouchDispatcher.h
+++ b/widget/gonk/GeckoTouchDispatcher.h
@ -22,7 +22,7 @@
 #include "Units.h"
 #include "mozilla/Mutex.h"
 #include <vector>
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 class nsIWidget;

--- a/widget/nsPrintSettingsImpl.cpp
+++ b/widget/nsPrintSettingsImpl.cpp
@ -6,7 +6,7 @@
 #include "nsPrintSettingsImpl.h"
 #include "nsReadableUtils.h"
 #include "nsIPrintSession.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "mozilla/gfx/Logging.h"

 #define DEFAULT_MARGIN_WIDTH 0.5
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@ -55,7 +55,6 @@ EXPORTS += [
    'nsISupportsBase.h',
    'nsObjCExceptions.h',
    'nsQueryObject.h',
-    'nsRefPtr.h',
    'nsTraceRefcnt.h',
    'nsWeakPtr.h',
 ]
--- a/xpcom/base/nsAutoPtr.h
+++ b/xpcom/base/nsAutoPtr.h
@ -8,7 +8,7 @@
 #define nsAutoPtr_h

 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "nsCycleCollectionNoteChild.h"
 #include "mozilla/MemoryReporting.h"
--- a/xpcom/base/nsQueryObject.h
+++ b/xpcom/base/nsQueryObject.h
@ -10,7 +10,7 @@
 #include "mozilla/Attributes.h"

 #include "nsCOMPtr.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 /*****************************************************************************/

--- a/xpcom/glue/nsCOMPtr.h
+++ b/xpcom/glue/nsCOMPtr.h
@ -28,7 +28,7 @@

 #include "nsDebug.h" // for |NS_ASSERTION|
 #include "nsISupportsUtils.h" // for |nsresult|, |NS_ADDREF|, |NS_GET_TEMPLATE_IID| et al
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"

 #include "nsCycleCollectionNoteChild.h"

--- a/xpcom/glue/nsISupportsUtils.h
+++ b/xpcom/glue/nsISupportsUtils.h
@ -12,7 +12,7 @@
 #include "nsError.h"
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "mozilla/TypeTraits.h"

 /**
--- a/xpcom/io/nsPipe3.cpp
+++ b/xpcom/io/nsPipe3.cpp
@ -11,7 +11,7 @@
 #include "nsIPipe.h"
 #include "nsIEventTarget.h"
 #include "nsISeekableStream.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsSegmentedBuffer.h"
 #include "nsStreamUtils.h"
 #include "nsCOMPtr.h"
--- a/xpcom/tests/gtest/TestStrings.cpp
+++ b/xpcom/tests/gtest/TestStrings.cpp
@ -10,7 +10,7 @@
 #include "nsStringBuffer.h"
 #include "nsReadableUtils.h"
 #include "nsCRTGlue.h"
-#include "nsRefPtr.h"
+#include "mozilla/nsRefPtr.h"
 #include "nsTArray.h"
 #include "gtest/gtest.h"