--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -150,17 +150,16 @@ EXPORTS += [
     'VorbisUtils.h',
 ]
 
 EXPORTS.mozilla += [
     'MediaManager.h',
     'MozPromise.h',
     'StateMirroring.h',
     'StateWatching.h',
-    'TaskQueue.h',
 ]
 
 EXPORTS.mozilla.media.webrtc += [
     'webrtc/WebrtcGlobal.h',
 ]
 
 IPDL_SOURCES += [
     'webrtc/PWebrtcGlobal.ipdl'
@@ -230,17 +229,16 @@ UNIFIED_SOURCES += [
     'MediaTimer.cpp',
     'MediaTrack.cpp',
     'MediaTrackList.cpp',
     'MP3Decoder.cpp',
     'MP3Demuxer.cpp',
     'MP3FrameParser.cpp',
     'RtspMediaResource.cpp',
     'StreamBuffer.cpp',
-    'TaskQueue.cpp',
     'TextTrack.cpp',
     'TextTrackCue.cpp',
     'TextTrackCueList.cpp',
     'TextTrackList.cpp',
     'TextTrackRegion.cpp',
     'TrackUnionStream.cpp',
     'VideoFrameContainer.cpp',
     'VideoPlaybackQuality.cpp',

rename from dom/media/TaskQueue.cpp
rename to xpcom/threads/TaskQueue.cpp

rename from dom/media/TaskQueue.h
rename to xpcom/threads/TaskQueue.h

--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -31,16 +31,17 @@ EXPORTS.mozilla += [
     'AbstractThread.h',
     'BackgroundHangMonitor.h',
     'HangAnnotations.h',
     'HangMonitor.h',
     'LazyIdleThread.h',
     'SharedThreadPool.h',
     'SyncRunnable.h',
     'TaskDispatcher.h',
+    'TaskQueue.h',
 ]
 
 UNIFIED_SOURCES += [
     'AbstractThread.cpp',
     'BackgroundHangMonitor.cpp',
     'HangAnnotations.cpp',
     'HangMonitor.cpp',
     'LazyIdleThread.cpp',
@@ -48,16 +49,17 @@ UNIFIED_SOURCES += [
     'nsEventQueue.cpp',
     'nsMemoryPressure.cpp',
     'nsProcessCommon.cpp',
     'nsThread.cpp',
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
     'nsTimerImpl.cpp',
     'SharedThreadPool.cpp',
+    'TaskQueue.cpp',
     'ThreadStackHelper.cpp',
     'TimerThread.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../build',
     '/caps',
     '/toolkit/crashreporter/google-breakpad/src',