Bug 1184634 - Move various includes into the mozilla namespace. r=gerald

I did my a quick best-effort pass to fix up the most egregious ordering problems. I left some big pre-existing messes alone.
2024-11-25 13:51:41 +00:00 · 2015-07-16 11:52:43 -07:00 · 2015-07-16 11:52:43 -07:00 · 04eaf4c167
commit 04eaf4c167
parent 997543e6ba
41 changed files with 127 additions and 102 deletions
--- a/dom/html/HTMLMediaElement.h
+++ b/dom/html/HTMLMediaElement.h
@ -22,7 +22,7 @@
 #ifdef MOZ_EME
 #include "mozilla/dom/MediaKeys.h"
 #endif
-#include "StateWatching.h"
+#include "mozilla/StateWatching.h"
 #include "nsGkAtoms.h"

 // X.h on Linux #defines CurrentTime as 0L, so we have to #undef it here.
--- a/dom/media/AbstractMediaDecoder.h
+++ b/dom/media/AbstractMediaDecoder.h
@ -8,7 +8,8 @@
 #define AbstractMediaDecoder_h_

 #include "mozilla/Attributes.h"
-#include "StateMirroring.h"
+#include "mozilla/StateMirroring.h"
+
 #include "MediaInfo.h"
 #include "nsISupports.h"
 #include "nsDataHashtable.h"
--- a/dom/media/AbstractThread.cpp
+++ b/dom/media/AbstractThread.cpp
@ -4,20 +4,20 @@
 * 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 "AbstractThread.h"
-
-#include "TaskQueue.h"
-#include "nsThreadUtils.h"
-#include "TaskDispatcher.h"
-
-#include "nsContentUtils.h"
-#include "nsServiceManagerUtils.h"
+#include "mozilla/AbstractThread.h"

 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/TaskQueue.h"
+#include "mozilla/TaskDispatcher.h"
 #include "mozilla/unused.h"

+#include "nsThreadUtils.h"
+#include "nsContentUtils.h"
+#include "nsServiceManagerUtils.h"
+
+
 namespace mozilla {

 StaticRefPtr<AbstractThread> sMainThread;
--- a/dom/media/MediaDataDemuxer.h
+++ b/dom/media/MediaDataDemuxer.h
@ -7,11 +7,12 @@
 #if !defined(MediaDataDemuxer_h)
 #define MediaDataDemuxer_h

+#include "mozilla/MozPromise.h"
+#include "mozilla/UniquePtr.h"
+
 #include "MediaData.h"
 #include "MediaInfo.h"
-#include "MozPromise.h"
 #include "TimeUnits.h"
-#include "mozilla/UniquePtr.h"
 #include "nsISupportsImpl.h"
 #include "nsRefPtr.h"
 #include "nsTArray.h"
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@ -184,21 +184,23 @@ destroying the MediaDecoder object.
 #if !defined(MediaDecoder_h_)
 #define MediaDecoder_h_

+#include "mozilla/MozPromise.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "mozilla/StateMirroring.h"
+#include "mozilla/StateWatching.h"
+
+#include "mozilla/dom/AudioChannelBinding.h"
+
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 #include "nsIObserver.h"
 #include "nsAutoPtr.h"
 #include "nsITimer.h"
-#include "MozPromise.h"
 #include "MediaResource.h"
-#include "mozilla/dom/AudioChannelBinding.h"
-#include "mozilla/ReentrantMonitor.h"
 #include "MediaDecoderOwner.h"
 #include "MediaStreamGraph.h"
 #include "AbstractMediaDecoder.h"
 #include "DecodedStream.h"
-#include "StateMirroring.h"
-#include "StateWatching.h"
 #include "necko-config.h"
 #ifdef MOZ_EME
 #include "mozilla/CDMProxy.h"
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@ -6,10 +6,11 @@
 #if !defined(MediaDecoderReader_h_)
 #define MediaDecoderReader_h_

+#include "mozilla/MozPromise.h"
+
 #include "AbstractMediaDecoder.h"
 #include "MediaInfo.h"
 #include "MediaData.h"
-#include "MozPromise.h"
 #include "MediaQueue.h"
 #include "MediaTimer.h"
 #include "AudioCompactor.h"
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@ -31,7 +31,7 @@
 #include "nsContentUtils.h"
 #include "MediaShutdownManager.h"
 #include "SharedThreadPool.h"
-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
 #include "nsIEventTarget.h"
 #include "prenv.h"
 #include "mozilla/Preferences.h"
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@ -83,23 +83,24 @@ hardware (via AudioStream).
 #define MediaDecoderStateMachine_h__

 #include "mozilla/Attributes.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "mozilla/RollingMean.h"
+#include "mozilla/StateMirroring.h"
+
 #include "nsThreadUtils.h"
 #include "MediaDecoder.h"
-#include "mozilla/ReentrantMonitor.h"
 #include "MediaDecoderReader.h"
 #include "MediaDecoderOwner.h"
 #include "MediaMetadataManager.h"
-#include "mozilla/RollingMean.h"
 #include "MediaTimer.h"
-#include "StateMirroring.h"
 #include "DecodedStream.h"
 #include "ImageContainer.h"

 namespace mozilla {

 class AudioSegment;
-class TaskQueue;
 class AudioSink;
+class TaskQueue;

 extern PRLogModuleInfo* gMediaDecoderLog;
 extern PRLogModuleInfo* gMediaSampleLog;
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@ -9,9 +9,10 @@

 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/TaskQueue.h"
+
 #include "MediaDataDemuxer.h"
 #include "MediaDecoderReader.h"
-#include "TaskQueue.h"
 #include "PlatformDecoderModule.h"

 namespace mozilla {
--- a/dom/media/MediaQueue.h
+++ b/dom/media/MediaQueue.h
@ -6,11 +6,12 @@
 #if !defined(MediaQueue_h_)
 #define MediaQueue_h_

-#include "nsDeque.h"
-#include "nsTArray.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/RefPtr.h"
-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
+
+#include "nsDeque.h"
+#include "nsTArray.h"

 namespace mozilla {

--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@ -6,8 +6,12 @@
 #ifndef MOZILLA_MEDIASTREAMGRAPH_H_
 #define MOZILLA_MEDIASTREAMGRAPH_H_

-#include "mozilla/Mutex.h"
 #include "mozilla/LinkedList.h"
+#include "mozilla/Mutex.h"
+#include "mozilla/TaskQueue.h"
+
+#include "mozilla/dom/AudioChannelBinding.h"
+
 #include "AudioStream.h"
 #include "nsTArray.h"
 #include "nsIRunnable.h"
@ -16,11 +20,9 @@
 #include "VideoFrameContainer.h"
 #include "VideoSegment.h"
 #include "MainThreadUtils.h"
-#include "TaskQueue.h"
 #include "nsAutoRef.h"
 #include "GraphDriver.h"
 #include <speex/speex_resampler.h>
-#include "mozilla/dom/AudioChannelBinding.h"
 #include "DOMMediaStream.h"
 #include "AudioContext.h"

--- a/dom/media/MediaTimer.h
+++ b/dom/media/MediaTimer.h
@ -7,16 +7,15 @@
 #if !defined(MediaTimer_h_)
 #define MediaTimer_h_

-#include "MozPromise.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/MozPromise.h"
+#include "mozilla/TimeStamp.h"

 #include <queue>

 #include "nsITimer.h"
 #include "nsRefPtr.h"

-#include "mozilla/Monitor.h"
-#include "mozilla/TimeStamp.h"
-
 namespace mozilla {

 extern PRLogModuleInfo* gMediaTimerLog;
--- a/dom/media/MozPromise.h
+++ b/dom/media/MozPromise.h
@ -7,19 +7,17 @@
 #if !defined(MozPromise_h_)
 #define MozPromise_h_

-#include "mozilla/Logging.h"
-
-#include "AbstractThread.h"
-
-#include "nsTArray.h"
-#include "nsThreadUtils.h"
-
+#include "mozilla/AbstractThread.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/Logging.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/unused.h"

+#include "nsTArray.h"
+#include "nsThreadUtils.h"
+
 /* Polyfill __func__ on MSVC for consumers to pass to the MozPromise API. */
 #ifdef _MSC_VER
 #define __func__ __FUNCTION__
--- a/dom/media/StateMirroring.h
+++ b/dom/media/StateMirroring.h
@ -7,12 +7,10 @@
 #if !defined(StateMirroring_h_)
 #define StateMirroring_h_

-#include "MozPromise.h"
-
-#include "StateWatching.h"
-#include "TaskDispatcher.h"
-
 #include "mozilla/Maybe.h"
+#include "mozilla/MozPromise.h"
+#include "mozilla/StateWatching.h"
+#include "mozilla/TaskDispatcher.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"

--- a/dom/media/StateWatching.h
+++ b/dom/media/StateWatching.h
@ -7,9 +7,8 @@
 #if !defined(StateWatching_h_)
 #define StateWatching_h_

-#include "AbstractThread.h"
-#include "TaskDispatcher.h"
-
+#include "mozilla/AbstractThread.h"
+#include "mozilla/TaskDispatcher.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"

--- a/dom/media/TaskDispatcher.h
+++ b/dom/media/TaskDispatcher.h
@ -7,8 +7,7 @@
 #if !defined(TaskDispatcher_h_)
 #define TaskDispatcher_h_

-#include "AbstractThread.h"
-
+#include "mozilla/AbstractThread.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/unused.h"

--- a/dom/media/TaskQueue.cpp
+++ b/dom/media/TaskQueue.cpp
@ -4,7 +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/. */

-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
+
 #include "nsThreadUtils.h"
 #include "SharedThreadPool.h"

--- a/dom/media/TaskQueue.h
+++ b/dom/media/TaskQueue.h
@ -7,14 +7,16 @@
 #ifndef TaskQueue_h_
 #define TaskQueue_h_

-#include <queue>
-#include "mozilla/RefPtr.h"
 #include "mozilla/Monitor.h"
+#include "mozilla/MozPromise.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/TaskDispatcher.h"
 #include "mozilla/unused.h"
+
+#include <queue>
+
 #include "SharedThreadPool.h"
 #include "nsThreadUtils.h"
-#include "MozPromise.h"
-#include "TaskDispatcher.h"

 class nsIRunnable;

--- a/dom/media/VideoUtils.cpp
+++ b/dom/media/VideoUtils.cpp
@ -3,6 +3,12 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "VideoUtils.h"
+
+#include "mozilla/Preferences.h"
+#include "mozilla/Base64.h"
+#include "mozilla/TaskQueue.h"
+#include "mozilla/Telemetry.h"
+
 #include "MediaResource.h"
 #include "TimeUnits.h"
 #include "nsMathUtils.h"
@ -10,12 +16,8 @@
 #include "VorbisUtils.h"
 #include "ImageContainer.h"
 #include "SharedThreadPool.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/Base64.h"
-#include "mozilla/Telemetry.h"
 #include "nsIRandomGenerator.h"
 #include "nsIServiceManager.h"
-#include "TaskQueue.h"

 #include <stdint.h>

--- a/dom/media/VideoUtils.h
+++ b/dom/media/VideoUtils.h
@ -8,12 +8,14 @@
 #define VideoUtils_h

 #include "mozilla/Attributes.h"
-#include "mozilla/ReentrantMonitor.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/MozPromise.h"
+#include "mozilla/ReentrantMonitor.h"
+#include "mozilla/RefPtr.h"
+
 #include "nsIThread.h"
 #include "nsSize.h"
 #include "nsRect.h"
-#include "MozPromise.h"

 #if !(defined(XP_WIN) || defined(XP_MACOSX) || defined(LINUX)) || \
    defined(MOZ_ASAN)
@ -23,7 +25,6 @@
 #include "nsThreadUtils.h"
 #include "prtime.h"
 #include "AudioSampleFormat.h"
-#include "mozilla/RefPtr.h"
 #include "TimeUnits.h"

 using mozilla::CheckedInt64;
--- a/dom/media/eme/CDMProxy.h
+++ b/dom/media/eme/CDMProxy.h
@ -7,14 +7,16 @@
 #ifndef CDMProxy_h_
 #define CDMProxy_h_

+#include "mozilla/CDMCaps.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/MozPromise.h"
+
+#include "mozilla/dom/MediaKeys.h"
+
+#include "nsIThread.h"
 #include "nsString.h"
 #include "nsAutoPtr.h"
-#include "mozilla/dom/MediaKeys.h"
-#include "mozilla/Monitor.h"
-#include "nsIThread.h"
 #include "GMPDecryptorProxy.h"
-#include "mozilla/CDMCaps.h"
-#include "MozPromise.h"

 namespace mozilla {
 class MediaRawData;
--- a/dom/media/fmp4/MP4Reader.h
+++ b/dom/media/fmp4/MP4Reader.h
@ -7,15 +7,16 @@
 #if !defined(MP4Reader_h_)
 #define MP4Reader_h_

+#include "mozilla/Monitor.h"
+#include "mozilla/TaskQueue.h"
+
 #include "MediaDecoderReader.h"
 #include "nsAutoPtr.h"
 #include "PlatformDecoderModule.h"
 #include "mp4_demuxer/mp4_demuxer.h"
 #include "demuxer/TrackDemuxer.h"
-#include "TaskQueue.h"

 #include <deque>
-#include "mozilla/Monitor.h"

 namespace mozilla {

--- a/dom/media/gtest/TestMozPromise.cpp
+++ b/dom/media/gtest/TestMozPromise.cpp
@ -4,9 +4,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "gtest/gtest.h"
+
+#include "mozilla/TaskQueue.h"
+#include "mozilla/MozPromise.h"
+
 #include "nsISupportsImpl.h"
-#include "TaskQueue.h"
-#include "MozPromise.h"
 #include "SharedThreadPool.h"
 #include "VideoUtils.h"

--- a/dom/media/mediasource/MediaSourceDemuxer.h
+++ b/dom/media/mediasource/MediaSourceDemuxer.h
@ -7,15 +7,16 @@
 #if !defined(MediaSourceDemuxer_h_)
 #define MediaSourceDemuxer_h_

+#include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/TaskQueue.h"
+
 #include "MediaDataDemuxer.h"
 #include "MediaDecoderReader.h"
 #include "MediaResource.h"
 #include "MediaSource.h"
-#include "TaskQueue.h"
 #include "TrackBuffersManager.h"
-#include "mozilla/Atomics.h"
-#include "mozilla/Monitor.h"

 namespace mozilla {

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

-#include "MozPromise.h"
+#include "mozilla/MozPromise.h"
 #include "MediaSource.h"
 #include "js/RootingAPI.h"
 #include "mozilla/Assertions.h"
--- a/dom/media/mediasource/SourceBufferContentManager.h
+++ b/dom/media/mediasource/SourceBufferContentManager.h
@ -7,8 +7,9 @@
 #ifndef MOZILLA_SOURCEBUFFERCONTENTMANAGER_H_
 #define MOZILLA_SOURCEBUFFERCONTENTMANAGER_H_

+#include "mozilla/MozPromise.h"
+
 #include "MediaData.h"
-#include "MozPromise.h"
 #include "MediaSourceDecoder.h"
 #include "SourceBuffer.h"
 #include "TimeUnits.h"
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@ -10,7 +10,7 @@
 #include "MediaData.h"
 #include "MediaSourceDecoder.h"
 #include "SharedThreadPool.h"
-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
 #include "SourceBufferDecoder.h"
 #include "SourceBufferResource.h"
 #include "VideoUtils.h"
--- a/dom/media/mediasource/TrackBuffersManager.h
+++ b/dom/media/mediasource/TrackBuffersManager.h
@ -7,16 +7,17 @@
 #ifndef MOZILLA_TRACKBUFFERSMANAGER_H_
 #define MOZILLA_TRACKBUFFERSMANAGER_H_

-#include "SourceBufferContentManager.h"
-#include "MediaDataDemuxer.h"
-#include "MediaSourceDecoder.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/Pair.h"
+#include "mozilla/StateMirroring.h"
+
+#include "SourceBufferContentManager.h"
+#include "MediaDataDemuxer.h"
+#include "MediaSourceDecoder.h"
 #include "nsProxyRelease.h"
 #include "nsTArray.h"
-#include "StateMirroring.h"

 namespace mozilla {

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@ -96,7 +96,6 @@ XPIDL_MODULE = 'dom_media'

 EXPORTS += [
    'AbstractMediaDecoder.h',
-    'AbstractThread.h',
    'AudioBufferUtils.h',
    'AudioChannelFormat.h',
    'AudioCompactor.h',
@ -132,7 +131,6 @@ EXPORTS += [
    'MediaTimer.h',
    'MediaTrack.h',
    'MediaTrackList.h',
-    'MozPromise.h',
    'MP3Decoder.h',
    'MP3Demuxer.h',
    'MP3FrameParser.h',
@ -141,11 +139,7 @@ EXPORTS += [
    'SelfRef.h',
    'SharedBuffer.h',
    'SharedThreadPool.h',
-    'StateMirroring.h',
-    'StateWatching.h',
    'StreamBuffer.h',
-    'TaskDispatcher.h',
-    'TaskQueue.h',
    'ThreadPoolCOMListener.h',
    'TimeUnits.h',
    'TimeVarying.h',
@ -157,7 +151,13 @@ EXPORTS += [
 ]

 EXPORTS.mozilla += [
+    'AbstractThread.h',
    'MediaManager.h',
+    'MozPromise.h',
+    'StateMirroring.h',
+    'StateWatching.h',
+    'TaskDispatcher.h',
+    'TaskQueue.h',
 ]

 EXPORTS.mozilla.media.webrtc += [
--- a/dom/media/omx/MediaCodecReader.cpp
+++ b/dom/media/omx/MediaCodecReader.cpp
@ -25,13 +25,13 @@
 #include <stagefright/MetaData.h>
 #include <stagefright/Utils.h>

+#include "mozilla/TaskQueue.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/layers/GrallocTextureClient.h"

 #include "gfx2DGlue.h"

 #include "MediaStreamSource.h"
-#include "TaskQueue.h"
 #include "MP3FrameParser.h"
 #include "nsMimeTypes.h"
 #include "nsThreadUtils.h"
--- a/dom/media/platforms/PlatformDecoderModule.cpp
+++ b/dom/media/platforms/PlatformDecoderModule.cpp
@ -24,12 +24,13 @@
 #include "GMPDecoderModule.h"

 #include "mozilla/Preferences.h"
+#include "mozilla/TaskQueue.h"
+
 #ifdef MOZ_EME
 #include "EMEDecoderModule.h"
 #include "mozilla/CDMProxy.h"
 #endif
 #include "SharedThreadPool.h"
-#include "TaskQueue.h"

 #include "MediaInfo.h"
 #include "H264Converter.h"
--- a/dom/media/platforms/agnostic/BlankDecoderModule.cpp
+++ b/dom/media/platforms/agnostic/BlankDecoderModule.cpp
@ -12,7 +12,7 @@
 #include "VideoUtils.h"
 #include "ImageContainer.h"
 #include "MediaInfo.h"
-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
 #include "TimeUnits.h"

 namespace mozilla {
--- a/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h
+++ b/dom/media/platforms/agnostic/eme/SamplesWaitingForKey.h
@ -7,7 +7,8 @@
 #ifndef SamplesWaitingForKey_h_
 #define SamplesWaitingForKey_h_

-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
+
 #include "PlatformDecoderModule.h"

 namespace mozilla {
--- a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp
@ -4,9 +4,9 @@
 * 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 "TaskQueue.h"
-#include "FFmpegRuntimeLinker.h"
+#include "mozilla/TaskQueue.h"

+#include "FFmpegRuntimeLinker.h"
 #include "FFmpegAudioDecoder.h"
 #include "TimeUnits.h"

--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
@ -4,10 +4,11 @@
 * 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/TaskQueue.h"
+
 #include <string.h>
 #include <unistd.h>

-#include "TaskQueue.h"
 #include "FFmpegLibs.h"
 #include "FFmpegLog.h"
 #include "FFmpegDataDecoder.h"
--- a/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegH264Decoder.cpp
@ -4,7 +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/. */

-#include "TaskQueue.h"
+#include "mozilla/TaskQueue.h"
+
 #include "nsThreadUtils.h"
 #include "nsAutoPtr.h"
 #include "ImageContainer.h"
--- a/dom/media/platforms/wrappers/H264Converter.cpp
+++ b/dom/media/platforms/wrappers/H264Converter.cpp
@ -4,9 +4,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 "mozilla/TaskQueue.h"
+
 #include "H264Converter.h"
 #include "ImageContainer.h"
-#include "TaskQueue.h"
 #include "MediaInfo.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
--- a/dom/media/systemservices/MediaSystemResourceManager.cpp
+++ b/dom/media/systemservices/MediaSystemResourceManager.cpp
@ -4,9 +4,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 "mozilla/TaskQueue.h"
+
 #include "gfxPrefs.h"
 #include "MediaSystemResourceManagerChild.h"
-#include "TaskQueue.h"
 #include "mozilla/layers/ImageBridgeChild.h"

 #include "MediaSystemResourceManager.h"
--- a/dom/media/systemservices/MediaSystemResourceManager.h
+++ b/dom/media/systemservices/MediaSystemResourceManager.h
@ -24,8 +24,8 @@ class MediaSystemResourceManagerChild;

 class MediaSystemResourceClient;
 class MediaSystemResourceReservationListener;
-class TaskQueue;
 class ReentrantMonitor;
+class TaskQueue;

 /**
 * Manage media system resource allocation requests within a process.
--- a/dom/media/webaudio/BufferDecoder.h
+++ b/dom/media/webaudio/BufferDecoder.h
@ -7,10 +7,11 @@
 #ifndef BUFFER_DECODER_H_
 #define BUFFER_DECODER_H_

-#include "AbstractMediaDecoder.h"
-#include "TaskQueue.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/ReentrantMonitor.h"
+#include "mozilla/TaskQueue.h"
+
+#include "AbstractMediaDecoder.h"

 namespace mozilla {

--- a/dom/media/webm/IntelWebMVideoDecoder.cpp
+++ b/dom/media/webm/IntelWebMVideoDecoder.cpp
@ -5,10 +5,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "IntelWebMVideoDecoder.h"

+#include "mozilla/TaskQueue.h"
+
 #include "gfx2DGlue.h"
 #include "Layers.h"
 #include "MediaResource.h"
-#include "TaskQueue.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "nsError.h"
 #include "SharedThreadPool.h"