diff --git a/accessible/tests/mochitest/a11y.ini b/accessible/tests/mochitest/a11y.ini
index b275d5a25d8..aace285e83b 100644
--- a/accessible/tests/mochitest/a11y.ini
+++ b/accessible/tests/mochitest/a11y.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 support-files =
-  ../../../content/media/test/bug461281.ogg
+  ../../../dom/media/test/bug461281.ogg
   dumbfile.xpi
   formimage.png
   letters.gif
diff --git a/content/base/test/file_mixed_content_main.html b/content/base/test/file_mixed_content_main.html
index 36ea6429bff..d7bae1938de 100644
--- a/content/base/test/file_mixed_content_main.html
+++ b/content/base/test/file_mixed_content_main.html
@@ -200,7 +200,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
 
   // Test 2b: insecure media
   var media = document.createElement("video");
-  media.src = "http://mochi.test:8888/tests/content/media/test/320x240.ogv?" + Math.floor((Math.random()*1000)+1);
+  media.src = "http://mochi.test:8888/tests/dom/media/test/320x240.ogv?" + Math.floor((Math.random()*1000)+1);
   media.width = "320";
   media.height = "200";
   media.type = "video/ogg";
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index ca6d6bac751..4770897cb21 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -173,9 +173,9 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
-    '/content/media/',
     '/dom/base',
     '/dom/canvas',
+    '/dom/media/',
     '/dom/xbl',
     '/dom/xul',
     '/editor/libeditor',
diff --git a/content/media/moz.build b/content/media/moz.build
deleted file mode 100644
index e8ba4a635b6..00000000000
--- a/content/media/moz.build
+++ /dev/null
@@ -1,214 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-DIRS += [
-  'encoder',
-  'gmp',
-  'mediasource',
-  'ogg',
-  'systemservices',
-  'webaudio',
-  'webvtt'
-]
-
-TEST_DIRS += ['compiledtest']
-
-if CONFIG['MOZ_RAW']:
-    DIRS += ['raw']
-
-if CONFIG['MOZ_WAVE']:
-    DIRS += ['wave']
-
-if CONFIG['MOZ_WEBM']:
-    DIRS += ['webm']
-
-if CONFIG['MOZ_GSTREAMER']:
-    DIRS += ['gstreamer']
-
-if CONFIG['MOZ_DIRECTSHOW']:
-    DIRS += ['directshow']
-
-if CONFIG['MOZ_ANDROID_OMX']:
-    DIRS += ['android']
-
-if CONFIG['MOZ_WMF']:
-    DIRS += ['wmf']
-
-if CONFIG['MOZ_FMP4']:
-    DIRS += ['fmp4']
-
-if CONFIG['MOZ_APPLEMEDIA']:
-    DIRS += ['apple']
-
-DIRS += ['webrtc']
-
-if CONFIG['MOZ_OMX_DECODER']:
-    DIRS += ['omx']
-    DIRS += ['omx/mediaresourcemanager']
-
-DIRS += ['webspeech', 'imagecapture']
-
-if CONFIG['MOZ_EME']:
-    DIRS += ['eme']
-
-TEST_DIRS += [
-    'gtest',
-]
-
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-
-EXPORTS += [
-    'AbstractMediaDecoder.h',
-    'AudioBufferUtils.h',
-    'AudioChannelFormat.h',
-    'AudioCompactor.h',
-    'AudioMixer.h',
-    'AudioSampleFormat.h',
-    'AudioSegment.h',
-    'AudioStream.h',
-    'BufferMediaResource.h',
-    'CubebUtils.h',
-    'DecoderTraits.h',
-    'DOMMediaStream.h',
-    'EncodedBufferCache.h',
-    'FileBlockCache.h',
-    'GraphDriver.h',
-    'Latency.h',
-    'MediaCache.h',
-    'MediaData.h',
-    'MediaDataDecodedListener.h',
-    'MediaDecoder.h',
-    'MediaDecoderOwner.h',
-    'MediaDecoderReader.h',
-    'MediaDecoderStateMachine.h',
-    'MediaInfo.h',
-    'MediaMetadataManager.h',
-    'MediaQueue.h',
-    'MediaRecorder.h',
-    'MediaResource.h',
-    'MediaSegment.h',
-    'MediaStreamGraph.h',
-    'MediaTaskQueue.h',
-    'MediaTrack.h',
-    'MediaTrackList.h',
-    'MP3FrameParser.h',
-    'nsIDocumentActivity.h',
-    'RtspMediaResource.h',
-    'SharedBuffer.h',
-    'SharedThreadPool.h',
-    'StreamBuffer.h',
-    'ThreadPoolCOMListener.h',
-    'TimeVarying.h',
-    'TrackUnionStream.h',
-    'VideoFrameContainer.h',
-    'VideoSegment.h',
-    'VideoUtils.h',
-    'VorbisUtils.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'AudioStreamTrack.h',
-    'AudioTrack.h',
-    'AudioTrackList.h',
-    'MediaStreamTrack.h',
-    'TextTrack.h',
-    'TextTrackCue.h',
-    'TextTrackCueList.h',
-    'TextTrackList.h',
-    'TextTrackRegion.h',
-    'VideoPlaybackQuality.h',
-    'VideoStreamTrack.h',
-    'VideoTrack.h',
-    'VideoTrackList.h',
-]
-
-UNIFIED_SOURCES += [
-    'AudioChannelFormat.cpp',
-    'AudioCompactor.cpp',
-    'AudioSegment.cpp',
-    'AudioSink.cpp',
-    'AudioStream.cpp',
-    'AudioStreamTrack.cpp',
-    'AudioTrack.cpp',
-    'AudioTrackList.cpp',
-    'CubebUtils.cpp',
-    'DOMMediaStream.cpp',
-    'EncodedBufferCache.cpp',
-    'FileBlockCache.cpp',
-    "GraphDriver.cpp",
-    'Latency.cpp',
-    'MediaCache.cpp',
-    'MediaData.cpp',
-    'MediaDecoder.cpp',
-    'MediaDecoderReader.cpp',
-    'MediaDecoderStateMachine.cpp',
-    'MediaDecoderStateMachineScheduler.cpp',
-    'MediaRecorder.cpp',
-    'MediaResource.cpp',
-    'MediaShutdownManager.cpp',
-    'MediaStreamGraph.cpp',
-    'MediaStreamTrack.cpp',
-    'MediaTaskQueue.cpp',
-    'MediaTrack.cpp',
-    'MediaTrackList.cpp',
-    'MP3FrameParser.cpp',
-    'RtspMediaResource.cpp',
-    'SharedThreadPool.cpp',
-    'StreamBuffer.cpp',
-    'TextTrack.cpp',
-    'TextTrackCue.cpp',
-    'TextTrackCueList.cpp',
-    'TextTrackList.cpp',
-    'TextTrackRegion.cpp',
-    'TrackUnionStream.cpp',
-    'VideoFrameContainer.cpp',
-    'VideoPlaybackQuality.cpp',
-    'VideoSegment.cpp',
-    'VideoStreamTrack.cpp',
-    'VideoTrack.cpp',
-    'VideoTrackList.cpp',
-    'VideoUtils.cpp',
-    'WebVTTListener.cpp',
-]
-
-if CONFIG['OS_TARGET'] == 'WINNT':
-  SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
-
-# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
-SOURCES += [
-    'DecoderTraits.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/layout/generic',
-    '/layout/xul',
-    '/netwerk/base/src',
-]
-
-if CONFIG['MOZ_DIRECTSHOW']:
-    LOCAL_INCLUDES += [
-        '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
-    ]
-
-DEFINES['MOZILLA_INTERNAL_API'] = True
-
-if CONFIG['MOZ_OMX_DECODER']:
-    DEFINES['MOZ_OMX_DECODER'] = True
-
-if CONFIG['ANDROID_VERSION'] > '15':
-    DEFINES['MOZ_OMX_WEBM_DECODER'] = True
-
-CFLAGS += CONFIG['GSTREAMER_CFLAGS']
-CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
diff --git a/content/moz.build b/content/moz.build
index 4750fdad5ce..146867aeb02 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -7,7 +7,6 @@
 DIRS += [
     'base',
     'html',
-    'media',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 78fe9a654b5..58716b1a9c0 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -44,8 +44,6 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
-    '/content/media/webaudio',
-    '/content/media/webspeech/recognition',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
@@ -53,6 +51,8 @@ LOCAL_INCLUDES += [
     '/dom/canvas',
     '/dom/geolocation',
     '/dom/indexedDB',
+    '/dom/media/webaudio',
+    '/dom/media/webspeech/recognition',
     '/dom/svg',
     '/dom/workers',
     '/dom/xbl',
diff --git a/dom/browser-element/mochitest/mochitest.ini b/dom/browser-element/mochitest/mochitest.ini
index 2c406f60d7f..acea40b7dc3 100644
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -2,7 +2,7 @@
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
 support-files =
   ../../../browser/base/content/test/general/audio.ogg
-  ../../../content/media/test/short-video.ogv
+  ../../../dom/media/test/short-video.ogv
   browserElementTestHelpers.js
   browserElement_Alert.js
   browserElement_AlertInFrame.js
diff --git a/dom/canvas/test/crossorigin/test_video_crossorigin.html b/dom/canvas/test/crossorigin/test_video_crossorigin.html
index ffd4bcb5110..65f7976377d 100644
--- a/dom/canvas/test/crossorigin/test_video_crossorigin.html
+++ b/dom/canvas/test/crossorigin/test_video_crossorigin.html
@@ -7,7 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=682299
   <title>Test for Bug 682299</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript" src="/tests/content/media/test/manifest.js"></script>
+  <script type="application/javascript" src="/tests/dom/media/test/manifest.js"></script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=682299">Mozilla Bug 682299</a>
@@ -146,7 +146,7 @@ var videoFile = getPlayableVideo(gSmallTests);
 if (!videoFile) {
   SimpleTest.finish();
 }
-videoFile = "?name=tests/content/media/test/" + videoFile.name + "&type=" + videoFile.type;
+videoFile = "?name=tests/dom/media/test/" + videoFile.name + "&type=" + videoFile.type;
 
 var gl;
 try {
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index f5e0c433f92..4e5eac292e0 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -103,7 +103,6 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/chrome',
     '/content/base/src',
-    '/content/media/webspeech/synth/ipc',
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
@@ -112,6 +111,7 @@ LOCAL_INCLUDES += [
     '/dom/filesystem',
     '/dom/fmradio/ipc',
     '/dom/geolocation',
+    '/dom/media/webspeech/synth/ipc',
     '/dom/mobilemessage/ipc',
     '/dom/storage',
     '/editor/libeditor',
diff --git a/content/media/AbstractMediaDecoder.h b/dom/media/AbstractMediaDecoder.h
similarity index 100%
rename from content/media/AbstractMediaDecoder.h
rename to dom/media/AbstractMediaDecoder.h
diff --git a/content/media/AudioBufferUtils.h b/dom/media/AudioBufferUtils.h
similarity index 100%
rename from content/media/AudioBufferUtils.h
rename to dom/media/AudioBufferUtils.h
diff --git a/content/media/AudioChannelFormat.cpp b/dom/media/AudioChannelFormat.cpp
similarity index 100%
rename from content/media/AudioChannelFormat.cpp
rename to dom/media/AudioChannelFormat.cpp
diff --git a/content/media/AudioChannelFormat.h b/dom/media/AudioChannelFormat.h
similarity index 100%
rename from content/media/AudioChannelFormat.h
rename to dom/media/AudioChannelFormat.h
diff --git a/content/media/AudioCompactor.cpp b/dom/media/AudioCompactor.cpp
similarity index 100%
rename from content/media/AudioCompactor.cpp
rename to dom/media/AudioCompactor.cpp
diff --git a/content/media/AudioCompactor.h b/dom/media/AudioCompactor.h
similarity index 100%
rename from content/media/AudioCompactor.h
rename to dom/media/AudioCompactor.h
diff --git a/content/media/AudioMixer.h b/dom/media/AudioMixer.h
similarity index 100%
rename from content/media/AudioMixer.h
rename to dom/media/AudioMixer.h
diff --git a/content/media/AudioSampleFormat.h b/dom/media/AudioSampleFormat.h
similarity index 100%
rename from content/media/AudioSampleFormat.h
rename to dom/media/AudioSampleFormat.h
diff --git a/content/media/AudioSegment.cpp b/dom/media/AudioSegment.cpp
similarity index 100%
rename from content/media/AudioSegment.cpp
rename to dom/media/AudioSegment.cpp
diff --git a/content/media/AudioSegment.h b/dom/media/AudioSegment.h
similarity index 100%
rename from content/media/AudioSegment.h
rename to dom/media/AudioSegment.h
diff --git a/content/media/AudioSink.cpp b/dom/media/AudioSink.cpp
similarity index 100%
rename from content/media/AudioSink.cpp
rename to dom/media/AudioSink.cpp
diff --git a/content/media/AudioSink.h b/dom/media/AudioSink.h
similarity index 100%
rename from content/media/AudioSink.h
rename to dom/media/AudioSink.h
diff --git a/content/media/AudioStream.cpp b/dom/media/AudioStream.cpp
similarity index 100%
rename from content/media/AudioStream.cpp
rename to dom/media/AudioStream.cpp
diff --git a/content/media/AudioStream.h b/dom/media/AudioStream.h
similarity index 100%
rename from content/media/AudioStream.h
rename to dom/media/AudioStream.h
diff --git a/content/media/AudioStreamTrack.cpp b/dom/media/AudioStreamTrack.cpp
similarity index 100%
rename from content/media/AudioStreamTrack.cpp
rename to dom/media/AudioStreamTrack.cpp
diff --git a/content/media/AudioStreamTrack.h b/dom/media/AudioStreamTrack.h
similarity index 100%
rename from content/media/AudioStreamTrack.h
rename to dom/media/AudioStreamTrack.h
diff --git a/content/media/AudioTrack.cpp b/dom/media/AudioTrack.cpp
similarity index 100%
rename from content/media/AudioTrack.cpp
rename to dom/media/AudioTrack.cpp
diff --git a/content/media/AudioTrack.h b/dom/media/AudioTrack.h
similarity index 100%
rename from content/media/AudioTrack.h
rename to dom/media/AudioTrack.h
diff --git a/content/media/AudioTrackList.cpp b/dom/media/AudioTrackList.cpp
similarity index 100%
rename from content/media/AudioTrackList.cpp
rename to dom/media/AudioTrackList.cpp
diff --git a/content/media/AudioTrackList.h b/dom/media/AudioTrackList.h
similarity index 100%
rename from content/media/AudioTrackList.h
rename to dom/media/AudioTrackList.h
diff --git a/content/media/BufferMediaResource.h b/dom/media/BufferMediaResource.h
similarity index 100%
rename from content/media/BufferMediaResource.h
rename to dom/media/BufferMediaResource.h
diff --git a/content/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
similarity index 100%
rename from content/media/CubebUtils.cpp
rename to dom/media/CubebUtils.cpp
diff --git a/content/media/CubebUtils.h b/dom/media/CubebUtils.h
similarity index 100%
rename from content/media/CubebUtils.h
rename to dom/media/CubebUtils.h
diff --git a/content/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp
similarity index 100%
rename from content/media/DOMMediaStream.cpp
rename to dom/media/DOMMediaStream.cpp
diff --git a/content/media/DOMMediaStream.h b/dom/media/DOMMediaStream.h
similarity index 99%
rename from content/media/DOMMediaStream.h
rename to dom/media/DOMMediaStream.h
index 835a72e1c3f..d7fff448dbf 100644
--- a/content/media/DOMMediaStream.h
+++ b/dom/media/DOMMediaStream.h
@@ -23,7 +23,7 @@ class nsXPCClassInfo;
 #undef GetCurrentTime
 #endif
 // X11 has a #define for CurrentTime. Unbelievable :-(.
-// See content/media/webaudio/AudioContext.h for more fun!
+// See dom/media/webaudio/AudioContext.h for more fun!
 #ifdef CurrentTime
 #undef CurrentTime
 #endif
diff --git a/content/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp
similarity index 100%
rename from content/media/DecoderTraits.cpp
rename to dom/media/DecoderTraits.cpp
diff --git a/content/media/DecoderTraits.h b/dom/media/DecoderTraits.h
similarity index 100%
rename from content/media/DecoderTraits.h
rename to dom/media/DecoderTraits.h
diff --git a/content/media/EncodedBufferCache.cpp b/dom/media/EncodedBufferCache.cpp
similarity index 100%
rename from content/media/EncodedBufferCache.cpp
rename to dom/media/EncodedBufferCache.cpp
diff --git a/content/media/EncodedBufferCache.h b/dom/media/EncodedBufferCache.h
similarity index 100%
rename from content/media/EncodedBufferCache.h
rename to dom/media/EncodedBufferCache.h
diff --git a/content/media/FileBlockCache.cpp b/dom/media/FileBlockCache.cpp
similarity index 100%
rename from content/media/FileBlockCache.cpp
rename to dom/media/FileBlockCache.cpp
diff --git a/content/media/FileBlockCache.h b/dom/media/FileBlockCache.h
similarity index 100%
rename from content/media/FileBlockCache.h
rename to dom/media/FileBlockCache.h
diff --git a/content/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
similarity index 100%
rename from content/media/GraphDriver.cpp
rename to dom/media/GraphDriver.cpp
diff --git a/content/media/GraphDriver.h b/dom/media/GraphDriver.h
similarity index 100%
rename from content/media/GraphDriver.h
rename to dom/media/GraphDriver.h
diff --git a/content/media/Latency.cpp b/dom/media/Latency.cpp
similarity index 100%
rename from content/media/Latency.cpp
rename to dom/media/Latency.cpp
diff --git a/content/media/Latency.h b/dom/media/Latency.h
similarity index 100%
rename from content/media/Latency.h
rename to dom/media/Latency.h
diff --git a/content/media/MP3FrameParser.cpp b/dom/media/MP3FrameParser.cpp
similarity index 100%
rename from content/media/MP3FrameParser.cpp
rename to dom/media/MP3FrameParser.cpp
diff --git a/content/media/MP3FrameParser.h b/dom/media/MP3FrameParser.h
similarity index 100%
rename from content/media/MP3FrameParser.h
rename to dom/media/MP3FrameParser.h
diff --git a/content/media/MediaCache.cpp b/dom/media/MediaCache.cpp
similarity index 100%
rename from content/media/MediaCache.cpp
rename to dom/media/MediaCache.cpp
diff --git a/content/media/MediaCache.h b/dom/media/MediaCache.h
similarity index 100%
rename from content/media/MediaCache.h
rename to dom/media/MediaCache.h
diff --git a/content/media/MediaData.cpp b/dom/media/MediaData.cpp
similarity index 100%
rename from content/media/MediaData.cpp
rename to dom/media/MediaData.cpp
diff --git a/content/media/MediaData.h b/dom/media/MediaData.h
similarity index 100%
rename from content/media/MediaData.h
rename to dom/media/MediaData.h
diff --git a/content/media/MediaDataDecodedListener.h b/dom/media/MediaDataDecodedListener.h
similarity index 100%
rename from content/media/MediaDataDecodedListener.h
rename to dom/media/MediaDataDecodedListener.h
diff --git a/content/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
similarity index 100%
rename from content/media/MediaDecoder.cpp
rename to dom/media/MediaDecoder.cpp
diff --git a/content/media/MediaDecoder.h b/dom/media/MediaDecoder.h
similarity index 100%
rename from content/media/MediaDecoder.h
rename to dom/media/MediaDecoder.h
diff --git a/content/media/MediaDecoderOwner.h b/dom/media/MediaDecoderOwner.h
similarity index 100%
rename from content/media/MediaDecoderOwner.h
rename to dom/media/MediaDecoderOwner.h
diff --git a/content/media/MediaDecoderReader.cpp b/dom/media/MediaDecoderReader.cpp
similarity index 100%
rename from content/media/MediaDecoderReader.cpp
rename to dom/media/MediaDecoderReader.cpp
diff --git a/content/media/MediaDecoderReader.h b/dom/media/MediaDecoderReader.h
similarity index 100%
rename from content/media/MediaDecoderReader.h
rename to dom/media/MediaDecoderReader.h
diff --git a/content/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
similarity index 100%
rename from content/media/MediaDecoderStateMachine.cpp
rename to dom/media/MediaDecoderStateMachine.cpp
diff --git a/content/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
similarity index 100%
rename from content/media/MediaDecoderStateMachine.h
rename to dom/media/MediaDecoderStateMachine.h
diff --git a/content/media/MediaDecoderStateMachineScheduler.cpp b/dom/media/MediaDecoderStateMachineScheduler.cpp
similarity index 100%
rename from content/media/MediaDecoderStateMachineScheduler.cpp
rename to dom/media/MediaDecoderStateMachineScheduler.cpp
diff --git a/content/media/MediaDecoderStateMachineScheduler.h b/dom/media/MediaDecoderStateMachineScheduler.h
similarity index 100%
rename from content/media/MediaDecoderStateMachineScheduler.h
rename to dom/media/MediaDecoderStateMachineScheduler.h
diff --git a/content/media/MediaInfo.h b/dom/media/MediaInfo.h
similarity index 100%
rename from content/media/MediaInfo.h
rename to dom/media/MediaInfo.h
diff --git a/content/media/MediaMetadataManager.h b/dom/media/MediaMetadataManager.h
similarity index 100%
rename from content/media/MediaMetadataManager.h
rename to dom/media/MediaMetadataManager.h
diff --git a/content/media/MediaQueue.h b/dom/media/MediaQueue.h
similarity index 100%
rename from content/media/MediaQueue.h
rename to dom/media/MediaQueue.h
diff --git a/content/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
similarity index 99%
rename from content/media/MediaRecorder.cpp
rename to dom/media/MediaRecorder.cpp
index b0527f6609e..802bc971abe 100644
--- a/content/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -26,6 +26,10 @@
 #include "nsTArray.h"
 #include "GeckoProfiler.h"
 
+#ifdef LOG
+#undef LOG
+#endif
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* gMediaRecorderLog;
 #define LOG(type, msg) PR_LOG(gMediaRecorderLog, type, msg)
diff --git a/content/media/MediaRecorder.h b/dom/media/MediaRecorder.h
similarity index 100%
rename from content/media/MediaRecorder.h
rename to dom/media/MediaRecorder.h
diff --git a/content/media/MediaResource.cpp b/dom/media/MediaResource.cpp
similarity index 100%
rename from content/media/MediaResource.cpp
rename to dom/media/MediaResource.cpp
diff --git a/content/media/MediaResource.h b/dom/media/MediaResource.h
similarity index 100%
rename from content/media/MediaResource.h
rename to dom/media/MediaResource.h
diff --git a/content/media/MediaSegment.h b/dom/media/MediaSegment.h
similarity index 100%
rename from content/media/MediaSegment.h
rename to dom/media/MediaSegment.h
diff --git a/content/media/MediaShutdownManager.cpp b/dom/media/MediaShutdownManager.cpp
similarity index 100%
rename from content/media/MediaShutdownManager.cpp
rename to dom/media/MediaShutdownManager.cpp
diff --git a/content/media/MediaShutdownManager.h b/dom/media/MediaShutdownManager.h
similarity index 100%
rename from content/media/MediaShutdownManager.h
rename to dom/media/MediaShutdownManager.h
diff --git a/content/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
similarity index 100%
rename from content/media/MediaStreamGraph.cpp
rename to dom/media/MediaStreamGraph.cpp
diff --git a/content/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h
similarity index 100%
rename from content/media/MediaStreamGraph.h
rename to dom/media/MediaStreamGraph.h
diff --git a/content/media/MediaStreamGraphImpl.h b/dom/media/MediaStreamGraphImpl.h
similarity index 100%
rename from content/media/MediaStreamGraphImpl.h
rename to dom/media/MediaStreamGraphImpl.h
diff --git a/content/media/MediaStreamTrack.cpp b/dom/media/MediaStreamTrack.cpp
similarity index 100%
rename from content/media/MediaStreamTrack.cpp
rename to dom/media/MediaStreamTrack.cpp
diff --git a/content/media/MediaStreamTrack.h b/dom/media/MediaStreamTrack.h
similarity index 100%
rename from content/media/MediaStreamTrack.h
rename to dom/media/MediaStreamTrack.h
diff --git a/content/media/MediaTaskQueue.cpp b/dom/media/MediaTaskQueue.cpp
similarity index 100%
rename from content/media/MediaTaskQueue.cpp
rename to dom/media/MediaTaskQueue.cpp
diff --git a/content/media/MediaTaskQueue.h b/dom/media/MediaTaskQueue.h
similarity index 100%
rename from content/media/MediaTaskQueue.h
rename to dom/media/MediaTaskQueue.h
diff --git a/content/media/MediaTrack.cpp b/dom/media/MediaTrack.cpp
similarity index 100%
rename from content/media/MediaTrack.cpp
rename to dom/media/MediaTrack.cpp
diff --git a/content/media/MediaTrack.h b/dom/media/MediaTrack.h
similarity index 100%
rename from content/media/MediaTrack.h
rename to dom/media/MediaTrack.h
diff --git a/content/media/MediaTrackList.cpp b/dom/media/MediaTrackList.cpp
similarity index 100%
rename from content/media/MediaTrackList.cpp
rename to dom/media/MediaTrackList.cpp
diff --git a/content/media/MediaTrackList.h b/dom/media/MediaTrackList.h
similarity index 100%
rename from content/media/MediaTrackList.h
rename to dom/media/MediaTrackList.h
diff --git a/content/media/RtspMediaResource.cpp b/dom/media/RtspMediaResource.cpp
similarity index 100%
rename from content/media/RtspMediaResource.cpp
rename to dom/media/RtspMediaResource.cpp
diff --git a/content/media/RtspMediaResource.h b/dom/media/RtspMediaResource.h
similarity index 100%
rename from content/media/RtspMediaResource.h
rename to dom/media/RtspMediaResource.h
diff --git a/content/media/SharedBuffer.h b/dom/media/SharedBuffer.h
similarity index 100%
rename from content/media/SharedBuffer.h
rename to dom/media/SharedBuffer.h
diff --git a/content/media/SharedThreadPool.cpp b/dom/media/SharedThreadPool.cpp
similarity index 100%
rename from content/media/SharedThreadPool.cpp
rename to dom/media/SharedThreadPool.cpp
diff --git a/content/media/SharedThreadPool.h b/dom/media/SharedThreadPool.h
similarity index 100%
rename from content/media/SharedThreadPool.h
rename to dom/media/SharedThreadPool.h
diff --git a/content/media/StreamBuffer.cpp b/dom/media/StreamBuffer.cpp
similarity index 100%
rename from content/media/StreamBuffer.cpp
rename to dom/media/StreamBuffer.cpp
diff --git a/content/media/StreamBuffer.h b/dom/media/StreamBuffer.h
similarity index 100%
rename from content/media/StreamBuffer.h
rename to dom/media/StreamBuffer.h
diff --git a/content/media/TextTrack.cpp b/dom/media/TextTrack.cpp
similarity index 100%
rename from content/media/TextTrack.cpp
rename to dom/media/TextTrack.cpp
diff --git a/content/media/TextTrack.h b/dom/media/TextTrack.h
similarity index 100%
rename from content/media/TextTrack.h
rename to dom/media/TextTrack.h
diff --git a/content/media/TextTrackCue.cpp b/dom/media/TextTrackCue.cpp
similarity index 100%
rename from content/media/TextTrackCue.cpp
rename to dom/media/TextTrackCue.cpp
diff --git a/content/media/TextTrackCue.h b/dom/media/TextTrackCue.h
similarity index 100%
rename from content/media/TextTrackCue.h
rename to dom/media/TextTrackCue.h
diff --git a/content/media/TextTrackCueList.cpp b/dom/media/TextTrackCueList.cpp
similarity index 100%
rename from content/media/TextTrackCueList.cpp
rename to dom/media/TextTrackCueList.cpp
diff --git a/content/media/TextTrackCueList.h b/dom/media/TextTrackCueList.h
similarity index 100%
rename from content/media/TextTrackCueList.h
rename to dom/media/TextTrackCueList.h
diff --git a/content/media/TextTrackList.cpp b/dom/media/TextTrackList.cpp
similarity index 100%
rename from content/media/TextTrackList.cpp
rename to dom/media/TextTrackList.cpp
diff --git a/content/media/TextTrackList.h b/dom/media/TextTrackList.h
similarity index 100%
rename from content/media/TextTrackList.h
rename to dom/media/TextTrackList.h
diff --git a/content/media/TextTrackRegion.cpp b/dom/media/TextTrackRegion.cpp
similarity index 100%
rename from content/media/TextTrackRegion.cpp
rename to dom/media/TextTrackRegion.cpp
diff --git a/content/media/TextTrackRegion.h b/dom/media/TextTrackRegion.h
similarity index 100%
rename from content/media/TextTrackRegion.h
rename to dom/media/TextTrackRegion.h
diff --git a/content/media/ThreadPoolCOMListener.cpp b/dom/media/ThreadPoolCOMListener.cpp
similarity index 100%
rename from content/media/ThreadPoolCOMListener.cpp
rename to dom/media/ThreadPoolCOMListener.cpp
diff --git a/content/media/ThreadPoolCOMListener.h b/dom/media/ThreadPoolCOMListener.h
similarity index 100%
rename from content/media/ThreadPoolCOMListener.h
rename to dom/media/ThreadPoolCOMListener.h
diff --git a/content/media/TimeVarying.h b/dom/media/TimeVarying.h
similarity index 100%
rename from content/media/TimeVarying.h
rename to dom/media/TimeVarying.h
diff --git a/content/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp
similarity index 99%
rename from content/media/TrackUnionStream.cpp
rename to dom/media/TrackUnionStream.cpp
index 6fa11e83934..5d5cfb5cb6e 100644
--- a/content/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -38,6 +38,10 @@ using namespace mozilla::gfx;
 
 namespace mozilla {
 
+#ifdef STREAM_LOG
+#undef STREAM_LOG
+#endif
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* gTrackUnionStreamLog;
 #define STREAM_LOG(type, msg) PR_LOG(gTrackUnionStreamLog, type, msg)
diff --git a/content/media/TrackUnionStream.h b/dom/media/TrackUnionStream.h
similarity index 100%
rename from content/media/TrackUnionStream.h
rename to dom/media/TrackUnionStream.h
diff --git a/content/media/VideoFrameContainer.cpp b/dom/media/VideoFrameContainer.cpp
similarity index 100%
rename from content/media/VideoFrameContainer.cpp
rename to dom/media/VideoFrameContainer.cpp
diff --git a/content/media/VideoFrameContainer.h b/dom/media/VideoFrameContainer.h
similarity index 100%
rename from content/media/VideoFrameContainer.h
rename to dom/media/VideoFrameContainer.h
diff --git a/content/media/VideoPlaybackQuality.cpp b/dom/media/VideoPlaybackQuality.cpp
similarity index 100%
rename from content/media/VideoPlaybackQuality.cpp
rename to dom/media/VideoPlaybackQuality.cpp
diff --git a/content/media/VideoPlaybackQuality.h b/dom/media/VideoPlaybackQuality.h
similarity index 100%
rename from content/media/VideoPlaybackQuality.h
rename to dom/media/VideoPlaybackQuality.h
diff --git a/content/media/VideoSegment.cpp b/dom/media/VideoSegment.cpp
similarity index 100%
rename from content/media/VideoSegment.cpp
rename to dom/media/VideoSegment.cpp
diff --git a/content/media/VideoSegment.h b/dom/media/VideoSegment.h
similarity index 100%
rename from content/media/VideoSegment.h
rename to dom/media/VideoSegment.h
diff --git a/content/media/VideoStreamTrack.cpp b/dom/media/VideoStreamTrack.cpp
similarity index 100%
rename from content/media/VideoStreamTrack.cpp
rename to dom/media/VideoStreamTrack.cpp
diff --git a/content/media/VideoStreamTrack.h b/dom/media/VideoStreamTrack.h
similarity index 100%
rename from content/media/VideoStreamTrack.h
rename to dom/media/VideoStreamTrack.h
diff --git a/content/media/VideoTrack.cpp b/dom/media/VideoTrack.cpp
similarity index 100%
rename from content/media/VideoTrack.cpp
rename to dom/media/VideoTrack.cpp
diff --git a/content/media/VideoTrack.h b/dom/media/VideoTrack.h
similarity index 100%
rename from content/media/VideoTrack.h
rename to dom/media/VideoTrack.h
diff --git a/content/media/VideoTrackList.cpp b/dom/media/VideoTrackList.cpp
similarity index 100%
rename from content/media/VideoTrackList.cpp
rename to dom/media/VideoTrackList.cpp
diff --git a/content/media/VideoTrackList.h b/dom/media/VideoTrackList.h
similarity index 100%
rename from content/media/VideoTrackList.h
rename to dom/media/VideoTrackList.h
diff --git a/content/media/VideoUtils.cpp b/dom/media/VideoUtils.cpp
similarity index 100%
rename from content/media/VideoUtils.cpp
rename to dom/media/VideoUtils.cpp
diff --git a/content/media/VideoUtils.h b/dom/media/VideoUtils.h
similarity index 100%
rename from content/media/VideoUtils.h
rename to dom/media/VideoUtils.h
diff --git a/content/media/VorbisUtils.h b/dom/media/VorbisUtils.h
similarity index 100%
rename from content/media/VorbisUtils.h
rename to dom/media/VorbisUtils.h
diff --git a/content/media/WebVTTListener.cpp b/dom/media/WebVTTListener.cpp
similarity index 100%
rename from content/media/WebVTTListener.cpp
rename to dom/media/WebVTTListener.cpp
diff --git a/content/media/WebVTTListener.h b/dom/media/WebVTTListener.h
similarity index 100%
rename from content/media/WebVTTListener.h
rename to dom/media/WebVTTListener.h
diff --git a/content/media/android/AndroidMediaDecoder.cpp b/dom/media/android/AndroidMediaDecoder.cpp
similarity index 100%
rename from content/media/android/AndroidMediaDecoder.cpp
rename to dom/media/android/AndroidMediaDecoder.cpp
diff --git a/content/media/android/AndroidMediaDecoder.h b/dom/media/android/AndroidMediaDecoder.h
similarity index 100%
rename from content/media/android/AndroidMediaDecoder.h
rename to dom/media/android/AndroidMediaDecoder.h
diff --git a/content/media/android/AndroidMediaPluginHost.cpp b/dom/media/android/AndroidMediaPluginHost.cpp
similarity index 100%
rename from content/media/android/AndroidMediaPluginHost.cpp
rename to dom/media/android/AndroidMediaPluginHost.cpp
diff --git a/content/media/android/AndroidMediaPluginHost.h b/dom/media/android/AndroidMediaPluginHost.h
similarity index 100%
rename from content/media/android/AndroidMediaPluginHost.h
rename to dom/media/android/AndroidMediaPluginHost.h
diff --git a/content/media/android/AndroidMediaReader.cpp b/dom/media/android/AndroidMediaReader.cpp
similarity index 100%
rename from content/media/android/AndroidMediaReader.cpp
rename to dom/media/android/AndroidMediaReader.cpp
diff --git a/content/media/android/AndroidMediaReader.h b/dom/media/android/AndroidMediaReader.h
similarity index 100%
rename from content/media/android/AndroidMediaReader.h
rename to dom/media/android/AndroidMediaReader.h
diff --git a/content/media/android/AndroidMediaResourceServer.cpp b/dom/media/android/AndroidMediaResourceServer.cpp
similarity index 100%
rename from content/media/android/AndroidMediaResourceServer.cpp
rename to dom/media/android/AndroidMediaResourceServer.cpp
diff --git a/content/media/android/AndroidMediaResourceServer.h b/dom/media/android/AndroidMediaResourceServer.h
similarity index 100%
rename from content/media/android/AndroidMediaResourceServer.h
rename to dom/media/android/AndroidMediaResourceServer.h
diff --git a/content/media/android/MPAPI.h b/dom/media/android/MPAPI.h
similarity index 100%
rename from content/media/android/MPAPI.h
rename to dom/media/android/MPAPI.h
diff --git a/content/media/android/moz.build b/dom/media/android/moz.build
similarity index 100%
rename from content/media/android/moz.build
rename to dom/media/android/moz.build
diff --git a/content/media/apple/AppleDecoder.cpp b/dom/media/apple/AppleDecoder.cpp
similarity index 100%
rename from content/media/apple/AppleDecoder.cpp
rename to dom/media/apple/AppleDecoder.cpp
diff --git a/content/media/apple/AppleDecoder.h b/dom/media/apple/AppleDecoder.h
similarity index 100%
rename from content/media/apple/AppleDecoder.h
rename to dom/media/apple/AppleDecoder.h
diff --git a/content/media/apple/AppleMP3Reader.cpp b/dom/media/apple/AppleMP3Reader.cpp
similarity index 100%
rename from content/media/apple/AppleMP3Reader.cpp
rename to dom/media/apple/AppleMP3Reader.cpp
diff --git a/content/media/apple/AppleMP3Reader.h b/dom/media/apple/AppleMP3Reader.h
similarity index 100%
rename from content/media/apple/AppleMP3Reader.h
rename to dom/media/apple/AppleMP3Reader.h
diff --git a/content/media/apple/moz.build b/dom/media/apple/moz.build
similarity index 100%
rename from content/media/apple/moz.build
rename to dom/media/apple/moz.build
diff --git a/content/media/compiledtest/TestAudioBuffers.cpp b/dom/media/compiledtest/TestAudioBuffers.cpp
similarity index 100%
rename from content/media/compiledtest/TestAudioBuffers.cpp
rename to dom/media/compiledtest/TestAudioBuffers.cpp
diff --git a/content/media/compiledtest/TestAudioMixer.cpp b/dom/media/compiledtest/TestAudioMixer.cpp
similarity index 100%
rename from content/media/compiledtest/TestAudioMixer.cpp
rename to dom/media/compiledtest/TestAudioMixer.cpp
diff --git a/content/media/compiledtest/moz.build b/dom/media/compiledtest/moz.build
similarity index 100%
rename from content/media/compiledtest/moz.build
rename to dom/media/compiledtest/moz.build
diff --git a/content/media/directshow/AudioSinkFilter.cpp b/dom/media/directshow/AudioSinkFilter.cpp
similarity index 100%
rename from content/media/directshow/AudioSinkFilter.cpp
rename to dom/media/directshow/AudioSinkFilter.cpp
diff --git a/content/media/directshow/AudioSinkFilter.h b/dom/media/directshow/AudioSinkFilter.h
similarity index 100%
rename from content/media/directshow/AudioSinkFilter.h
rename to dom/media/directshow/AudioSinkFilter.h
diff --git a/content/media/directshow/AudioSinkInputPin.cpp b/dom/media/directshow/AudioSinkInputPin.cpp
similarity index 100%
rename from content/media/directshow/AudioSinkInputPin.cpp
rename to dom/media/directshow/AudioSinkInputPin.cpp
diff --git a/content/media/directshow/AudioSinkInputPin.h b/dom/media/directshow/AudioSinkInputPin.h
similarity index 100%
rename from content/media/directshow/AudioSinkInputPin.h
rename to dom/media/directshow/AudioSinkInputPin.h
diff --git a/content/media/directshow/DirectShowDecoder.cpp b/dom/media/directshow/DirectShowDecoder.cpp
similarity index 100%
rename from content/media/directshow/DirectShowDecoder.cpp
rename to dom/media/directshow/DirectShowDecoder.cpp
diff --git a/content/media/directshow/DirectShowDecoder.h b/dom/media/directshow/DirectShowDecoder.h
similarity index 100%
rename from content/media/directshow/DirectShowDecoder.h
rename to dom/media/directshow/DirectShowDecoder.h
diff --git a/content/media/directshow/DirectShowReader.cpp b/dom/media/directshow/DirectShowReader.cpp
similarity index 100%
rename from content/media/directshow/DirectShowReader.cpp
rename to dom/media/directshow/DirectShowReader.cpp
diff --git a/content/media/directshow/DirectShowReader.h b/dom/media/directshow/DirectShowReader.h
similarity index 100%
rename from content/media/directshow/DirectShowReader.h
rename to dom/media/directshow/DirectShowReader.h
diff --git a/content/media/directshow/DirectShowUtils.cpp b/dom/media/directshow/DirectShowUtils.cpp
similarity index 100%
rename from content/media/directshow/DirectShowUtils.cpp
rename to dom/media/directshow/DirectShowUtils.cpp
diff --git a/content/media/directshow/DirectShowUtils.h b/dom/media/directshow/DirectShowUtils.h
similarity index 100%
rename from content/media/directshow/DirectShowUtils.h
rename to dom/media/directshow/DirectShowUtils.h
diff --git a/content/media/directshow/SampleSink.cpp b/dom/media/directshow/SampleSink.cpp
similarity index 100%
rename from content/media/directshow/SampleSink.cpp
rename to dom/media/directshow/SampleSink.cpp
diff --git a/content/media/directshow/SampleSink.h b/dom/media/directshow/SampleSink.h
similarity index 100%
rename from content/media/directshow/SampleSink.h
rename to dom/media/directshow/SampleSink.h
diff --git a/content/media/directshow/SourceFilter.cpp b/dom/media/directshow/SourceFilter.cpp
similarity index 100%
rename from content/media/directshow/SourceFilter.cpp
rename to dom/media/directshow/SourceFilter.cpp
diff --git a/content/media/directshow/SourceFilter.h b/dom/media/directshow/SourceFilter.h
similarity index 100%
rename from content/media/directshow/SourceFilter.h
rename to dom/media/directshow/SourceFilter.h
diff --git a/content/media/directshow/moz.build b/dom/media/directshow/moz.build
similarity index 100%
rename from content/media/directshow/moz.build
rename to dom/media/directshow/moz.build
diff --git a/content/media/eme/CDMCallbackProxy.cpp b/dom/media/eme/CDMCallbackProxy.cpp
similarity index 100%
rename from content/media/eme/CDMCallbackProxy.cpp
rename to dom/media/eme/CDMCallbackProxy.cpp
diff --git a/content/media/eme/CDMCallbackProxy.h b/dom/media/eme/CDMCallbackProxy.h
similarity index 100%
rename from content/media/eme/CDMCallbackProxy.h
rename to dom/media/eme/CDMCallbackProxy.h
diff --git a/content/media/eme/CDMCaps.cpp b/dom/media/eme/CDMCaps.cpp
similarity index 100%
rename from content/media/eme/CDMCaps.cpp
rename to dom/media/eme/CDMCaps.cpp
diff --git a/content/media/eme/CDMCaps.h b/dom/media/eme/CDMCaps.h
similarity index 100%
rename from content/media/eme/CDMCaps.h
rename to dom/media/eme/CDMCaps.h
diff --git a/content/media/eme/CDMProxy.cpp b/dom/media/eme/CDMProxy.cpp
similarity index 100%
rename from content/media/eme/CDMProxy.cpp
rename to dom/media/eme/CDMProxy.cpp
diff --git a/content/media/eme/CDMProxy.h b/dom/media/eme/CDMProxy.h
similarity index 100%
rename from content/media/eme/CDMProxy.h
rename to dom/media/eme/CDMProxy.h
diff --git a/content/media/eme/EMELog.cpp b/dom/media/eme/EMELog.cpp
similarity index 100%
rename from content/media/eme/EMELog.cpp
rename to dom/media/eme/EMELog.cpp
diff --git a/content/media/eme/EMELog.h b/dom/media/eme/EMELog.h
similarity index 100%
rename from content/media/eme/EMELog.h
rename to dom/media/eme/EMELog.h
diff --git a/content/media/eme/MediaEncryptedEvent.cpp b/dom/media/eme/MediaEncryptedEvent.cpp
similarity index 100%
rename from content/media/eme/MediaEncryptedEvent.cpp
rename to dom/media/eme/MediaEncryptedEvent.cpp
diff --git a/content/media/eme/MediaEncryptedEvent.h b/dom/media/eme/MediaEncryptedEvent.h
similarity index 100%
rename from content/media/eme/MediaEncryptedEvent.h
rename to dom/media/eme/MediaEncryptedEvent.h
diff --git a/content/media/eme/MediaKeyError.cpp b/dom/media/eme/MediaKeyError.cpp
similarity index 100%
rename from content/media/eme/MediaKeyError.cpp
rename to dom/media/eme/MediaKeyError.cpp
diff --git a/content/media/eme/MediaKeyError.h b/dom/media/eme/MediaKeyError.h
similarity index 100%
rename from content/media/eme/MediaKeyError.h
rename to dom/media/eme/MediaKeyError.h
diff --git a/content/media/eme/MediaKeyMessageEvent.cpp b/dom/media/eme/MediaKeyMessageEvent.cpp
similarity index 100%
rename from content/media/eme/MediaKeyMessageEvent.cpp
rename to dom/media/eme/MediaKeyMessageEvent.cpp
diff --git a/content/media/eme/MediaKeyMessageEvent.h b/dom/media/eme/MediaKeyMessageEvent.h
similarity index 100%
rename from content/media/eme/MediaKeyMessageEvent.h
rename to dom/media/eme/MediaKeyMessageEvent.h
diff --git a/content/media/eme/MediaKeySession.cpp b/dom/media/eme/MediaKeySession.cpp
similarity index 100%
rename from content/media/eme/MediaKeySession.cpp
rename to dom/media/eme/MediaKeySession.cpp
diff --git a/content/media/eme/MediaKeySession.h b/dom/media/eme/MediaKeySession.h
similarity index 100%
rename from content/media/eme/MediaKeySession.h
rename to dom/media/eme/MediaKeySession.h
diff --git a/content/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp
similarity index 100%
rename from content/media/eme/MediaKeys.cpp
rename to dom/media/eme/MediaKeys.cpp
diff --git a/content/media/eme/MediaKeys.h b/dom/media/eme/MediaKeys.h
similarity index 100%
rename from content/media/eme/MediaKeys.h
rename to dom/media/eme/MediaKeys.h
diff --git a/content/media/eme/moz.build b/dom/media/eme/moz.build
similarity index 100%
rename from content/media/eme/moz.build
rename to dom/media/eme/moz.build
diff --git a/content/media/encoder/ContainerWriter.h b/dom/media/encoder/ContainerWriter.h
similarity index 100%
rename from content/media/encoder/ContainerWriter.h
rename to dom/media/encoder/ContainerWriter.h
diff --git a/content/media/encoder/EncodedFrameContainer.h b/dom/media/encoder/EncodedFrameContainer.h
similarity index 100%
rename from content/media/encoder/EncodedFrameContainer.h
rename to dom/media/encoder/EncodedFrameContainer.h
diff --git a/content/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp
similarity index 100%
rename from content/media/encoder/MediaEncoder.cpp
rename to dom/media/encoder/MediaEncoder.cpp
diff --git a/content/media/encoder/MediaEncoder.h b/dom/media/encoder/MediaEncoder.h
similarity index 100%
rename from content/media/encoder/MediaEncoder.h
rename to dom/media/encoder/MediaEncoder.h
diff --git a/content/media/encoder/OmxTrackEncoder.cpp b/dom/media/encoder/OmxTrackEncoder.cpp
similarity index 100%
rename from content/media/encoder/OmxTrackEncoder.cpp
rename to dom/media/encoder/OmxTrackEncoder.cpp
diff --git a/content/media/encoder/OmxTrackEncoder.h b/dom/media/encoder/OmxTrackEncoder.h
similarity index 100%
rename from content/media/encoder/OmxTrackEncoder.h
rename to dom/media/encoder/OmxTrackEncoder.h
diff --git a/content/media/encoder/OpusTrackEncoder.cpp b/dom/media/encoder/OpusTrackEncoder.cpp
similarity index 100%
rename from content/media/encoder/OpusTrackEncoder.cpp
rename to dom/media/encoder/OpusTrackEncoder.cpp
diff --git a/content/media/encoder/OpusTrackEncoder.h b/dom/media/encoder/OpusTrackEncoder.h
similarity index 100%
rename from content/media/encoder/OpusTrackEncoder.h
rename to dom/media/encoder/OpusTrackEncoder.h
diff --git a/content/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp
similarity index 100%
rename from content/media/encoder/TrackEncoder.cpp
rename to dom/media/encoder/TrackEncoder.cpp
diff --git a/content/media/encoder/TrackEncoder.h b/dom/media/encoder/TrackEncoder.h
similarity index 100%
rename from content/media/encoder/TrackEncoder.h
rename to dom/media/encoder/TrackEncoder.h
diff --git a/content/media/encoder/TrackMetadataBase.h b/dom/media/encoder/TrackMetadataBase.h
similarity index 100%
rename from content/media/encoder/TrackMetadataBase.h
rename to dom/media/encoder/TrackMetadataBase.h
diff --git a/content/media/encoder/VP8TrackEncoder.cpp b/dom/media/encoder/VP8TrackEncoder.cpp
similarity index 100%
rename from content/media/encoder/VP8TrackEncoder.cpp
rename to dom/media/encoder/VP8TrackEncoder.cpp
diff --git a/content/media/encoder/VP8TrackEncoder.h b/dom/media/encoder/VP8TrackEncoder.h
similarity index 100%
rename from content/media/encoder/VP8TrackEncoder.h
rename to dom/media/encoder/VP8TrackEncoder.h
diff --git a/content/media/encoder/VorbisTrackEncoder.cpp b/dom/media/encoder/VorbisTrackEncoder.cpp
similarity index 100%
rename from content/media/encoder/VorbisTrackEncoder.cpp
rename to dom/media/encoder/VorbisTrackEncoder.cpp
diff --git a/content/media/encoder/VorbisTrackEncoder.h b/dom/media/encoder/VorbisTrackEncoder.h
similarity index 100%
rename from content/media/encoder/VorbisTrackEncoder.h
rename to dom/media/encoder/VorbisTrackEncoder.h
diff --git a/content/media/encoder/fmp4_muxer/AMRBox.cpp b/dom/media/encoder/fmp4_muxer/AMRBox.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/AMRBox.cpp
rename to dom/media/encoder/fmp4_muxer/AMRBox.cpp
diff --git a/content/media/encoder/fmp4_muxer/AMRBox.h b/dom/media/encoder/fmp4_muxer/AMRBox.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/AMRBox.h
rename to dom/media/encoder/fmp4_muxer/AMRBox.h
diff --git a/content/media/encoder/fmp4_muxer/AVCBox.cpp b/dom/media/encoder/fmp4_muxer/AVCBox.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/AVCBox.cpp
rename to dom/media/encoder/fmp4_muxer/AVCBox.cpp
diff --git a/content/media/encoder/fmp4_muxer/AVCBox.h b/dom/media/encoder/fmp4_muxer/AVCBox.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/AVCBox.h
rename to dom/media/encoder/fmp4_muxer/AVCBox.h
diff --git a/content/media/encoder/fmp4_muxer/ISOControl.cpp b/dom/media/encoder/fmp4_muxer/ISOControl.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOControl.cpp
rename to dom/media/encoder/fmp4_muxer/ISOControl.cpp
diff --git a/content/media/encoder/fmp4_muxer/ISOControl.h b/dom/media/encoder/fmp4_muxer/ISOControl.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOControl.h
rename to dom/media/encoder/fmp4_muxer/ISOControl.h
diff --git a/content/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp b/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp
rename to dom/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp
diff --git a/content/media/encoder/fmp4_muxer/ISOMediaBoxes.h b/dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOMediaBoxes.h
rename to dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h
diff --git a/content/media/encoder/fmp4_muxer/ISOMediaWriter.cpp b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
rename to dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
diff --git a/content/media/encoder/fmp4_muxer/ISOMediaWriter.h b/dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOMediaWriter.h
rename to dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
diff --git a/content/media/encoder/fmp4_muxer/ISOTrackMetadata.h b/dom/media/encoder/fmp4_muxer/ISOTrackMetadata.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/ISOTrackMetadata.h
rename to dom/media/encoder/fmp4_muxer/ISOTrackMetadata.h
diff --git a/content/media/encoder/fmp4_muxer/MP4ESDS.cpp b/dom/media/encoder/fmp4_muxer/MP4ESDS.cpp
similarity index 100%
rename from content/media/encoder/fmp4_muxer/MP4ESDS.cpp
rename to dom/media/encoder/fmp4_muxer/MP4ESDS.cpp
diff --git a/content/media/encoder/fmp4_muxer/MP4ESDS.h b/dom/media/encoder/fmp4_muxer/MP4ESDS.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/MP4ESDS.h
rename to dom/media/encoder/fmp4_muxer/MP4ESDS.h
diff --git a/content/media/encoder/fmp4_muxer/MuxerOperation.h b/dom/media/encoder/fmp4_muxer/MuxerOperation.h
similarity index 100%
rename from content/media/encoder/fmp4_muxer/MuxerOperation.h
rename to dom/media/encoder/fmp4_muxer/MuxerOperation.h
diff --git a/content/media/encoder/fmp4_muxer/moz.build b/dom/media/encoder/fmp4_muxer/moz.build
similarity index 100%
rename from content/media/encoder/fmp4_muxer/moz.build
rename to dom/media/encoder/fmp4_muxer/moz.build
diff --git a/content/media/encoder/moz.build b/dom/media/encoder/moz.build
similarity index 100%
rename from content/media/encoder/moz.build
rename to dom/media/encoder/moz.build
diff --git a/content/media/fmp4/BlankDecoderModule.cpp b/dom/media/fmp4/BlankDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/BlankDecoderModule.cpp
rename to dom/media/fmp4/BlankDecoderModule.cpp
diff --git a/content/media/fmp4/MP4Decoder.cpp b/dom/media/fmp4/MP4Decoder.cpp
similarity index 100%
rename from content/media/fmp4/MP4Decoder.cpp
rename to dom/media/fmp4/MP4Decoder.cpp
diff --git a/content/media/fmp4/MP4Decoder.h b/dom/media/fmp4/MP4Decoder.h
similarity index 100%
rename from content/media/fmp4/MP4Decoder.h
rename to dom/media/fmp4/MP4Decoder.h
diff --git a/content/media/fmp4/MP4Reader.cpp b/dom/media/fmp4/MP4Reader.cpp
similarity index 100%
rename from content/media/fmp4/MP4Reader.cpp
rename to dom/media/fmp4/MP4Reader.cpp
diff --git a/content/media/fmp4/MP4Reader.h b/dom/media/fmp4/MP4Reader.h
similarity index 100%
rename from content/media/fmp4/MP4Reader.h
rename to dom/media/fmp4/MP4Reader.h
diff --git a/content/media/fmp4/PlatformDecoderModule.cpp b/dom/media/fmp4/PlatformDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/PlatformDecoderModule.cpp
rename to dom/media/fmp4/PlatformDecoderModule.cpp
diff --git a/content/media/fmp4/PlatformDecoderModule.h b/dom/media/fmp4/PlatformDecoderModule.h
similarity index 100%
rename from content/media/fmp4/PlatformDecoderModule.h
rename to dom/media/fmp4/PlatformDecoderModule.h
diff --git a/content/media/fmp4/android/AndroidDecoderModule.cpp b/dom/media/fmp4/android/AndroidDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/android/AndroidDecoderModule.cpp
rename to dom/media/fmp4/android/AndroidDecoderModule.cpp
diff --git a/content/media/fmp4/android/AndroidDecoderModule.h b/dom/media/fmp4/android/AndroidDecoderModule.h
similarity index 100%
rename from content/media/fmp4/android/AndroidDecoderModule.h
rename to dom/media/fmp4/android/AndroidDecoderModule.h
diff --git a/content/media/fmp4/apple/AppleATDecoder.cpp b/dom/media/fmp4/apple/AppleATDecoder.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleATDecoder.cpp
rename to dom/media/fmp4/apple/AppleATDecoder.cpp
diff --git a/content/media/fmp4/apple/AppleATDecoder.h b/dom/media/fmp4/apple/AppleATDecoder.h
similarity index 100%
rename from content/media/fmp4/apple/AppleATDecoder.h
rename to dom/media/fmp4/apple/AppleATDecoder.h
diff --git a/content/media/fmp4/apple/AppleCMFunctions.h b/dom/media/fmp4/apple/AppleCMFunctions.h
similarity index 100%
rename from content/media/fmp4/apple/AppleCMFunctions.h
rename to dom/media/fmp4/apple/AppleCMFunctions.h
diff --git a/content/media/fmp4/apple/AppleCMLinker.cpp b/dom/media/fmp4/apple/AppleCMLinker.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleCMLinker.cpp
rename to dom/media/fmp4/apple/AppleCMLinker.cpp
diff --git a/content/media/fmp4/apple/AppleCMLinker.h b/dom/media/fmp4/apple/AppleCMLinker.h
similarity index 100%
rename from content/media/fmp4/apple/AppleCMLinker.h
rename to dom/media/fmp4/apple/AppleCMLinker.h
diff --git a/content/media/fmp4/apple/AppleDecoderModule.cpp b/dom/media/fmp4/apple/AppleDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleDecoderModule.cpp
rename to dom/media/fmp4/apple/AppleDecoderModule.cpp
diff --git a/content/media/fmp4/apple/AppleDecoderModule.h b/dom/media/fmp4/apple/AppleDecoderModule.h
similarity index 100%
rename from content/media/fmp4/apple/AppleDecoderModule.h
rename to dom/media/fmp4/apple/AppleDecoderModule.h
diff --git a/content/media/fmp4/apple/AppleUtils.cpp b/dom/media/fmp4/apple/AppleUtils.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleUtils.cpp
rename to dom/media/fmp4/apple/AppleUtils.cpp
diff --git a/content/media/fmp4/apple/AppleUtils.h b/dom/media/fmp4/apple/AppleUtils.h
similarity index 100%
rename from content/media/fmp4/apple/AppleUtils.h
rename to dom/media/fmp4/apple/AppleUtils.h
diff --git a/content/media/fmp4/apple/AppleVDADecoder.cpp b/dom/media/fmp4/apple/AppleVDADecoder.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleVDADecoder.cpp
rename to dom/media/fmp4/apple/AppleVDADecoder.cpp
diff --git a/content/media/fmp4/apple/AppleVDADecoder.h b/dom/media/fmp4/apple/AppleVDADecoder.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVDADecoder.h
rename to dom/media/fmp4/apple/AppleVDADecoder.h
diff --git a/content/media/fmp4/apple/AppleVDAFunctions.h b/dom/media/fmp4/apple/AppleVDAFunctions.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVDAFunctions.h
rename to dom/media/fmp4/apple/AppleVDAFunctions.h
diff --git a/content/media/fmp4/apple/AppleVDALinker.cpp b/dom/media/fmp4/apple/AppleVDALinker.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleVDALinker.cpp
rename to dom/media/fmp4/apple/AppleVDALinker.cpp
diff --git a/content/media/fmp4/apple/AppleVDALinker.h b/dom/media/fmp4/apple/AppleVDALinker.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVDALinker.h
rename to dom/media/fmp4/apple/AppleVDALinker.h
diff --git a/content/media/fmp4/apple/AppleVTDecoder.cpp b/dom/media/fmp4/apple/AppleVTDecoder.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleVTDecoder.cpp
rename to dom/media/fmp4/apple/AppleVTDecoder.cpp
diff --git a/content/media/fmp4/apple/AppleVTDecoder.h b/dom/media/fmp4/apple/AppleVTDecoder.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVTDecoder.h
rename to dom/media/fmp4/apple/AppleVTDecoder.h
diff --git a/content/media/fmp4/apple/AppleVTFunctions.h b/dom/media/fmp4/apple/AppleVTFunctions.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVTFunctions.h
rename to dom/media/fmp4/apple/AppleVTFunctions.h
diff --git a/content/media/fmp4/apple/AppleVTLinker.cpp b/dom/media/fmp4/apple/AppleVTLinker.cpp
similarity index 100%
rename from content/media/fmp4/apple/AppleVTLinker.cpp
rename to dom/media/fmp4/apple/AppleVTLinker.cpp
diff --git a/content/media/fmp4/apple/AppleVTLinker.h b/dom/media/fmp4/apple/AppleVTLinker.h
similarity index 100%
rename from content/media/fmp4/apple/AppleVTLinker.h
rename to dom/media/fmp4/apple/AppleVTLinker.h
diff --git a/content/media/fmp4/apple/ReorderQueue.h b/dom/media/fmp4/apple/ReorderQueue.h
similarity index 100%
rename from content/media/fmp4/apple/ReorderQueue.h
rename to dom/media/fmp4/apple/ReorderQueue.h
diff --git a/content/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h b/dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h
similarity index 100%
rename from content/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h
rename to dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h
diff --git a/content/media/fmp4/apple/VideoToolbox/VideoToolbox.h b/dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h
similarity index 100%
rename from content/media/fmp4/apple/VideoToolbox/VideoToolbox.h
rename to dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h
diff --git a/content/media/fmp4/eme/EMEAudioDecoder.cpp b/dom/media/fmp4/eme/EMEAudioDecoder.cpp
similarity index 100%
rename from content/media/fmp4/eme/EMEAudioDecoder.cpp
rename to dom/media/fmp4/eme/EMEAudioDecoder.cpp
diff --git a/content/media/fmp4/eme/EMEAudioDecoder.h b/dom/media/fmp4/eme/EMEAudioDecoder.h
similarity index 100%
rename from content/media/fmp4/eme/EMEAudioDecoder.h
rename to dom/media/fmp4/eme/EMEAudioDecoder.h
diff --git a/content/media/fmp4/eme/EMEDecoderModule.cpp b/dom/media/fmp4/eme/EMEDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/eme/EMEDecoderModule.cpp
rename to dom/media/fmp4/eme/EMEDecoderModule.cpp
diff --git a/content/media/fmp4/eme/EMEDecoderModule.h b/dom/media/fmp4/eme/EMEDecoderModule.h
similarity index 100%
rename from content/media/fmp4/eme/EMEDecoderModule.h
rename to dom/media/fmp4/eme/EMEDecoderModule.h
diff --git a/content/media/fmp4/eme/EMEH264Decoder.cpp b/dom/media/fmp4/eme/EMEH264Decoder.cpp
similarity index 100%
rename from content/media/fmp4/eme/EMEH264Decoder.cpp
rename to dom/media/fmp4/eme/EMEH264Decoder.cpp
diff --git a/content/media/fmp4/eme/EMEH264Decoder.h b/dom/media/fmp4/eme/EMEH264Decoder.h
similarity index 100%
rename from content/media/fmp4/eme/EMEH264Decoder.h
rename to dom/media/fmp4/eme/EMEH264Decoder.h
diff --git a/content/media/fmp4/eme/moz.build b/dom/media/fmp4/eme/moz.build
similarity index 100%
rename from content/media/fmp4/eme/moz.build
rename to dom/media/fmp4/eme/moz.build
diff --git a/content/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp b/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegAudioDecoder.h b/dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
rename to dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp b/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegDataDecoder.h b/dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegDataDecoder.h
rename to dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp b/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegDecoderModule.h b/dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegDecoderModule.h
rename to dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegFunctionList.h b/dom/media/fmp4/ffmpeg/FFmpegFunctionList.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegFunctionList.h
rename to dom/media/fmp4/ffmpeg/FFmpegFunctionList.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp b/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegH264Decoder.h b/dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegH264Decoder.h
rename to dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegLibs.h b/dom/media/fmp4/ffmpeg/FFmpegLibs.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegLibs.h
rename to dom/media/fmp4/ffmpeg/FFmpegLibs.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegLog.cpp b/dom/media/fmp4/ffmpeg/FFmpegLog.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegLog.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegLog.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegLog.h b/dom/media/fmp4/ffmpeg/FFmpegLog.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegLog.h
rename to dom/media/fmp4/ffmpeg/FFmpegLog.h
diff --git a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
rename to dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
diff --git a/content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h b/dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
rename to dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
diff --git a/content/media/fmp4/ffmpeg/README_mozilla b/dom/media/fmp4/ffmpeg/README_mozilla
similarity index 100%
rename from content/media/fmp4/ffmpeg/README_mozilla
rename to dom/media/fmp4/ffmpeg/README_mozilla
diff --git a/content/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1 b/dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1
rename to dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h b/dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h b/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h b/dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavformat/version.h b/dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavformat/version.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/common.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/common.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/error.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/error.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/file.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/file.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/log.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/log.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/time.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/time.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/version.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/version.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h
diff --git a/content/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h b/dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h
rename to dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h
diff --git a/content/media/fmp4/ffmpeg/libav53/moz.build b/dom/media/fmp4/ffmpeg/libav53/moz.build
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav53/moz.build
rename to dom/media/fmp4/ffmpeg/libav53/moz.build
diff --git a/content/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1 b/dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1
rename to dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h b/dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h b/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h b/dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavformat/version.h b/dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavformat/version.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/common.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/common.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/error.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/error.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/file.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/file.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/log.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/log.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/time.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/time.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/version.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/version.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h
diff --git a/content/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h b/dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h
rename to dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h
diff --git a/content/media/fmp4/ffmpeg/libav54/moz.build b/dom/media/fmp4/ffmpeg/libav54/moz.build
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav54/moz.build
rename to dom/media/fmp4/ffmpeg/libav54/moz.build
diff --git a/content/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1 b/dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1
rename to dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h b/dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h b/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h b/dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavformat/version.h b/dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavformat/version.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/common.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/common.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/error.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/error.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/file.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/file.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/log.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/log.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/time.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/time.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/version.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/version.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h
diff --git a/content/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h b/dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h
rename to dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h
diff --git a/content/media/fmp4/ffmpeg/libav55/moz.build b/dom/media/fmp4/ffmpeg/libav55/moz.build
similarity index 100%
rename from content/media/fmp4/ffmpeg/libav55/moz.build
rename to dom/media/fmp4/ffmpeg/libav55/moz.build
diff --git a/content/media/fmp4/gonk/GonkAudioDecoderManager.cpp b/dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
similarity index 100%
rename from content/media/fmp4/gonk/GonkAudioDecoderManager.cpp
rename to dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
diff --git a/content/media/fmp4/gonk/GonkAudioDecoderManager.h b/dom/media/fmp4/gonk/GonkAudioDecoderManager.h
similarity index 100%
rename from content/media/fmp4/gonk/GonkAudioDecoderManager.h
rename to dom/media/fmp4/gonk/GonkAudioDecoderManager.h
diff --git a/content/media/fmp4/gonk/GonkDecoderModule.cpp b/dom/media/fmp4/gonk/GonkDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/gonk/GonkDecoderModule.cpp
rename to dom/media/fmp4/gonk/GonkDecoderModule.cpp
diff --git a/content/media/fmp4/gonk/GonkDecoderModule.h b/dom/media/fmp4/gonk/GonkDecoderModule.h
similarity index 100%
rename from content/media/fmp4/gonk/GonkDecoderModule.h
rename to dom/media/fmp4/gonk/GonkDecoderModule.h
diff --git a/content/media/fmp4/gonk/GonkMediaDataDecoder.cpp b/dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
similarity index 100%
rename from content/media/fmp4/gonk/GonkMediaDataDecoder.cpp
rename to dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
diff --git a/content/media/fmp4/gonk/GonkMediaDataDecoder.h b/dom/media/fmp4/gonk/GonkMediaDataDecoder.h
similarity index 100%
rename from content/media/fmp4/gonk/GonkMediaDataDecoder.h
rename to dom/media/fmp4/gonk/GonkMediaDataDecoder.h
diff --git a/content/media/fmp4/gonk/GonkVideoDecoderManager.cpp b/dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp
similarity index 100%
rename from content/media/fmp4/gonk/GonkVideoDecoderManager.cpp
rename to dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp
diff --git a/content/media/fmp4/gonk/GonkVideoDecoderManager.h b/dom/media/fmp4/gonk/GonkVideoDecoderManager.h
similarity index 100%
rename from content/media/fmp4/gonk/GonkVideoDecoderManager.h
rename to dom/media/fmp4/gonk/GonkVideoDecoderManager.h
diff --git a/content/media/fmp4/gonk/moz.build b/dom/media/fmp4/gonk/moz.build
similarity index 91%
rename from content/media/fmp4/gonk/moz.build
rename to dom/media/fmp4/gonk/moz.build
index c936fbadc54..c8786e50cbc 100644
--- a/content/media/fmp4/gonk/moz.build
+++ b/dom/media/fmp4/gonk/moz.build
@@ -17,8 +17,8 @@ UNIFIED_SOURCES += [
     'GonkVideoDecoderManager.cpp',
 ]
 LOCAL_INCLUDES += [
-    '/content/media/omx/',
-    '/content/media/omx/mediaresourcemanager',
+    '/dom/media/omx/',
+    '/dom/media/omx/mediaresourcemanager',
 ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
diff --git a/content/media/fmp4/moz.build b/dom/media/fmp4/moz.build
similarity index 100%
rename from content/media/fmp4/moz.build
rename to dom/media/fmp4/moz.build
diff --git a/content/media/fmp4/wmf/MFTDecoder.cpp b/dom/media/fmp4/wmf/MFTDecoder.cpp
similarity index 100%
rename from content/media/fmp4/wmf/MFTDecoder.cpp
rename to dom/media/fmp4/wmf/MFTDecoder.cpp
diff --git a/content/media/fmp4/wmf/MFTDecoder.h b/dom/media/fmp4/wmf/MFTDecoder.h
similarity index 100%
rename from content/media/fmp4/wmf/MFTDecoder.h
rename to dom/media/fmp4/wmf/MFTDecoder.h
diff --git a/content/media/fmp4/wmf/WMFAudioMFTManager.cpp b/dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
similarity index 100%
rename from content/media/fmp4/wmf/WMFAudioMFTManager.cpp
rename to dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
diff --git a/content/media/fmp4/wmf/WMFAudioMFTManager.h b/dom/media/fmp4/wmf/WMFAudioMFTManager.h
similarity index 100%
rename from content/media/fmp4/wmf/WMFAudioMFTManager.h
rename to dom/media/fmp4/wmf/WMFAudioMFTManager.h
diff --git a/content/media/fmp4/wmf/WMFDecoderModule.cpp b/dom/media/fmp4/wmf/WMFDecoderModule.cpp
similarity index 100%
rename from content/media/fmp4/wmf/WMFDecoderModule.cpp
rename to dom/media/fmp4/wmf/WMFDecoderModule.cpp
diff --git a/content/media/fmp4/wmf/WMFDecoderModule.h b/dom/media/fmp4/wmf/WMFDecoderModule.h
similarity index 100%
rename from content/media/fmp4/wmf/WMFDecoderModule.h
rename to dom/media/fmp4/wmf/WMFDecoderModule.h
diff --git a/content/media/fmp4/wmf/WMFMediaDataDecoder.cpp b/dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
similarity index 100%
rename from content/media/fmp4/wmf/WMFMediaDataDecoder.cpp
rename to dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
diff --git a/content/media/fmp4/wmf/WMFMediaDataDecoder.h b/dom/media/fmp4/wmf/WMFMediaDataDecoder.h
similarity index 100%
rename from content/media/fmp4/wmf/WMFMediaDataDecoder.h
rename to dom/media/fmp4/wmf/WMFMediaDataDecoder.h
diff --git a/content/media/fmp4/wmf/WMFVideoMFTManager.cpp b/dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
similarity index 100%
rename from content/media/fmp4/wmf/WMFVideoMFTManager.cpp
rename to dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
diff --git a/content/media/fmp4/wmf/WMFVideoMFTManager.h b/dom/media/fmp4/wmf/WMFVideoMFTManager.h
similarity index 100%
rename from content/media/fmp4/wmf/WMFVideoMFTManager.h
rename to dom/media/fmp4/wmf/WMFVideoMFTManager.h
diff --git a/content/media/fmp4/wmf/moz.build b/dom/media/fmp4/wmf/moz.build
similarity index 100%
rename from content/media/fmp4/wmf/moz.build
rename to dom/media/fmp4/wmf/moz.build
diff --git a/content/media/gmp/GMPAudioDecoderChild.cpp b/dom/media/gmp/GMPAudioDecoderChild.cpp
similarity index 100%
rename from content/media/gmp/GMPAudioDecoderChild.cpp
rename to dom/media/gmp/GMPAudioDecoderChild.cpp
diff --git a/content/media/gmp/GMPAudioDecoderChild.h b/dom/media/gmp/GMPAudioDecoderChild.h
similarity index 100%
rename from content/media/gmp/GMPAudioDecoderChild.h
rename to dom/media/gmp/GMPAudioDecoderChild.h
diff --git a/content/media/gmp/GMPAudioDecoderParent.cpp b/dom/media/gmp/GMPAudioDecoderParent.cpp
similarity index 100%
rename from content/media/gmp/GMPAudioDecoderParent.cpp
rename to dom/media/gmp/GMPAudioDecoderParent.cpp
diff --git a/content/media/gmp/GMPAudioDecoderParent.h b/dom/media/gmp/GMPAudioDecoderParent.h
similarity index 100%
rename from content/media/gmp/GMPAudioDecoderParent.h
rename to dom/media/gmp/GMPAudioDecoderParent.h
diff --git a/content/media/gmp/GMPAudioDecoderProxy.h b/dom/media/gmp/GMPAudioDecoderProxy.h
similarity index 100%
rename from content/media/gmp/GMPAudioDecoderProxy.h
rename to dom/media/gmp/GMPAudioDecoderProxy.h
diff --git a/content/media/gmp/GMPAudioHost.cpp b/dom/media/gmp/GMPAudioHost.cpp
similarity index 100%
rename from content/media/gmp/GMPAudioHost.cpp
rename to dom/media/gmp/GMPAudioHost.cpp
diff --git a/content/media/gmp/GMPAudioHost.h b/dom/media/gmp/GMPAudioHost.h
similarity index 100%
rename from content/media/gmp/GMPAudioHost.h
rename to dom/media/gmp/GMPAudioHost.h
diff --git a/content/media/gmp/GMPCallbackBase.h b/dom/media/gmp/GMPCallbackBase.h
similarity index 100%
rename from content/media/gmp/GMPCallbackBase.h
rename to dom/media/gmp/GMPCallbackBase.h
diff --git a/content/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
similarity index 100%
rename from content/media/gmp/GMPChild.cpp
rename to dom/media/gmp/GMPChild.cpp
diff --git a/content/media/gmp/GMPChild.h b/dom/media/gmp/GMPChild.h
similarity index 100%
rename from content/media/gmp/GMPChild.h
rename to dom/media/gmp/GMPChild.h
diff --git a/content/media/gmp/GMPDecryptorChild.cpp b/dom/media/gmp/GMPDecryptorChild.cpp
similarity index 100%
rename from content/media/gmp/GMPDecryptorChild.cpp
rename to dom/media/gmp/GMPDecryptorChild.cpp
diff --git a/content/media/gmp/GMPDecryptorChild.h b/dom/media/gmp/GMPDecryptorChild.h
similarity index 100%
rename from content/media/gmp/GMPDecryptorChild.h
rename to dom/media/gmp/GMPDecryptorChild.h
diff --git a/content/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp
similarity index 100%
rename from content/media/gmp/GMPDecryptorParent.cpp
rename to dom/media/gmp/GMPDecryptorParent.cpp
diff --git a/content/media/gmp/GMPDecryptorParent.h b/dom/media/gmp/GMPDecryptorParent.h
similarity index 100%
rename from content/media/gmp/GMPDecryptorParent.h
rename to dom/media/gmp/GMPDecryptorParent.h
diff --git a/content/media/gmp/GMPDecryptorProxy.h b/dom/media/gmp/GMPDecryptorProxy.h
similarity index 100%
rename from content/media/gmp/GMPDecryptorProxy.h
rename to dom/media/gmp/GMPDecryptorProxy.h
diff --git a/content/media/gmp/GMPEncryptedBufferDataImpl.cpp b/dom/media/gmp/GMPEncryptedBufferDataImpl.cpp
similarity index 100%
rename from content/media/gmp/GMPEncryptedBufferDataImpl.cpp
rename to dom/media/gmp/GMPEncryptedBufferDataImpl.cpp
diff --git a/content/media/gmp/GMPEncryptedBufferDataImpl.h b/dom/media/gmp/GMPEncryptedBufferDataImpl.h
similarity index 100%
rename from content/media/gmp/GMPEncryptedBufferDataImpl.h
rename to dom/media/gmp/GMPEncryptedBufferDataImpl.h
diff --git a/content/media/gmp/GMPMessageUtils.h b/dom/media/gmp/GMPMessageUtils.h
similarity index 100%
rename from content/media/gmp/GMPMessageUtils.h
rename to dom/media/gmp/GMPMessageUtils.h
diff --git a/content/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
similarity index 100%
rename from content/media/gmp/GMPParent.cpp
rename to dom/media/gmp/GMPParent.cpp
diff --git a/content/media/gmp/GMPParent.h b/dom/media/gmp/GMPParent.h
similarity index 100%
rename from content/media/gmp/GMPParent.h
rename to dom/media/gmp/GMPParent.h
diff --git a/content/media/gmp/GMPPlatform.cpp b/dom/media/gmp/GMPPlatform.cpp
similarity index 100%
rename from content/media/gmp/GMPPlatform.cpp
rename to dom/media/gmp/GMPPlatform.cpp
diff --git a/content/media/gmp/GMPPlatform.h b/dom/media/gmp/GMPPlatform.h
similarity index 100%
rename from content/media/gmp/GMPPlatform.h
rename to dom/media/gmp/GMPPlatform.h
diff --git a/content/media/gmp/GMPProcessChild.cpp b/dom/media/gmp/GMPProcessChild.cpp
similarity index 100%
rename from content/media/gmp/GMPProcessChild.cpp
rename to dom/media/gmp/GMPProcessChild.cpp
diff --git a/content/media/gmp/GMPProcessChild.h b/dom/media/gmp/GMPProcessChild.h
similarity index 100%
rename from content/media/gmp/GMPProcessChild.h
rename to dom/media/gmp/GMPProcessChild.h
diff --git a/content/media/gmp/GMPProcessParent.cpp b/dom/media/gmp/GMPProcessParent.cpp
similarity index 100%
rename from content/media/gmp/GMPProcessParent.cpp
rename to dom/media/gmp/GMPProcessParent.cpp
diff --git a/content/media/gmp/GMPProcessParent.h b/dom/media/gmp/GMPProcessParent.h
similarity index 100%
rename from content/media/gmp/GMPProcessParent.h
rename to dom/media/gmp/GMPProcessParent.h
diff --git a/content/media/gmp/GMPService.cpp b/dom/media/gmp/GMPService.cpp
similarity index 100%
rename from content/media/gmp/GMPService.cpp
rename to dom/media/gmp/GMPService.cpp
diff --git a/content/media/gmp/GMPService.h b/dom/media/gmp/GMPService.h
similarity index 100%
rename from content/media/gmp/GMPService.h
rename to dom/media/gmp/GMPService.h
diff --git a/content/media/gmp/GMPSharedMemManager.cpp b/dom/media/gmp/GMPSharedMemManager.cpp
similarity index 100%
rename from content/media/gmp/GMPSharedMemManager.cpp
rename to dom/media/gmp/GMPSharedMemManager.cpp
diff --git a/content/media/gmp/GMPSharedMemManager.h b/dom/media/gmp/GMPSharedMemManager.h
similarity index 100%
rename from content/media/gmp/GMPSharedMemManager.h
rename to dom/media/gmp/GMPSharedMemManager.h
diff --git a/content/media/gmp/GMPStorageChild.cpp b/dom/media/gmp/GMPStorageChild.cpp
similarity index 100%
rename from content/media/gmp/GMPStorageChild.cpp
rename to dom/media/gmp/GMPStorageChild.cpp
diff --git a/content/media/gmp/GMPStorageChild.h b/dom/media/gmp/GMPStorageChild.h
similarity index 100%
rename from content/media/gmp/GMPStorageChild.h
rename to dom/media/gmp/GMPStorageChild.h
diff --git a/content/media/gmp/GMPStorageParent.cpp b/dom/media/gmp/GMPStorageParent.cpp
similarity index 100%
rename from content/media/gmp/GMPStorageParent.cpp
rename to dom/media/gmp/GMPStorageParent.cpp
diff --git a/content/media/gmp/GMPStorageParent.h b/dom/media/gmp/GMPStorageParent.h
similarity index 100%
rename from content/media/gmp/GMPStorageParent.h
rename to dom/media/gmp/GMPStorageParent.h
diff --git a/content/media/gmp/GMPTimerChild.cpp b/dom/media/gmp/GMPTimerChild.cpp
similarity index 100%
rename from content/media/gmp/GMPTimerChild.cpp
rename to dom/media/gmp/GMPTimerChild.cpp
diff --git a/content/media/gmp/GMPTimerChild.h b/dom/media/gmp/GMPTimerChild.h
similarity index 100%
rename from content/media/gmp/GMPTimerChild.h
rename to dom/media/gmp/GMPTimerChild.h
diff --git a/content/media/gmp/GMPTimerParent.cpp b/dom/media/gmp/GMPTimerParent.cpp
similarity index 100%
rename from content/media/gmp/GMPTimerParent.cpp
rename to dom/media/gmp/GMPTimerParent.cpp
diff --git a/content/media/gmp/GMPTimerParent.h b/dom/media/gmp/GMPTimerParent.h
similarity index 100%
rename from content/media/gmp/GMPTimerParent.h
rename to dom/media/gmp/GMPTimerParent.h
diff --git a/content/media/gmp/GMPTypes.ipdlh b/dom/media/gmp/GMPTypes.ipdlh
similarity index 100%
rename from content/media/gmp/GMPTypes.ipdlh
rename to dom/media/gmp/GMPTypes.ipdlh
diff --git a/content/media/gmp/GMPVideoDecoderChild.cpp b/dom/media/gmp/GMPVideoDecoderChild.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoDecoderChild.cpp
rename to dom/media/gmp/GMPVideoDecoderChild.cpp
diff --git a/content/media/gmp/GMPVideoDecoderChild.h b/dom/media/gmp/GMPVideoDecoderChild.h
similarity index 100%
rename from content/media/gmp/GMPVideoDecoderChild.h
rename to dom/media/gmp/GMPVideoDecoderChild.h
diff --git a/content/media/gmp/GMPVideoDecoderParent.cpp b/dom/media/gmp/GMPVideoDecoderParent.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoDecoderParent.cpp
rename to dom/media/gmp/GMPVideoDecoderParent.cpp
diff --git a/content/media/gmp/GMPVideoDecoderParent.h b/dom/media/gmp/GMPVideoDecoderParent.h
similarity index 100%
rename from content/media/gmp/GMPVideoDecoderParent.h
rename to dom/media/gmp/GMPVideoDecoderParent.h
diff --git a/content/media/gmp/GMPVideoDecoderProxy.h b/dom/media/gmp/GMPVideoDecoderProxy.h
similarity index 100%
rename from content/media/gmp/GMPVideoDecoderProxy.h
rename to dom/media/gmp/GMPVideoDecoderProxy.h
diff --git a/content/media/gmp/GMPVideoEncodedFrameImpl.cpp b/dom/media/gmp/GMPVideoEncodedFrameImpl.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoEncodedFrameImpl.cpp
rename to dom/media/gmp/GMPVideoEncodedFrameImpl.cpp
diff --git a/content/media/gmp/GMPVideoEncodedFrameImpl.h b/dom/media/gmp/GMPVideoEncodedFrameImpl.h
similarity index 100%
rename from content/media/gmp/GMPVideoEncodedFrameImpl.h
rename to dom/media/gmp/GMPVideoEncodedFrameImpl.h
diff --git a/content/media/gmp/GMPVideoEncoderChild.cpp b/dom/media/gmp/GMPVideoEncoderChild.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoEncoderChild.cpp
rename to dom/media/gmp/GMPVideoEncoderChild.cpp
diff --git a/content/media/gmp/GMPVideoEncoderChild.h b/dom/media/gmp/GMPVideoEncoderChild.h
similarity index 100%
rename from content/media/gmp/GMPVideoEncoderChild.h
rename to dom/media/gmp/GMPVideoEncoderChild.h
diff --git a/content/media/gmp/GMPVideoEncoderParent.cpp b/dom/media/gmp/GMPVideoEncoderParent.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoEncoderParent.cpp
rename to dom/media/gmp/GMPVideoEncoderParent.cpp
diff --git a/content/media/gmp/GMPVideoEncoderParent.h b/dom/media/gmp/GMPVideoEncoderParent.h
similarity index 100%
rename from content/media/gmp/GMPVideoEncoderParent.h
rename to dom/media/gmp/GMPVideoEncoderParent.h
diff --git a/content/media/gmp/GMPVideoEncoderProxy.h b/dom/media/gmp/GMPVideoEncoderProxy.h
similarity index 100%
rename from content/media/gmp/GMPVideoEncoderProxy.h
rename to dom/media/gmp/GMPVideoEncoderProxy.h
diff --git a/content/media/gmp/GMPVideoHost.cpp b/dom/media/gmp/GMPVideoHost.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoHost.cpp
rename to dom/media/gmp/GMPVideoHost.cpp
diff --git a/content/media/gmp/GMPVideoHost.h b/dom/media/gmp/GMPVideoHost.h
similarity index 100%
rename from content/media/gmp/GMPVideoHost.h
rename to dom/media/gmp/GMPVideoHost.h
diff --git a/content/media/gmp/GMPVideoPlaneImpl.cpp b/dom/media/gmp/GMPVideoPlaneImpl.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoPlaneImpl.cpp
rename to dom/media/gmp/GMPVideoPlaneImpl.cpp
diff --git a/content/media/gmp/GMPVideoPlaneImpl.h b/dom/media/gmp/GMPVideoPlaneImpl.h
similarity index 100%
rename from content/media/gmp/GMPVideoPlaneImpl.h
rename to dom/media/gmp/GMPVideoPlaneImpl.h
diff --git a/content/media/gmp/GMPVideoi420FrameImpl.cpp b/dom/media/gmp/GMPVideoi420FrameImpl.cpp
similarity index 100%
rename from content/media/gmp/GMPVideoi420FrameImpl.cpp
rename to dom/media/gmp/GMPVideoi420FrameImpl.cpp
diff --git a/content/media/gmp/GMPVideoi420FrameImpl.h b/dom/media/gmp/GMPVideoi420FrameImpl.h
similarity index 100%
rename from content/media/gmp/GMPVideoi420FrameImpl.h
rename to dom/media/gmp/GMPVideoi420FrameImpl.h
diff --git a/content/media/gmp/PGMP.ipdl b/dom/media/gmp/PGMP.ipdl
similarity index 100%
rename from content/media/gmp/PGMP.ipdl
rename to dom/media/gmp/PGMP.ipdl
diff --git a/content/media/gmp/PGMPAudioDecoder.ipdl b/dom/media/gmp/PGMPAudioDecoder.ipdl
similarity index 100%
rename from content/media/gmp/PGMPAudioDecoder.ipdl
rename to dom/media/gmp/PGMPAudioDecoder.ipdl
diff --git a/content/media/gmp/PGMPDecryptor.ipdl b/dom/media/gmp/PGMPDecryptor.ipdl
similarity index 100%
rename from content/media/gmp/PGMPDecryptor.ipdl
rename to dom/media/gmp/PGMPDecryptor.ipdl
diff --git a/content/media/gmp/PGMPStorage.ipdl b/dom/media/gmp/PGMPStorage.ipdl
similarity index 100%
rename from content/media/gmp/PGMPStorage.ipdl
rename to dom/media/gmp/PGMPStorage.ipdl
diff --git a/content/media/gmp/PGMPTimer.ipdl b/dom/media/gmp/PGMPTimer.ipdl
similarity index 100%
rename from content/media/gmp/PGMPTimer.ipdl
rename to dom/media/gmp/PGMPTimer.ipdl
diff --git a/content/media/gmp/PGMPVideoDecoder.ipdl b/dom/media/gmp/PGMPVideoDecoder.ipdl
similarity index 100%
rename from content/media/gmp/PGMPVideoDecoder.ipdl
rename to dom/media/gmp/PGMPVideoDecoder.ipdl
diff --git a/content/media/gmp/PGMPVideoEncoder.ipdl b/dom/media/gmp/PGMPVideoEncoder.ipdl
similarity index 100%
rename from content/media/gmp/PGMPVideoEncoder.ipdl
rename to dom/media/gmp/PGMPVideoEncoder.ipdl
diff --git a/content/media/gmp/README.txt b/dom/media/gmp/README.txt
similarity index 100%
rename from content/media/gmp/README.txt
rename to dom/media/gmp/README.txt
diff --git a/content/media/gmp/gmp-api/gmp-async-shutdown.h b/dom/media/gmp/gmp-api/gmp-async-shutdown.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-async-shutdown.h
rename to dom/media/gmp/gmp-api/gmp-async-shutdown.h
diff --git a/content/media/gmp/gmp-api/gmp-audio-codec.h b/dom/media/gmp/gmp-api/gmp-audio-codec.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-audio-codec.h
rename to dom/media/gmp/gmp-api/gmp-audio-codec.h
diff --git a/content/media/gmp/gmp-api/gmp-audio-decode.h b/dom/media/gmp/gmp-api/gmp-audio-decode.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-audio-decode.h
rename to dom/media/gmp/gmp-api/gmp-audio-decode.h
diff --git a/content/media/gmp/gmp-api/gmp-audio-host.h b/dom/media/gmp/gmp-api/gmp-audio-host.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-audio-host.h
rename to dom/media/gmp/gmp-api/gmp-audio-host.h
diff --git a/content/media/gmp/gmp-api/gmp-audio-samples.h b/dom/media/gmp/gmp-api/gmp-audio-samples.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-audio-samples.h
rename to dom/media/gmp/gmp-api/gmp-audio-samples.h
diff --git a/content/media/gmp/gmp-api/gmp-decryption.h b/dom/media/gmp/gmp-api/gmp-decryption.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-decryption.h
rename to dom/media/gmp/gmp-api/gmp-decryption.h
diff --git a/content/media/gmp/gmp-api/gmp-entrypoints.h b/dom/media/gmp/gmp-api/gmp-entrypoints.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-entrypoints.h
rename to dom/media/gmp/gmp-api/gmp-entrypoints.h
diff --git a/content/media/gmp/gmp-api/gmp-errors.h b/dom/media/gmp/gmp-api/gmp-errors.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-errors.h
rename to dom/media/gmp/gmp-api/gmp-errors.h
diff --git a/content/media/gmp/gmp-api/gmp-platform.h b/dom/media/gmp/gmp-api/gmp-platform.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-platform.h
rename to dom/media/gmp/gmp-api/gmp-platform.h
diff --git a/content/media/gmp/gmp-api/gmp-storage.h b/dom/media/gmp/gmp-api/gmp-storage.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-storage.h
rename to dom/media/gmp/gmp-api/gmp-storage.h
diff --git a/content/media/gmp/gmp-api/gmp-video-codec.h b/dom/media/gmp/gmp-api/gmp-video-codec.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-codec.h
rename to dom/media/gmp/gmp-api/gmp-video-codec.h
diff --git a/content/media/gmp/gmp-api/gmp-video-decode.h b/dom/media/gmp/gmp-api/gmp-video-decode.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-decode.h
rename to dom/media/gmp/gmp-api/gmp-video-decode.h
diff --git a/content/media/gmp/gmp-api/gmp-video-encode.h b/dom/media/gmp/gmp-api/gmp-video-encode.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-encode.h
rename to dom/media/gmp/gmp-api/gmp-video-encode.h
diff --git a/content/media/gmp/gmp-api/gmp-video-frame-encoded.h b/dom/media/gmp/gmp-api/gmp-video-frame-encoded.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-frame-encoded.h
rename to dom/media/gmp/gmp-api/gmp-video-frame-encoded.h
diff --git a/content/media/gmp/gmp-api/gmp-video-frame-i420.h b/dom/media/gmp/gmp-api/gmp-video-frame-i420.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-frame-i420.h
rename to dom/media/gmp/gmp-api/gmp-video-frame-i420.h
diff --git a/content/media/gmp/gmp-api/gmp-video-frame.h b/dom/media/gmp/gmp-api/gmp-video-frame.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-frame.h
rename to dom/media/gmp/gmp-api/gmp-video-frame.h
diff --git a/content/media/gmp/gmp-api/gmp-video-host.h b/dom/media/gmp/gmp-api/gmp-video-host.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-host.h
rename to dom/media/gmp/gmp-api/gmp-video-host.h
diff --git a/content/media/gmp/gmp-api/gmp-video-plane.h b/dom/media/gmp/gmp-api/gmp-video-plane.h
similarity index 100%
rename from content/media/gmp/gmp-api/gmp-video-plane.h
rename to dom/media/gmp/gmp-api/gmp-video-plane.h
diff --git a/content/media/gmp/moz.build b/dom/media/gmp/moz.build
similarity index 100%
rename from content/media/gmp/moz.build
rename to dom/media/gmp/moz.build
diff --git a/content/media/gmp/mozIGeckoMediaPluginService.idl b/dom/media/gmp/mozIGeckoMediaPluginService.idl
similarity index 100%
rename from content/media/gmp/mozIGeckoMediaPluginService.idl
rename to dom/media/gmp/mozIGeckoMediaPluginService.idl
diff --git a/content/media/gmp/rlz/COPYING b/dom/media/gmp/rlz/COPYING
similarity index 100%
rename from content/media/gmp/rlz/COPYING
rename to dom/media/gmp/rlz/COPYING
diff --git a/content/media/gmp/rlz/README.mozilla b/dom/media/gmp/rlz/README.mozilla
similarity index 100%
rename from content/media/gmp/rlz/README.mozilla
rename to dom/media/gmp/rlz/README.mozilla
diff --git a/content/media/gmp/rlz/base/memory/scoped_ptr.h b/dom/media/gmp/rlz/base/memory/scoped_ptr.h
similarity index 100%
rename from content/media/gmp/rlz/base/memory/scoped_ptr.h
rename to dom/media/gmp/rlz/base/memory/scoped_ptr.h
diff --git a/content/media/gmp/rlz/base/string16.h b/dom/media/gmp/rlz/base/string16.h
similarity index 100%
rename from content/media/gmp/rlz/base/string16.h
rename to dom/media/gmp/rlz/base/string16.h
diff --git a/content/media/gmp/rlz/lib/assert.h b/dom/media/gmp/rlz/lib/assert.h
similarity index 100%
rename from content/media/gmp/rlz/lib/assert.h
rename to dom/media/gmp/rlz/lib/assert.h
diff --git a/content/media/gmp/rlz/lib/machine_id.h b/dom/media/gmp/rlz/lib/machine_id.h
similarity index 100%
rename from content/media/gmp/rlz/lib/machine_id.h
rename to dom/media/gmp/rlz/lib/machine_id.h
diff --git a/content/media/gmp/rlz/lib/string_utils.cc b/dom/media/gmp/rlz/lib/string_utils.cc
similarity index 100%
rename from content/media/gmp/rlz/lib/string_utils.cc
rename to dom/media/gmp/rlz/lib/string_utils.cc
diff --git a/content/media/gmp/rlz/lib/string_utils.h b/dom/media/gmp/rlz/lib/string_utils.h
similarity index 100%
rename from content/media/gmp/rlz/lib/string_utils.h
rename to dom/media/gmp/rlz/lib/string_utils.h
diff --git a/content/media/gmp/rlz/moz.build b/dom/media/gmp/rlz/moz.build
similarity index 100%
rename from content/media/gmp/rlz/moz.build
rename to dom/media/gmp/rlz/moz.build
diff --git a/content/media/gmp/rlz/win/lib/machine_id_win.cc b/dom/media/gmp/rlz/win/lib/machine_id_win.cc
similarity index 100%
rename from content/media/gmp/rlz/win/lib/machine_id_win.cc
rename to dom/media/gmp/rlz/win/lib/machine_id_win.cc
diff --git a/content/media/gstreamer/GStreamerAllocator.cpp b/dom/media/gstreamer/GStreamerAllocator.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerAllocator.cpp
rename to dom/media/gstreamer/GStreamerAllocator.cpp
diff --git a/content/media/gstreamer/GStreamerAllocator.h b/dom/media/gstreamer/GStreamerAllocator.h
similarity index 100%
rename from content/media/gstreamer/GStreamerAllocator.h
rename to dom/media/gstreamer/GStreamerAllocator.h
diff --git a/content/media/gstreamer/GStreamerDecoder.cpp b/dom/media/gstreamer/GStreamerDecoder.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerDecoder.cpp
rename to dom/media/gstreamer/GStreamerDecoder.cpp
diff --git a/content/media/gstreamer/GStreamerDecoder.h b/dom/media/gstreamer/GStreamerDecoder.h
similarity index 100%
rename from content/media/gstreamer/GStreamerDecoder.h
rename to dom/media/gstreamer/GStreamerDecoder.h
diff --git a/content/media/gstreamer/GStreamerFormatHelper.cpp b/dom/media/gstreamer/GStreamerFormatHelper.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerFormatHelper.cpp
rename to dom/media/gstreamer/GStreamerFormatHelper.cpp
diff --git a/content/media/gstreamer/GStreamerFormatHelper.h b/dom/media/gstreamer/GStreamerFormatHelper.h
similarity index 100%
rename from content/media/gstreamer/GStreamerFormatHelper.h
rename to dom/media/gstreamer/GStreamerFormatHelper.h
diff --git a/content/media/gstreamer/GStreamerFunctionList.h b/dom/media/gstreamer/GStreamerFunctionList.h
similarity index 100%
rename from content/media/gstreamer/GStreamerFunctionList.h
rename to dom/media/gstreamer/GStreamerFunctionList.h
diff --git a/content/media/gstreamer/GStreamerLoader.cpp b/dom/media/gstreamer/GStreamerLoader.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerLoader.cpp
rename to dom/media/gstreamer/GStreamerLoader.cpp
diff --git a/content/media/gstreamer/GStreamerLoader.h b/dom/media/gstreamer/GStreamerLoader.h
similarity index 100%
rename from content/media/gstreamer/GStreamerLoader.h
rename to dom/media/gstreamer/GStreamerLoader.h
diff --git a/content/media/gstreamer/GStreamerMozVideoBuffer.cpp b/dom/media/gstreamer/GStreamerMozVideoBuffer.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerMozVideoBuffer.cpp
rename to dom/media/gstreamer/GStreamerMozVideoBuffer.cpp
diff --git a/content/media/gstreamer/GStreamerMozVideoBuffer.h b/dom/media/gstreamer/GStreamerMozVideoBuffer.h
similarity index 100%
rename from content/media/gstreamer/GStreamerMozVideoBuffer.h
rename to dom/media/gstreamer/GStreamerMozVideoBuffer.h
diff --git a/content/media/gstreamer/GStreamerReader-0.10.cpp b/dom/media/gstreamer/GStreamerReader-0.10.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerReader-0.10.cpp
rename to dom/media/gstreamer/GStreamerReader-0.10.cpp
diff --git a/content/media/gstreamer/GStreamerReader.cpp b/dom/media/gstreamer/GStreamerReader.cpp
similarity index 100%
rename from content/media/gstreamer/GStreamerReader.cpp
rename to dom/media/gstreamer/GStreamerReader.cpp
diff --git a/content/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h
similarity index 100%
rename from content/media/gstreamer/GStreamerReader.h
rename to dom/media/gstreamer/GStreamerReader.h
diff --git a/content/media/gstreamer/moz.build b/dom/media/gstreamer/moz.build
similarity index 100%
rename from content/media/gstreamer/moz.build
rename to dom/media/gstreamer/moz.build
diff --git a/content/media/gtest/MockMediaDecoderOwner.h b/dom/media/gtest/MockMediaDecoderOwner.h
similarity index 100%
rename from content/media/gtest/MockMediaDecoderOwner.h
rename to dom/media/gtest/MockMediaDecoderOwner.h
diff --git a/content/media/gtest/MockMediaResource.cpp b/dom/media/gtest/MockMediaResource.cpp
similarity index 100%
rename from content/media/gtest/MockMediaResource.cpp
rename to dom/media/gtest/MockMediaResource.cpp
diff --git a/content/media/gtest/MockMediaResource.h b/dom/media/gtest/MockMediaResource.h
similarity index 100%
rename from content/media/gtest/MockMediaResource.h
rename to dom/media/gtest/MockMediaResource.h
diff --git a/content/media/gtest/TestAudioCompactor.cpp b/dom/media/gtest/TestAudioCompactor.cpp
similarity index 100%
rename from content/media/gtest/TestAudioCompactor.cpp
rename to dom/media/gtest/TestAudioCompactor.cpp
diff --git a/content/media/gtest/TestGMPCrossOrigin.cpp b/dom/media/gtest/TestGMPCrossOrigin.cpp
similarity index 100%
rename from content/media/gtest/TestGMPCrossOrigin.cpp
rename to dom/media/gtest/TestGMPCrossOrigin.cpp
diff --git a/content/media/gtest/TestMP4Reader.cpp b/dom/media/gtest/TestMP4Reader.cpp
similarity index 100%
rename from content/media/gtest/TestMP4Reader.cpp
rename to dom/media/gtest/TestMP4Reader.cpp
diff --git a/content/media/gtest/TestTrackEncoder.cpp b/dom/media/gtest/TestTrackEncoder.cpp
similarity index 100%
rename from content/media/gtest/TestTrackEncoder.cpp
rename to dom/media/gtest/TestTrackEncoder.cpp
diff --git a/content/media/gtest/TestVideoSegment.cpp b/dom/media/gtest/TestVideoSegment.cpp
similarity index 100%
rename from content/media/gtest/TestVideoSegment.cpp
rename to dom/media/gtest/TestVideoSegment.cpp
diff --git a/content/media/gtest/TestVideoTrackEncoder.cpp b/dom/media/gtest/TestVideoTrackEncoder.cpp
similarity index 100%
rename from content/media/gtest/TestVideoTrackEncoder.cpp
rename to dom/media/gtest/TestVideoTrackEncoder.cpp
diff --git a/content/media/gtest/TestVorbisTrackEncoder.cpp b/dom/media/gtest/TestVorbisTrackEncoder.cpp
similarity index 100%
rename from content/media/gtest/TestVorbisTrackEncoder.cpp
rename to dom/media/gtest/TestVorbisTrackEncoder.cpp
diff --git a/content/media/gtest/TestWebMBuffered.cpp b/dom/media/gtest/TestWebMBuffered.cpp
similarity index 100%
rename from content/media/gtest/TestWebMBuffered.cpp
rename to dom/media/gtest/TestWebMBuffered.cpp
diff --git a/content/media/gtest/TestWebMWriter.cpp b/dom/media/gtest/TestWebMWriter.cpp
similarity index 100%
rename from content/media/gtest/TestWebMWriter.cpp
rename to dom/media/gtest/TestWebMWriter.cpp
diff --git a/content/media/gtest/mediasource_test.mp4 b/dom/media/gtest/mediasource_test.mp4
similarity index 100%
rename from content/media/gtest/mediasource_test.mp4
rename to dom/media/gtest/mediasource_test.mp4
diff --git a/content/media/gtest/moz.build b/dom/media/gtest/moz.build
similarity index 76%
rename from content/media/gtest/moz.build
rename to dom/media/gtest/moz.build
index 484c0455fca..2f5cb194f97 100644
--- a/content/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@@ -14,26 +14,27 @@ UNIFIED_SOURCES += [
     'TestWebMBuffered.cpp',
 ]
 
+if CONFIG['MOZ_WEBM_ENCODER']:
+    UNIFIED_SOURCES += [
+        'TestVideoTrackEncoder.cpp',
+        'TestVorbisTrackEncoder.cpp',
+        'TestWebMWriter.cpp',
+    ]
+
 TEST_HARNESS_FILES.gtest += [
     '../test/gizmo.mp4',
     'mediasource_test.mp4',
     'test.webm',
 ]
 
-if CONFIG['MOZ_WEBM_ENCODER']:
-    UNIFIED_SOURCES += ['TestVideoTrackEncoder.cpp',
-                        'TestVorbisTrackEncoder.cpp',
-                        'TestWebMWriter.cpp',
-]
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    '/content/media',
-    '/content/media/encoder',
-    '/content/media/fmp4',
-    '/content/media/gmp',
-    '/security/certverifier',
+    '/dom/media',
+    '/dom/media/encoder',
+    '/dom/media/fmp4',
+    '/dom/media/gmp',
+    '/security/certverifier',
     '/security/pkix/include',
 ]
 
diff --git a/content/media/gtest/test.webm b/dom/media/gtest/test.webm
similarity index 100%
rename from content/media/gtest/test.webm
rename to dom/media/gtest/test.webm
diff --git a/content/media/imagecapture/CaptureTask.cpp b/dom/media/imagecapture/CaptureTask.cpp
similarity index 100%
rename from content/media/imagecapture/CaptureTask.cpp
rename to dom/media/imagecapture/CaptureTask.cpp
diff --git a/content/media/imagecapture/CaptureTask.h b/dom/media/imagecapture/CaptureTask.h
similarity index 100%
rename from content/media/imagecapture/CaptureTask.h
rename to dom/media/imagecapture/CaptureTask.h
diff --git a/content/media/imagecapture/ImageCapture.cpp b/dom/media/imagecapture/ImageCapture.cpp
similarity index 100%
rename from content/media/imagecapture/ImageCapture.cpp
rename to dom/media/imagecapture/ImageCapture.cpp
diff --git a/content/media/imagecapture/ImageCapture.h b/dom/media/imagecapture/ImageCapture.h
similarity index 100%
rename from content/media/imagecapture/ImageCapture.h
rename to dom/media/imagecapture/ImageCapture.h
diff --git a/content/media/imagecapture/moz.build b/dom/media/imagecapture/moz.build
similarity index 100%
rename from content/media/imagecapture/moz.build
rename to dom/media/imagecapture/moz.build
diff --git a/content/media/mediasource/AsyncEventRunner.h b/dom/media/mediasource/AsyncEventRunner.h
similarity index 100%
rename from content/media/mediasource/AsyncEventRunner.h
rename to dom/media/mediasource/AsyncEventRunner.h
diff --git a/content/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp
similarity index 100%
rename from content/media/mediasource/ContainerParser.cpp
rename to dom/media/mediasource/ContainerParser.cpp
diff --git a/content/media/mediasource/ContainerParser.h b/dom/media/mediasource/ContainerParser.h
similarity index 100%
rename from content/media/mediasource/ContainerParser.h
rename to dom/media/mediasource/ContainerParser.h
diff --git a/content/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
similarity index 100%
rename from content/media/mediasource/MediaSource.cpp
rename to dom/media/mediasource/MediaSource.cpp
diff --git a/content/media/mediasource/MediaSource.h b/dom/media/mediasource/MediaSource.h
similarity index 100%
rename from content/media/mediasource/MediaSource.h
rename to dom/media/mediasource/MediaSource.h
diff --git a/content/media/mediasource/MediaSourceDecoder.cpp b/dom/media/mediasource/MediaSourceDecoder.cpp
similarity index 100%
rename from content/media/mediasource/MediaSourceDecoder.cpp
rename to dom/media/mediasource/MediaSourceDecoder.cpp
diff --git a/content/media/mediasource/MediaSourceDecoder.h b/dom/media/mediasource/MediaSourceDecoder.h
similarity index 100%
rename from content/media/mediasource/MediaSourceDecoder.h
rename to dom/media/mediasource/MediaSourceDecoder.h
diff --git a/content/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp
similarity index 100%
rename from content/media/mediasource/MediaSourceReader.cpp
rename to dom/media/mediasource/MediaSourceReader.cpp
diff --git a/content/media/mediasource/MediaSourceReader.h b/dom/media/mediasource/MediaSourceReader.h
similarity index 100%
rename from content/media/mediasource/MediaSourceReader.h
rename to dom/media/mediasource/MediaSourceReader.h
diff --git a/content/media/mediasource/MediaSourceResource.h b/dom/media/mediasource/MediaSourceResource.h
similarity index 100%
rename from content/media/mediasource/MediaSourceResource.h
rename to dom/media/mediasource/MediaSourceResource.h
diff --git a/content/media/mediasource/MediaSourceUtils.cpp b/dom/media/mediasource/MediaSourceUtils.cpp
similarity index 100%
rename from content/media/mediasource/MediaSourceUtils.cpp
rename to dom/media/mediasource/MediaSourceUtils.cpp
diff --git a/content/media/mediasource/MediaSourceUtils.h b/dom/media/mediasource/MediaSourceUtils.h
similarity index 100%
rename from content/media/mediasource/MediaSourceUtils.h
rename to dom/media/mediasource/MediaSourceUtils.h
diff --git a/content/media/mediasource/ResourceQueue.h b/dom/media/mediasource/ResourceQueue.h
similarity index 100%
rename from content/media/mediasource/ResourceQueue.h
rename to dom/media/mediasource/ResourceQueue.h
diff --git a/content/media/mediasource/SourceBuffer.cpp b/dom/media/mediasource/SourceBuffer.cpp
similarity index 100%
rename from content/media/mediasource/SourceBuffer.cpp
rename to dom/media/mediasource/SourceBuffer.cpp
diff --git a/content/media/mediasource/SourceBuffer.h b/dom/media/mediasource/SourceBuffer.h
similarity index 100%
rename from content/media/mediasource/SourceBuffer.h
rename to dom/media/mediasource/SourceBuffer.h
diff --git a/content/media/mediasource/SourceBufferDecoder.cpp b/dom/media/mediasource/SourceBufferDecoder.cpp
similarity index 100%
rename from content/media/mediasource/SourceBufferDecoder.cpp
rename to dom/media/mediasource/SourceBufferDecoder.cpp
diff --git a/content/media/mediasource/SourceBufferDecoder.h b/dom/media/mediasource/SourceBufferDecoder.h
similarity index 100%
rename from content/media/mediasource/SourceBufferDecoder.h
rename to dom/media/mediasource/SourceBufferDecoder.h
diff --git a/content/media/mediasource/SourceBufferList.cpp b/dom/media/mediasource/SourceBufferList.cpp
similarity index 100%
rename from content/media/mediasource/SourceBufferList.cpp
rename to dom/media/mediasource/SourceBufferList.cpp
diff --git a/content/media/mediasource/SourceBufferList.h b/dom/media/mediasource/SourceBufferList.h
similarity index 100%
rename from content/media/mediasource/SourceBufferList.h
rename to dom/media/mediasource/SourceBufferList.h
diff --git a/content/media/mediasource/SourceBufferResource.cpp b/dom/media/mediasource/SourceBufferResource.cpp
similarity index 100%
rename from content/media/mediasource/SourceBufferResource.cpp
rename to dom/media/mediasource/SourceBufferResource.cpp
diff --git a/content/media/mediasource/SourceBufferResource.h b/dom/media/mediasource/SourceBufferResource.h
similarity index 100%
rename from content/media/mediasource/SourceBufferResource.h
rename to dom/media/mediasource/SourceBufferResource.h
diff --git a/content/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp
similarity index 100%
rename from content/media/mediasource/TrackBuffer.cpp
rename to dom/media/mediasource/TrackBuffer.cpp
diff --git a/content/media/mediasource/TrackBuffer.h b/dom/media/mediasource/TrackBuffer.h
similarity index 100%
rename from content/media/mediasource/TrackBuffer.h
rename to dom/media/mediasource/TrackBuffer.h
diff --git a/content/media/mediasource/moz.build b/dom/media/mediasource/moz.build
similarity index 100%
rename from content/media/mediasource/moz.build
rename to dom/media/mediasource/moz.build
diff --git a/content/media/mediasource/test/crashtests/1005366.html b/dom/media/mediasource/test/crashtests/1005366.html
similarity index 100%
rename from content/media/mediasource/test/crashtests/1005366.html
rename to dom/media/mediasource/test/crashtests/1005366.html
diff --git a/content/media/mediasource/test/crashtests/1059035.html b/dom/media/mediasource/test/crashtests/1059035.html
similarity index 100%
rename from content/media/mediasource/test/crashtests/1059035.html
rename to dom/media/mediasource/test/crashtests/1059035.html
diff --git a/content/media/mediasource/test/crashtests/926665.html b/dom/media/mediasource/test/crashtests/926665.html
similarity index 100%
rename from content/media/mediasource/test/crashtests/926665.html
rename to dom/media/mediasource/test/crashtests/926665.html
diff --git a/content/media/mediasource/test/crashtests/931388.html b/dom/media/mediasource/test/crashtests/931388.html
similarity index 100%
rename from content/media/mediasource/test/crashtests/931388.html
rename to dom/media/mediasource/test/crashtests/931388.html
diff --git a/content/media/mediasource/test/crashtests/crashtests.list b/dom/media/mediasource/test/crashtests/crashtests.list
similarity index 100%
rename from content/media/mediasource/test/crashtests/crashtests.list
rename to dom/media/mediasource/test/crashtests/crashtests.list
diff --git a/content/media/mediasource/test/mediasource.js b/dom/media/mediasource/test/mediasource.js
similarity index 100%
rename from content/media/mediasource/test/mediasource.js
rename to dom/media/mediasource/test/mediasource.js
diff --git a/content/media/mediasource/test/mochitest.ini b/dom/media/mediasource/test/mochitest.ini
similarity index 100%
rename from content/media/mediasource/test/mochitest.ini
rename to dom/media/mediasource/test/mochitest.ini
diff --git a/content/media/mediasource/test/seek.webm b/dom/media/mediasource/test/seek.webm
similarity index 100%
rename from content/media/mediasource/test/seek.webm
rename to dom/media/mediasource/test/seek.webm
diff --git a/content/media/mediasource/test/seek.webm^headers^ b/dom/media/mediasource/test/seek.webm^headers^
similarity index 100%
rename from content/media/mediasource/test/seek.webm^headers^
rename to dom/media/mediasource/test/seek.webm^headers^
diff --git a/content/media/mediasource/test/seek_lowres.webm b/dom/media/mediasource/test/seek_lowres.webm
similarity index 100%
rename from content/media/mediasource/test/seek_lowres.webm
rename to dom/media/mediasource/test/seek_lowres.webm
diff --git a/content/media/mediasource/test/seek_lowres.webm^headers^ b/dom/media/mediasource/test/seek_lowres.webm^headers^
similarity index 100%
rename from content/media/mediasource/test/seek_lowres.webm^headers^
rename to dom/media/mediasource/test/seek_lowres.webm^headers^
diff --git a/content/media/mediasource/test/test_BufferedSeek.html b/dom/media/mediasource/test/test_BufferedSeek.html
similarity index 100%
rename from content/media/mediasource/test/test_BufferedSeek.html
rename to dom/media/mediasource/test/test_BufferedSeek.html
diff --git a/content/media/mediasource/test/test_FrameSelection.html b/dom/media/mediasource/test/test_FrameSelection.html
similarity index 100%
rename from content/media/mediasource/test/test_FrameSelection.html
rename to dom/media/mediasource/test/test_FrameSelection.html
diff --git a/content/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html b/dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html
similarity index 100%
rename from content/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html
rename to dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html
diff --git a/content/media/mediasource/test/test_MediaSource.html b/dom/media/mediasource/test/test_MediaSource.html
similarity index 100%
rename from content/media/mediasource/test/test_MediaSource.html
rename to dom/media/mediasource/test/test_MediaSource.html
diff --git a/content/media/mediasource/test/test_MediaSource_disabled.html b/dom/media/mediasource/test/test_MediaSource_disabled.html
similarity index 100%
rename from content/media/mediasource/test/test_MediaSource_disabled.html
rename to dom/media/mediasource/test/test_MediaSource_disabled.html
diff --git a/content/media/mediasource/test/test_SeekableAfterEndOfStream.html b/dom/media/mediasource/test/test_SeekableAfterEndOfStream.html
similarity index 100%
rename from content/media/mediasource/test/test_SeekableAfterEndOfStream.html
rename to dom/media/mediasource/test/test_SeekableAfterEndOfStream.html
diff --git a/content/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html b/dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
similarity index 100%
rename from content/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
rename to dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
diff --git a/content/media/mediasource/test/test_SeekableBeforeEndOfStream.html b/dom/media/mediasource/test/test_SeekableBeforeEndOfStream.html
similarity index 100%
rename from content/media/mediasource/test/test_SeekableBeforeEndOfStream.html
rename to dom/media/mediasource/test/test_SeekableBeforeEndOfStream.html
diff --git a/content/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html b/dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
similarity index 100%
rename from content/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
rename to dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
diff --git a/content/media/mediasource/test/test_SplitAppend.html b/dom/media/mediasource/test/test_SplitAppend.html
similarity index 100%
rename from content/media/mediasource/test/test_SplitAppend.html
rename to dom/media/mediasource/test/test_SplitAppend.html
diff --git a/content/media/mediasource/test/test_SplitAppendDelay.html b/dom/media/mediasource/test/test_SplitAppendDelay.html
similarity index 100%
rename from content/media/mediasource/test/test_SplitAppendDelay.html
rename to dom/media/mediasource/test/test_SplitAppendDelay.html
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 340024c534b..72d9c12c73f 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -4,15 +4,71 @@
 # 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/.
 
-DIRS += ['gmp-plugin']
+DIRS += [
+    'encoder',
+    'gmp',
+    'gmp-plugin',
+    'imagecapture',
+    'mediasource',
+    'ogg',
+    'systemservices',
+    'webaudio',
+    'webrtc',
+    'webspeech',
+    'webvtt',
+]
+
+if CONFIG['MOZ_RAW']:
+    DIRS += ['raw']
+
+if CONFIG['MOZ_WAVE']:
+    DIRS += ['wave']
+
+if CONFIG['MOZ_WEBM']:
+    DIRS += ['webm']
+
+if CONFIG['MOZ_GSTREAMER']:
+    DIRS += ['gstreamer']
+
+if CONFIG['MOZ_DIRECTSHOW']:
+    DIRS += ['directshow']
+
+if CONFIG['MOZ_ANDROID_OMX']:
+    DIRS += ['android']
+
+if CONFIG['MOZ_WMF']:
+    DIRS += ['wmf']
+
+if CONFIG['MOZ_FMP4']:
+    DIRS += ['fmp4']
+
+if CONFIG['MOZ_APPLEMEDIA']:
+    DIRS += ['apple']
+
 if CONFIG['MOZ_WEBRTC']:
     DIRS += ['bridge']
 
-    LOCAL_INCLUDES += [
-        '/media/webrtc/signaling/src/common',
-        '/media/webrtc/trunk',
-    ]
+if CONFIG['MOZ_OMX_DECODER']:
+    DIRS += ['omx']
+    DIRS += ['omx/mediaresourcemanager']
 
+if CONFIG['MOZ_EME']:
+    DIRS += ['eme']
+
+TEST_DIRS += [
+    'compiledtest',
+    'gtest',
+]
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+MOCHITEST_MANIFESTS += [
+    'test/mochitest.ini',
+    'tests/identity/mochitest.ini',
+    'tests/ipc/mochitest.ini',
+]
+
+if CONFIG['MOZ_WEBRTC']:
     MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
     WEBRTC_SIGNALLING_TEST_MANIFESTS += ['tests/mochitest/steeplechase.ini']
 
@@ -23,17 +79,143 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'dom_media'
 
-EXPORTS.mozilla.dom += [
-    'GetUserMediaRequest.h',
+EXPORTS += [
+    'AbstractMediaDecoder.h',
+    'AudioBufferUtils.h',
+    'AudioChannelFormat.h',
+    'AudioCompactor.h',
+    'AudioMixer.h',
+    'AudioSampleFormat.h',
+    'AudioSegment.h',
+    'AudioStream.h',
+    'BufferMediaResource.h',
+    'CubebUtils.h',
+    'DecoderTraits.h',
+    'DOMMediaStream.h',
+    'EncodedBufferCache.h',
+    'FileBlockCache.h',
+    'GraphDriver.h',
+    'Latency.h',
+    'MediaCache.h',
+    'MediaData.h',
+    'MediaDataDecodedListener.h',
+    'MediaDecoder.h',
+    'MediaDecoderOwner.h',
+    'MediaDecoderReader.h',
+    'MediaDecoderStateMachine.h',
+    'MediaInfo.h',
+    'MediaMetadataManager.h',
+    'MediaQueue.h',
+    'MediaRecorder.h',
+    'MediaResource.h',
+    'MediaSegment.h',
+    'MediaStreamGraph.h',
+    'MediaTaskQueue.h',
+    'MediaTrack.h',
+    'MediaTrackList.h',
+    'MP3FrameParser.h',
+    'nsIDocumentActivity.h',
+    'RtspMediaResource.h',
+    'SharedBuffer.h',
+    'SharedThreadPool.h',
+    'StreamBuffer.h',
+    'ThreadPoolCOMListener.h',
+    'TimeVarying.h',
+    'TrackUnionStream.h',
+    'VideoFrameContainer.h',
+    'VideoSegment.h',
+    'VideoUtils.h',
+    'VorbisUtils.h',
 ]
 
 EXPORTS.mozilla += [
     'MediaManager.h',
 ]
 
+if CONFIG['MOZ_B2G']:
+    EXPORTS.mozilla += [
+        'MediaPermissionGonk.h',
+    ]
+
+EXPORTS.mozilla.dom += [
+    'AudioStreamTrack.h',
+    'AudioTrack.h',
+    'AudioTrackList.h',
+    'GetUserMediaRequest.h',
+    'MediaStreamTrack.h',
+    'TextTrack.h',
+    'TextTrackCue.h',
+    'TextTrackCueList.h',
+    'TextTrackList.h',
+    'TextTrackRegion.h',
+    'VideoPlaybackQuality.h',
+    'VideoStreamTrack.h',
+    'VideoTrack.h',
+    'VideoTrackList.h',
+]
+
 UNIFIED_SOURCES += [
+    'AudioChannelFormat.cpp',
+    'AudioCompactor.cpp',
+    'AudioSegment.cpp',
+    'AudioSink.cpp',
+    'AudioStream.cpp',
+    'AudioStreamTrack.cpp',
+    'AudioTrack.cpp',
+    'AudioTrackList.cpp',
+    'CubebUtils.cpp',
+    'DOMMediaStream.cpp',
+    'EncodedBufferCache.cpp',
+    'FileBlockCache.cpp',
     'GetUserMediaRequest.cpp',
+    'GraphDriver.cpp',
+    'Latency.cpp',
+    'MediaCache.cpp',
+    'MediaData.cpp',
+    'MediaDecoder.cpp',
+    'MediaDecoderReader.cpp',
+    'MediaDecoderStateMachine.cpp',
+    'MediaDecoderStateMachineScheduler.cpp',
     'MediaManager.cpp',
+    'MediaRecorder.cpp',
+    'MediaResource.cpp',
+    'MediaShutdownManager.cpp',
+    'MediaStreamGraph.cpp',
+    'MediaStreamTrack.cpp',
+    'MediaTaskQueue.cpp',
+    'MediaTrack.cpp',
+    'MediaTrackList.cpp',
+    'MP3FrameParser.cpp',
+    'RtspMediaResource.cpp',
+    'SharedThreadPool.cpp',
+    'StreamBuffer.cpp',
+    'TextTrack.cpp',
+    'TextTrackCue.cpp',
+    'TextTrackCueList.cpp',
+    'TextTrackList.cpp',
+    'TextTrackRegion.cpp',
+    'TrackUnionStream.cpp',
+    'VideoFrameContainer.cpp',
+    'VideoPlaybackQuality.cpp',
+    'VideoSegment.cpp',
+    'VideoStreamTrack.cpp',
+    'VideoTrack.cpp',
+    'VideoTrackList.cpp',
+    'VideoUtils.cpp',
+    'WebVTTListener.cpp',
+]
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+  SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
+
+if CONFIG['MOZ_B2G']:
+    SOURCES += [
+        'MediaPermissionGonk.cpp',
+    ]
+
+# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
+SOURCES += [
+    'DecoderTraits.cpp',
 ]
 
 EXTRA_COMPONENTS += [
@@ -47,27 +229,42 @@ EXTRA_JS_MODULES.media += [
     'RTCStatsReport.jsm',
 ]
 
-if CONFIG['MOZ_B2G']:
-    EXPORTS.mozilla += [
-        'MediaPermissionGonk.h',
-    ]
-    SOURCES += [
-        'MediaPermissionGonk.cpp',
-    ]
-
 FAIL_ON_WARNINGS = True
 
+MSVC_ENABLE_PGO = True
+
 LOCAL_INCLUDES += [
-    '../base',
-    '../camera',
     '/caps',
+    '/content/base/src',
+    '/dom/base',
+    '/dom/camera',
+    '/layout/generic',
+    '/layout/xul',
+    '/netwerk/base/src',
 ]
 
+if CONFIG['MOZ_DIRECTSHOW']:
+    LOCAL_INCLUDES += [
+        '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
+    ]
+
+if CONFIG['MOZ_WEBRTC']:
+    LOCAL_INCLUDES += [
+        '/media/webrtc/signaling/src/common',
+        '/media/webrtc/trunk',
+    ]
+
+DEFINES['MOZILLA_INTERNAL_API'] = True
+
+if CONFIG['MOZ_OMX_DECODER']:
+    DEFINES['MOZ_OMX_DECODER'] = True
+
+if CONFIG['ANDROID_VERSION'] > '15':
+    DEFINES['MOZ_OMX_WEBM_DECODER'] = True
+
+CFLAGS += CONFIG['GSTREAMER_CFLAGS']
+CXXFLAGS += CONFIG['GSTREAMER_CFLAGS']
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
-
-MOCHITEST_MANIFESTS += [
-    'tests/identity/mochitest.ini',
-    'tests/ipc/mochitest.ini',
-]
diff --git a/content/media/nsIDocumentActivity.h b/dom/media/nsIDocumentActivity.h
similarity index 100%
rename from content/media/nsIDocumentActivity.h
rename to dom/media/nsIDocumentActivity.h
diff --git a/content/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
similarity index 100%
rename from content/media/ogg/OggCodecState.cpp
rename to dom/media/ogg/OggCodecState.cpp
diff --git a/content/media/ogg/OggCodecState.h b/dom/media/ogg/OggCodecState.h
similarity index 100%
rename from content/media/ogg/OggCodecState.h
rename to dom/media/ogg/OggCodecState.h
diff --git a/content/media/ogg/OggDecoder.cpp b/dom/media/ogg/OggDecoder.cpp
similarity index 100%
rename from content/media/ogg/OggDecoder.cpp
rename to dom/media/ogg/OggDecoder.cpp
diff --git a/content/media/ogg/OggDecoder.h b/dom/media/ogg/OggDecoder.h
similarity index 100%
rename from content/media/ogg/OggDecoder.h
rename to dom/media/ogg/OggDecoder.h
diff --git a/content/media/ogg/OggReader.cpp b/dom/media/ogg/OggReader.cpp
similarity index 100%
rename from content/media/ogg/OggReader.cpp
rename to dom/media/ogg/OggReader.cpp
diff --git a/content/media/ogg/OggReader.h b/dom/media/ogg/OggReader.h
similarity index 100%
rename from content/media/ogg/OggReader.h
rename to dom/media/ogg/OggReader.h
diff --git a/content/media/ogg/OggWriter.cpp b/dom/media/ogg/OggWriter.cpp
similarity index 100%
rename from content/media/ogg/OggWriter.cpp
rename to dom/media/ogg/OggWriter.cpp
diff --git a/content/media/ogg/OggWriter.h b/dom/media/ogg/OggWriter.h
similarity index 100%
rename from content/media/ogg/OggWriter.h
rename to dom/media/ogg/OggWriter.h
diff --git a/content/media/ogg/OpusParser.cpp b/dom/media/ogg/OpusParser.cpp
similarity index 100%
rename from content/media/ogg/OpusParser.cpp
rename to dom/media/ogg/OpusParser.cpp
diff --git a/content/media/ogg/OpusParser.h b/dom/media/ogg/OpusParser.h
similarity index 100%
rename from content/media/ogg/OpusParser.h
rename to dom/media/ogg/OpusParser.h
diff --git a/content/media/ogg/moz.build b/dom/media/ogg/moz.build
similarity index 100%
rename from content/media/ogg/moz.build
rename to dom/media/ogg/moz.build
diff --git a/content/media/omx/AudioOffloadPlayer.cpp b/dom/media/omx/AudioOffloadPlayer.cpp
similarity index 100%
rename from content/media/omx/AudioOffloadPlayer.cpp
rename to dom/media/omx/AudioOffloadPlayer.cpp
diff --git a/content/media/omx/AudioOffloadPlayer.h b/dom/media/omx/AudioOffloadPlayer.h
similarity index 100%
rename from content/media/omx/AudioOffloadPlayer.h
rename to dom/media/omx/AudioOffloadPlayer.h
diff --git a/content/media/omx/AudioOffloadPlayerBase.h b/dom/media/omx/AudioOffloadPlayerBase.h
similarity index 100%
rename from content/media/omx/AudioOffloadPlayerBase.h
rename to dom/media/omx/AudioOffloadPlayerBase.h
diff --git a/content/media/omx/AudioOutput.cpp b/dom/media/omx/AudioOutput.cpp
similarity index 100%
rename from content/media/omx/AudioOutput.cpp
rename to dom/media/omx/AudioOutput.cpp
diff --git a/content/media/omx/AudioOutput.h b/dom/media/omx/AudioOutput.h
similarity index 100%
rename from content/media/omx/AudioOutput.h
rename to dom/media/omx/AudioOutput.h
diff --git a/content/media/omx/AudioSink.h b/dom/media/omx/AudioSink.h
similarity index 100%
rename from content/media/omx/AudioSink.h
rename to dom/media/omx/AudioSink.h
diff --git a/content/media/omx/I420ColorConverterHelper.cpp b/dom/media/omx/I420ColorConverterHelper.cpp
similarity index 100%
rename from content/media/omx/I420ColorConverterHelper.cpp
rename to dom/media/omx/I420ColorConverterHelper.cpp
diff --git a/content/media/omx/I420ColorConverterHelper.h b/dom/media/omx/I420ColorConverterHelper.h
similarity index 100%
rename from content/media/omx/I420ColorConverterHelper.h
rename to dom/media/omx/I420ColorConverterHelper.h
diff --git a/content/media/omx/MPAPI.h b/dom/media/omx/MPAPI.h
similarity index 100%
rename from content/media/omx/MPAPI.h
rename to dom/media/omx/MPAPI.h
diff --git a/content/media/omx/MediaCodecDecoder.cpp b/dom/media/omx/MediaCodecDecoder.cpp
similarity index 100%
rename from content/media/omx/MediaCodecDecoder.cpp
rename to dom/media/omx/MediaCodecDecoder.cpp
diff --git a/content/media/omx/MediaCodecDecoder.h b/dom/media/omx/MediaCodecDecoder.h
similarity index 100%
rename from content/media/omx/MediaCodecDecoder.h
rename to dom/media/omx/MediaCodecDecoder.h
diff --git a/content/media/omx/MediaCodecProxy.cpp b/dom/media/omx/MediaCodecProxy.cpp
similarity index 100%
rename from content/media/omx/MediaCodecProxy.cpp
rename to dom/media/omx/MediaCodecProxy.cpp
diff --git a/content/media/omx/MediaCodecProxy.h b/dom/media/omx/MediaCodecProxy.h
similarity index 100%
rename from content/media/omx/MediaCodecProxy.h
rename to dom/media/omx/MediaCodecProxy.h
diff --git a/content/media/omx/MediaCodecReader.cpp b/dom/media/omx/MediaCodecReader.cpp
similarity index 100%
rename from content/media/omx/MediaCodecReader.cpp
rename to dom/media/omx/MediaCodecReader.cpp
diff --git a/content/media/omx/MediaCodecReader.h b/dom/media/omx/MediaCodecReader.h
similarity index 100%
rename from content/media/omx/MediaCodecReader.h
rename to dom/media/omx/MediaCodecReader.h
diff --git a/content/media/omx/MediaOmxCommonDecoder.cpp b/dom/media/omx/MediaOmxCommonDecoder.cpp
similarity index 100%
rename from content/media/omx/MediaOmxCommonDecoder.cpp
rename to dom/media/omx/MediaOmxCommonDecoder.cpp
diff --git a/content/media/omx/MediaOmxCommonDecoder.h b/dom/media/omx/MediaOmxCommonDecoder.h
similarity index 100%
rename from content/media/omx/MediaOmxCommonDecoder.h
rename to dom/media/omx/MediaOmxCommonDecoder.h
diff --git a/content/media/omx/MediaOmxCommonReader.cpp b/dom/media/omx/MediaOmxCommonReader.cpp
similarity index 100%
rename from content/media/omx/MediaOmxCommonReader.cpp
rename to dom/media/omx/MediaOmxCommonReader.cpp
diff --git a/content/media/omx/MediaOmxCommonReader.h b/dom/media/omx/MediaOmxCommonReader.h
similarity index 100%
rename from content/media/omx/MediaOmxCommonReader.h
rename to dom/media/omx/MediaOmxCommonReader.h
diff --git a/content/media/omx/MediaOmxDecoder.cpp b/dom/media/omx/MediaOmxDecoder.cpp
similarity index 100%
rename from content/media/omx/MediaOmxDecoder.cpp
rename to dom/media/omx/MediaOmxDecoder.cpp
diff --git a/content/media/omx/MediaOmxDecoder.h b/dom/media/omx/MediaOmxDecoder.h
similarity index 100%
rename from content/media/omx/MediaOmxDecoder.h
rename to dom/media/omx/MediaOmxDecoder.h
diff --git a/content/media/omx/MediaOmxReader.cpp b/dom/media/omx/MediaOmxReader.cpp
similarity index 100%
rename from content/media/omx/MediaOmxReader.cpp
rename to dom/media/omx/MediaOmxReader.cpp
diff --git a/content/media/omx/MediaOmxReader.h b/dom/media/omx/MediaOmxReader.h
similarity index 100%
rename from content/media/omx/MediaOmxReader.h
rename to dom/media/omx/MediaOmxReader.h
diff --git a/content/media/omx/MediaStreamSource.cpp b/dom/media/omx/MediaStreamSource.cpp
similarity index 100%
rename from content/media/omx/MediaStreamSource.cpp
rename to dom/media/omx/MediaStreamSource.cpp
diff --git a/content/media/omx/MediaStreamSource.h b/dom/media/omx/MediaStreamSource.h
similarity index 100%
rename from content/media/omx/MediaStreamSource.h
rename to dom/media/omx/MediaStreamSource.h
diff --git a/content/media/omx/OMXCodecDescriptorUtil.cpp b/dom/media/omx/OMXCodecDescriptorUtil.cpp
similarity index 100%
rename from content/media/omx/OMXCodecDescriptorUtil.cpp
rename to dom/media/omx/OMXCodecDescriptorUtil.cpp
diff --git a/content/media/omx/OMXCodecDescriptorUtil.h b/dom/media/omx/OMXCodecDescriptorUtil.h
similarity index 100%
rename from content/media/omx/OMXCodecDescriptorUtil.h
rename to dom/media/omx/OMXCodecDescriptorUtil.h
diff --git a/content/media/omx/OMXCodecProxy.cpp b/dom/media/omx/OMXCodecProxy.cpp
similarity index 100%
rename from content/media/omx/OMXCodecProxy.cpp
rename to dom/media/omx/OMXCodecProxy.cpp
diff --git a/content/media/omx/OMXCodecProxy.h b/dom/media/omx/OMXCodecProxy.h
similarity index 100%
rename from content/media/omx/OMXCodecProxy.h
rename to dom/media/omx/OMXCodecProxy.h
diff --git a/content/media/omx/OMXCodecWrapper.cpp b/dom/media/omx/OMXCodecWrapper.cpp
similarity index 100%
rename from content/media/omx/OMXCodecWrapper.cpp
rename to dom/media/omx/OMXCodecWrapper.cpp
diff --git a/content/media/omx/OMXCodecWrapper.h b/dom/media/omx/OMXCodecWrapper.h
similarity index 100%
rename from content/media/omx/OMXCodecWrapper.h
rename to dom/media/omx/OMXCodecWrapper.h
diff --git a/content/media/omx/OmxDecoder.cpp b/dom/media/omx/OmxDecoder.cpp
similarity index 100%
rename from content/media/omx/OmxDecoder.cpp
rename to dom/media/omx/OmxDecoder.cpp
diff --git a/content/media/omx/OmxDecoder.h b/dom/media/omx/OmxDecoder.h
similarity index 100%
rename from content/media/omx/OmxDecoder.h
rename to dom/media/omx/OmxDecoder.h
diff --git a/content/media/omx/RtspExtractor.cpp b/dom/media/omx/RtspExtractor.cpp
similarity index 100%
rename from content/media/omx/RtspExtractor.cpp
rename to dom/media/omx/RtspExtractor.cpp
diff --git a/content/media/omx/RtspExtractor.h b/dom/media/omx/RtspExtractor.h
similarity index 100%
rename from content/media/omx/RtspExtractor.h
rename to dom/media/omx/RtspExtractor.h
diff --git a/content/media/omx/RtspMediaCodecDecoder.cpp b/dom/media/omx/RtspMediaCodecDecoder.cpp
similarity index 100%
rename from content/media/omx/RtspMediaCodecDecoder.cpp
rename to dom/media/omx/RtspMediaCodecDecoder.cpp
diff --git a/content/media/omx/RtspMediaCodecDecoder.h b/dom/media/omx/RtspMediaCodecDecoder.h
similarity index 100%
rename from content/media/omx/RtspMediaCodecDecoder.h
rename to dom/media/omx/RtspMediaCodecDecoder.h
diff --git a/content/media/omx/RtspMediaCodecReader.cpp b/dom/media/omx/RtspMediaCodecReader.cpp
similarity index 100%
rename from content/media/omx/RtspMediaCodecReader.cpp
rename to dom/media/omx/RtspMediaCodecReader.cpp
diff --git a/content/media/omx/RtspMediaCodecReader.h b/dom/media/omx/RtspMediaCodecReader.h
similarity index 100%
rename from content/media/omx/RtspMediaCodecReader.h
rename to dom/media/omx/RtspMediaCodecReader.h
diff --git a/content/media/omx/RtspOmxDecoder.cpp b/dom/media/omx/RtspOmxDecoder.cpp
similarity index 100%
rename from content/media/omx/RtspOmxDecoder.cpp
rename to dom/media/omx/RtspOmxDecoder.cpp
diff --git a/content/media/omx/RtspOmxDecoder.h b/dom/media/omx/RtspOmxDecoder.h
similarity index 100%
rename from content/media/omx/RtspOmxDecoder.h
rename to dom/media/omx/RtspOmxDecoder.h
diff --git a/content/media/omx/RtspOmxReader.cpp b/dom/media/omx/RtspOmxReader.cpp
similarity index 100%
rename from content/media/omx/RtspOmxReader.cpp
rename to dom/media/omx/RtspOmxReader.cpp
diff --git a/content/media/omx/RtspOmxReader.h b/dom/media/omx/RtspOmxReader.h
similarity index 100%
rename from content/media/omx/RtspOmxReader.h
rename to dom/media/omx/RtspOmxReader.h
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp
diff --git a/content/media/omx/mediaresourcemanager/IMediaResourceManagerService.h b/dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/IMediaResourceManagerService.h
rename to dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.h
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceHandler.cpp b/dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceHandler.cpp
rename to dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceHandler.h b/dom/media/omx/mediaresourcemanager/MediaResourceHandler.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceHandler.h
rename to dom/media/omx/mediaresourcemanager/MediaResourceHandler.h
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp b/dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp
rename to dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerClient.h b/dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceManagerClient.h
rename to dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.h
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp b/dom/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
rename to dom/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.h b/dom/media/omx/mediaresourcemanager/MediaResourceManagerService.h
similarity index 100%
rename from content/media/omx/mediaresourcemanager/MediaResourceManagerService.h
rename to dom/media/omx/mediaresourcemanager/MediaResourceManagerService.h
diff --git a/content/media/omx/mediaresourcemanager/moz.build b/dom/media/omx/mediaresourcemanager/moz.build
similarity index 100%
rename from content/media/omx/mediaresourcemanager/moz.build
rename to dom/media/omx/mediaresourcemanager/moz.build
diff --git a/content/media/omx/moz.build b/dom/media/omx/moz.build
similarity index 100%
rename from content/media/omx/moz.build
rename to dom/media/omx/moz.build
diff --git a/content/media/raw/RawDecoder.cpp b/dom/media/raw/RawDecoder.cpp
similarity index 100%
rename from content/media/raw/RawDecoder.cpp
rename to dom/media/raw/RawDecoder.cpp
diff --git a/content/media/raw/RawDecoder.h b/dom/media/raw/RawDecoder.h
similarity index 100%
rename from content/media/raw/RawDecoder.h
rename to dom/media/raw/RawDecoder.h
diff --git a/content/media/raw/RawReader.cpp b/dom/media/raw/RawReader.cpp
similarity index 100%
rename from content/media/raw/RawReader.cpp
rename to dom/media/raw/RawReader.cpp
diff --git a/content/media/raw/RawReader.h b/dom/media/raw/RawReader.h
similarity index 100%
rename from content/media/raw/RawReader.h
rename to dom/media/raw/RawReader.h
diff --git a/content/media/raw/RawStructs.h b/dom/media/raw/RawStructs.h
similarity index 100%
rename from content/media/raw/RawStructs.h
rename to dom/media/raw/RawStructs.h
diff --git a/content/media/raw/moz.build b/dom/media/raw/moz.build
similarity index 100%
rename from content/media/raw/moz.build
rename to dom/media/raw/moz.build
diff --git a/content/media/systemservices/LoadManager.cpp b/dom/media/systemservices/LoadManager.cpp
similarity index 100%
rename from content/media/systemservices/LoadManager.cpp
rename to dom/media/systemservices/LoadManager.cpp
diff --git a/content/media/systemservices/LoadManager.h b/dom/media/systemservices/LoadManager.h
similarity index 100%
rename from content/media/systemservices/LoadManager.h
rename to dom/media/systemservices/LoadManager.h
diff --git a/content/media/systemservices/LoadManagerFactory.cpp b/dom/media/systemservices/LoadManagerFactory.cpp
similarity index 100%
rename from content/media/systemservices/LoadManagerFactory.cpp
rename to dom/media/systemservices/LoadManagerFactory.cpp
diff --git a/content/media/systemservices/LoadManagerFactory.h b/dom/media/systemservices/LoadManagerFactory.h
similarity index 100%
rename from content/media/systemservices/LoadManagerFactory.h
rename to dom/media/systemservices/LoadManagerFactory.h
diff --git a/content/media/systemservices/LoadMonitor.cpp b/dom/media/systemservices/LoadMonitor.cpp
similarity index 100%
rename from content/media/systemservices/LoadMonitor.cpp
rename to dom/media/systemservices/LoadMonitor.cpp
diff --git a/content/media/systemservices/LoadMonitor.h b/dom/media/systemservices/LoadMonitor.h
similarity index 100%
rename from content/media/systemservices/LoadMonitor.h
rename to dom/media/systemservices/LoadMonitor.h
diff --git a/content/media/systemservices/OSXRunLoopSingleton.cpp b/dom/media/systemservices/OSXRunLoopSingleton.cpp
similarity index 100%
rename from content/media/systemservices/OSXRunLoopSingleton.cpp
rename to dom/media/systemservices/OSXRunLoopSingleton.cpp
diff --git a/content/media/systemservices/OSXRunLoopSingleton.h b/dom/media/systemservices/OSXRunLoopSingleton.h
similarity index 100%
rename from content/media/systemservices/OSXRunLoopSingleton.h
rename to dom/media/systemservices/OSXRunLoopSingleton.h
diff --git a/content/media/systemservices/OpenSLESProvider.cpp b/dom/media/systemservices/OpenSLESProvider.cpp
similarity index 100%
rename from content/media/systemservices/OpenSLESProvider.cpp
rename to dom/media/systemservices/OpenSLESProvider.cpp
diff --git a/content/media/systemservices/OpenSLESProvider.h b/dom/media/systemservices/OpenSLESProvider.h
similarity index 100%
rename from content/media/systemservices/OpenSLESProvider.h
rename to dom/media/systemservices/OpenSLESProvider.h
diff --git a/content/media/systemservices/moz.build b/dom/media/systemservices/moz.build
similarity index 100%
rename from content/media/systemservices/moz.build
rename to dom/media/systemservices/moz.build
diff --git a/content/media/test/320x240.ogv b/dom/media/test/320x240.ogv
similarity index 100%
rename from content/media/test/320x240.ogv
rename to dom/media/test/320x240.ogv
diff --git a/content/media/test/320x240.ogv^headers^ b/dom/media/test/320x240.ogv^headers^
similarity index 100%
rename from content/media/test/320x240.ogv^headers^
rename to dom/media/test/320x240.ogv^headers^
diff --git a/content/media/test/448636.ogv b/dom/media/test/448636.ogv
similarity index 100%
rename from content/media/test/448636.ogv
rename to dom/media/test/448636.ogv
diff --git a/content/media/test/448636.ogv^headers^ b/dom/media/test/448636.ogv^headers^
similarity index 100%
rename from content/media/test/448636.ogv^headers^
rename to dom/media/test/448636.ogv^headers^
diff --git a/content/media/test/VID_0001.ogg b/dom/media/test/VID_0001.ogg
similarity index 100%
rename from content/media/test/VID_0001.ogg
rename to dom/media/test/VID_0001.ogg
diff --git a/content/media/test/VID_0001.ogg^headers^ b/dom/media/test/VID_0001.ogg^headers^
similarity index 100%
rename from content/media/test/VID_0001.ogg^headers^
rename to dom/media/test/VID_0001.ogg^headers^
diff --git a/content/media/test/allowed.sjs b/dom/media/test/allowed.sjs
similarity index 97%
rename from content/media/test/allowed.sjs
rename to dom/media/test/allowed.sjs
index daf6a4f7fd4..281f8b43e18 100644
--- a/content/media/test/allowed.sjs
+++ b/dom/media/test/allowed.sjs
@@ -33,7 +33,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/" + resource;
+  var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/audio-gaps.ogg b/dom/media/test/audio-gaps.ogg
similarity index 100%
rename from content/media/test/audio-gaps.ogg
rename to dom/media/test/audio-gaps.ogg
diff --git a/content/media/test/audio-gaps.ogg^headers^ b/dom/media/test/audio-gaps.ogg^headers^
similarity index 100%
rename from content/media/test/audio-gaps.ogg^headers^
rename to dom/media/test/audio-gaps.ogg^headers^
diff --git a/content/media/test/audio-overhang.ogg b/dom/media/test/audio-overhang.ogg
similarity index 100%
rename from content/media/test/audio-overhang.ogg
rename to dom/media/test/audio-overhang.ogg
diff --git a/content/media/test/audio-overhang.ogg^headers^ b/dom/media/test/audio-overhang.ogg^headers^
similarity index 100%
rename from content/media/test/audio-overhang.ogg^headers^
rename to dom/media/test/audio-overhang.ogg^headers^
diff --git a/content/media/test/audio.wav b/dom/media/test/audio.wav
similarity index 100%
rename from content/media/test/audio.wav
rename to dom/media/test/audio.wav
diff --git a/content/media/test/audio.wav^headers^ b/dom/media/test/audio.wav^headers^
similarity index 100%
rename from content/media/test/audio.wav^headers^
rename to dom/media/test/audio.wav^headers^
diff --git a/content/media/test/bad-signature.vtt b/dom/media/test/bad-signature.vtt
similarity index 100%
rename from content/media/test/bad-signature.vtt
rename to dom/media/test/bad-signature.vtt
diff --git a/content/media/test/badtags.ogg b/dom/media/test/badtags.ogg
similarity index 100%
rename from content/media/test/badtags.ogg
rename to dom/media/test/badtags.ogg
diff --git a/content/media/test/badtags.ogg^headers^ b/dom/media/test/badtags.ogg^headers^
similarity index 100%
rename from content/media/test/badtags.ogg^headers^
rename to dom/media/test/badtags.ogg^headers^
diff --git a/content/media/test/basic.vtt b/dom/media/test/basic.vtt
similarity index 100%
rename from content/media/test/basic.vtt
rename to dom/media/test/basic.vtt
diff --git a/content/media/test/beta-phrasebook.ogg b/dom/media/test/beta-phrasebook.ogg
similarity index 100%
rename from content/media/test/beta-phrasebook.ogg
rename to dom/media/test/beta-phrasebook.ogg
diff --git a/content/media/test/beta-phrasebook.ogg^headers^ b/dom/media/test/beta-phrasebook.ogg^headers^
similarity index 100%
rename from content/media/test/beta-phrasebook.ogg^headers^
rename to dom/media/test/beta-phrasebook.ogg^headers^
diff --git a/content/media/test/big.wav b/dom/media/test/big.wav
similarity index 100%
rename from content/media/test/big.wav
rename to dom/media/test/big.wav
diff --git a/content/media/test/big.wav^headers^ b/dom/media/test/big.wav^headers^
similarity index 100%
rename from content/media/test/big.wav^headers^
rename to dom/media/test/big.wav^headers^
diff --git a/content/media/test/bogus.duh b/dom/media/test/bogus.duh
similarity index 100%
rename from content/media/test/bogus.duh
rename to dom/media/test/bogus.duh
diff --git a/content/media/test/bogus.ogv b/dom/media/test/bogus.ogv
similarity index 100%
rename from content/media/test/bogus.ogv
rename to dom/media/test/bogus.ogv
diff --git a/content/media/test/bogus.ogv^headers^ b/dom/media/test/bogus.ogv^headers^
similarity index 100%
rename from content/media/test/bogus.ogv^headers^
rename to dom/media/test/bogus.ogv^headers^
diff --git a/content/media/test/bogus.wav b/dom/media/test/bogus.wav
similarity index 100%
rename from content/media/test/bogus.wav
rename to dom/media/test/bogus.wav
diff --git a/content/media/test/bogus.wav^headers^ b/dom/media/test/bogus.wav^headers^
similarity index 100%
rename from content/media/test/bogus.wav^headers^
rename to dom/media/test/bogus.wav^headers^
diff --git a/content/media/test/bug1066943.webm b/dom/media/test/bug1066943.webm
similarity index 100%
rename from content/media/test/bug1066943.webm
rename to dom/media/test/bug1066943.webm
diff --git a/content/media/test/bug1066943.webm^headers^ b/dom/media/test/bug1066943.webm^headers^
similarity index 100%
rename from content/media/test/bug1066943.webm^headers^
rename to dom/media/test/bug1066943.webm^headers^
diff --git a/content/media/test/bug461281.ogg b/dom/media/test/bug461281.ogg
similarity index 100%
rename from content/media/test/bug461281.ogg
rename to dom/media/test/bug461281.ogg
diff --git a/content/media/test/bug461281.ogg^headers^ b/dom/media/test/bug461281.ogg^headers^
similarity index 100%
rename from content/media/test/bug461281.ogg^headers^
rename to dom/media/test/bug461281.ogg^headers^
diff --git a/content/media/test/bug482461-theora.ogv b/dom/media/test/bug482461-theora.ogv
similarity index 100%
rename from content/media/test/bug482461-theora.ogv
rename to dom/media/test/bug482461-theora.ogv
diff --git a/content/media/test/bug482461-theora.ogv^headers^ b/dom/media/test/bug482461-theora.ogv^headers^
similarity index 100%
rename from content/media/test/bug482461-theora.ogv^headers^
rename to dom/media/test/bug482461-theora.ogv^headers^
diff --git a/content/media/test/bug482461.ogv b/dom/media/test/bug482461.ogv
similarity index 100%
rename from content/media/test/bug482461.ogv
rename to dom/media/test/bug482461.ogv
diff --git a/content/media/test/bug482461.ogv^headers^ b/dom/media/test/bug482461.ogv^headers^
similarity index 100%
rename from content/media/test/bug482461.ogv^headers^
rename to dom/media/test/bug482461.ogv^headers^
diff --git a/content/media/test/bug495129.ogv b/dom/media/test/bug495129.ogv
similarity index 100%
rename from content/media/test/bug495129.ogv
rename to dom/media/test/bug495129.ogv
diff --git a/content/media/test/bug495129.ogv^headers^ b/dom/media/test/bug495129.ogv^headers^
similarity index 100%
rename from content/media/test/bug495129.ogv^headers^
rename to dom/media/test/bug495129.ogv^headers^
diff --git a/content/media/test/bug495794.ogg b/dom/media/test/bug495794.ogg
similarity index 100%
rename from content/media/test/bug495794.ogg
rename to dom/media/test/bug495794.ogg
diff --git a/content/media/test/bug495794.ogg^headers^ b/dom/media/test/bug495794.ogg^headers^
similarity index 100%
rename from content/media/test/bug495794.ogg^headers^
rename to dom/media/test/bug495794.ogg^headers^
diff --git a/content/media/test/bug498380.ogv b/dom/media/test/bug498380.ogv
similarity index 100%
rename from content/media/test/bug498380.ogv
rename to dom/media/test/bug498380.ogv
diff --git a/content/media/test/bug498380.ogv^headers^ b/dom/media/test/bug498380.ogv^headers^
similarity index 100%
rename from content/media/test/bug498380.ogv^headers^
rename to dom/media/test/bug498380.ogv^headers^
diff --git a/content/media/test/bug498855-1.ogv b/dom/media/test/bug498855-1.ogv
similarity index 100%
rename from content/media/test/bug498855-1.ogv
rename to dom/media/test/bug498855-1.ogv
diff --git a/content/media/test/bug498855-1.ogv^headers^ b/dom/media/test/bug498855-1.ogv^headers^
similarity index 100%
rename from content/media/test/bug498855-1.ogv^headers^
rename to dom/media/test/bug498855-1.ogv^headers^
diff --git a/content/media/test/bug498855-2.ogv b/dom/media/test/bug498855-2.ogv
similarity index 100%
rename from content/media/test/bug498855-2.ogv
rename to dom/media/test/bug498855-2.ogv
diff --git a/content/media/test/bug498855-2.ogv^headers^ b/dom/media/test/bug498855-2.ogv^headers^
similarity index 100%
rename from content/media/test/bug498855-2.ogv^headers^
rename to dom/media/test/bug498855-2.ogv^headers^
diff --git a/content/media/test/bug498855-3.ogv b/dom/media/test/bug498855-3.ogv
similarity index 100%
rename from content/media/test/bug498855-3.ogv
rename to dom/media/test/bug498855-3.ogv
diff --git a/content/media/test/bug498855-3.ogv^headers^ b/dom/media/test/bug498855-3.ogv^headers^
similarity index 100%
rename from content/media/test/bug498855-3.ogv^headers^
rename to dom/media/test/bug498855-3.ogv^headers^
diff --git a/content/media/test/bug499519.ogv b/dom/media/test/bug499519.ogv
similarity index 100%
rename from content/media/test/bug499519.ogv
rename to dom/media/test/bug499519.ogv
diff --git a/content/media/test/bug499519.ogv^headers^ b/dom/media/test/bug499519.ogv^headers^
similarity index 100%
rename from content/media/test/bug499519.ogv^headers^
rename to dom/media/test/bug499519.ogv^headers^
diff --git a/content/media/test/bug500311.ogv b/dom/media/test/bug500311.ogv
similarity index 100%
rename from content/media/test/bug500311.ogv
rename to dom/media/test/bug500311.ogv
diff --git a/content/media/test/bug500311.ogv^headers^ b/dom/media/test/bug500311.ogv^headers^
similarity index 100%
rename from content/media/test/bug500311.ogv^headers^
rename to dom/media/test/bug500311.ogv^headers^
diff --git a/content/media/test/bug501279.ogg b/dom/media/test/bug501279.ogg
similarity index 100%
rename from content/media/test/bug501279.ogg
rename to dom/media/test/bug501279.ogg
diff --git a/content/media/test/bug501279.ogg^headers^ b/dom/media/test/bug501279.ogg^headers^
similarity index 100%
rename from content/media/test/bug501279.ogg^headers^
rename to dom/media/test/bug501279.ogg^headers^
diff --git a/content/media/test/bug504613.ogv b/dom/media/test/bug504613.ogv
similarity index 100%
rename from content/media/test/bug504613.ogv
rename to dom/media/test/bug504613.ogv
diff --git a/content/media/test/bug504613.ogv^headers^ b/dom/media/test/bug504613.ogv^headers^
similarity index 100%
rename from content/media/test/bug504613.ogv^headers^
rename to dom/media/test/bug504613.ogv^headers^
diff --git a/content/media/test/bug504644.ogv b/dom/media/test/bug504644.ogv
similarity index 100%
rename from content/media/test/bug504644.ogv
rename to dom/media/test/bug504644.ogv
diff --git a/content/media/test/bug504644.ogv^headers^ b/dom/media/test/bug504644.ogv^headers^
similarity index 100%
rename from content/media/test/bug504644.ogv^headers^
rename to dom/media/test/bug504644.ogv^headers^
diff --git a/content/media/test/bug504843.ogv b/dom/media/test/bug504843.ogv
similarity index 100%
rename from content/media/test/bug504843.ogv
rename to dom/media/test/bug504843.ogv
diff --git a/content/media/test/bug504843.ogv^headers^ b/dom/media/test/bug504843.ogv^headers^
similarity index 100%
rename from content/media/test/bug504843.ogv^headers^
rename to dom/media/test/bug504843.ogv^headers^
diff --git a/content/media/test/bug506094.ogv b/dom/media/test/bug506094.ogv
similarity index 100%
rename from content/media/test/bug506094.ogv
rename to dom/media/test/bug506094.ogv
diff --git a/content/media/test/bug506094.ogv^headers^ b/dom/media/test/bug506094.ogv^headers^
similarity index 100%
rename from content/media/test/bug506094.ogv^headers^
rename to dom/media/test/bug506094.ogv^headers^
diff --git a/content/media/test/bug516323.indexed.ogv b/dom/media/test/bug516323.indexed.ogv
similarity index 100%
rename from content/media/test/bug516323.indexed.ogv
rename to dom/media/test/bug516323.indexed.ogv
diff --git a/content/media/test/bug516323.indexed.ogv^headers^ b/dom/media/test/bug516323.indexed.ogv^headers^
similarity index 100%
rename from content/media/test/bug516323.indexed.ogv^headers^
rename to dom/media/test/bug516323.indexed.ogv^headers^
diff --git a/content/media/test/bug516323.ogv b/dom/media/test/bug516323.ogv
similarity index 100%
rename from content/media/test/bug516323.ogv
rename to dom/media/test/bug516323.ogv
diff --git a/content/media/test/bug516323.ogv^headers^ b/dom/media/test/bug516323.ogv^headers^
similarity index 100%
rename from content/media/test/bug516323.ogv^headers^
rename to dom/media/test/bug516323.ogv^headers^
diff --git a/content/media/test/bug520493.ogg b/dom/media/test/bug520493.ogg
similarity index 100%
rename from content/media/test/bug520493.ogg
rename to dom/media/test/bug520493.ogg
diff --git a/content/media/test/bug520493.ogg^headers^ b/dom/media/test/bug520493.ogg^headers^
similarity index 100%
rename from content/media/test/bug520493.ogg^headers^
rename to dom/media/test/bug520493.ogg^headers^
diff --git a/content/media/test/bug520500.ogg b/dom/media/test/bug520500.ogg
similarity index 100%
rename from content/media/test/bug520500.ogg
rename to dom/media/test/bug520500.ogg
diff --git a/content/media/test/bug520500.ogg^headers^ b/dom/media/test/bug520500.ogg^headers^
similarity index 100%
rename from content/media/test/bug520500.ogg^headers^
rename to dom/media/test/bug520500.ogg^headers^
diff --git a/content/media/test/bug520908.ogv b/dom/media/test/bug520908.ogv
similarity index 100%
rename from content/media/test/bug520908.ogv
rename to dom/media/test/bug520908.ogv
diff --git a/content/media/test/bug520908.ogv^headers^ b/dom/media/test/bug520908.ogv^headers^
similarity index 100%
rename from content/media/test/bug520908.ogv^headers^
rename to dom/media/test/bug520908.ogv^headers^
diff --git a/content/media/test/bug523816.ogv b/dom/media/test/bug523816.ogv
similarity index 100%
rename from content/media/test/bug523816.ogv
rename to dom/media/test/bug523816.ogv
diff --git a/content/media/test/bug523816.ogv^headers^ b/dom/media/test/bug523816.ogv^headers^
similarity index 100%
rename from content/media/test/bug523816.ogv^headers^
rename to dom/media/test/bug523816.ogv^headers^
diff --git a/content/media/test/bug533822.ogg b/dom/media/test/bug533822.ogg
similarity index 100%
rename from content/media/test/bug533822.ogg
rename to dom/media/test/bug533822.ogg
diff --git a/content/media/test/bug533822.ogg^headers^ b/dom/media/test/bug533822.ogg^headers^
similarity index 100%
rename from content/media/test/bug533822.ogg^headers^
rename to dom/media/test/bug533822.ogg^headers^
diff --git a/content/media/test/bug556821.ogv b/dom/media/test/bug556821.ogv
similarity index 100%
rename from content/media/test/bug556821.ogv
rename to dom/media/test/bug556821.ogv
diff --git a/content/media/test/bug556821.ogv^headers^ b/dom/media/test/bug556821.ogv^headers^
similarity index 100%
rename from content/media/test/bug556821.ogv^headers^
rename to dom/media/test/bug556821.ogv^headers^
diff --git a/content/media/test/bug557094.ogv b/dom/media/test/bug557094.ogv
similarity index 100%
rename from content/media/test/bug557094.ogv
rename to dom/media/test/bug557094.ogv
diff --git a/content/media/test/bug557094.ogv^headers^ b/dom/media/test/bug557094.ogv^headers^
similarity index 100%
rename from content/media/test/bug557094.ogv^headers^
rename to dom/media/test/bug557094.ogv^headers^
diff --git a/content/media/test/bug580982.webm b/dom/media/test/bug580982.webm
similarity index 100%
rename from content/media/test/bug580982.webm
rename to dom/media/test/bug580982.webm
diff --git a/content/media/test/bug580982.webm^headers^ b/dom/media/test/bug580982.webm^headers^
similarity index 100%
rename from content/media/test/bug580982.webm^headers^
rename to dom/media/test/bug580982.webm^headers^
diff --git a/content/media/test/bug603918.webm b/dom/media/test/bug603918.webm
similarity index 100%
rename from content/media/test/bug603918.webm
rename to dom/media/test/bug603918.webm
diff --git a/content/media/test/bug603918.webm^headers^ b/dom/media/test/bug603918.webm^headers^
similarity index 100%
rename from content/media/test/bug603918.webm^headers^
rename to dom/media/test/bug603918.webm^headers^
diff --git a/content/media/test/bug604067.webm b/dom/media/test/bug604067.webm
similarity index 100%
rename from content/media/test/bug604067.webm
rename to dom/media/test/bug604067.webm
diff --git a/content/media/test/bug604067.webm^headers^ b/dom/media/test/bug604067.webm^headers^
similarity index 100%
rename from content/media/test/bug604067.webm^headers^
rename to dom/media/test/bug604067.webm^headers^
diff --git a/content/media/test/bug883173.vtt b/dom/media/test/bug883173.vtt
similarity index 100%
rename from content/media/test/bug883173.vtt
rename to dom/media/test/bug883173.vtt
diff --git a/content/media/test/can_play_type_dash.js b/dom/media/test/can_play_type_dash.js
similarity index 100%
rename from content/media/test/can_play_type_dash.js
rename to dom/media/test/can_play_type_dash.js
diff --git a/content/media/test/can_play_type_ogg.js b/dom/media/test/can_play_type_ogg.js
similarity index 100%
rename from content/media/test/can_play_type_ogg.js
rename to dom/media/test/can_play_type_ogg.js
diff --git a/content/media/test/can_play_type_wave.js b/dom/media/test/can_play_type_wave.js
similarity index 100%
rename from content/media/test/can_play_type_wave.js
rename to dom/media/test/can_play_type_wave.js
diff --git a/content/media/test/can_play_type_webm.js b/dom/media/test/can_play_type_webm.js
similarity index 100%
rename from content/media/test/can_play_type_webm.js
rename to dom/media/test/can_play_type_webm.js
diff --git a/content/media/test/cancellable_request.sjs b/dom/media/test/cancellable_request.sjs
similarity index 100%
rename from content/media/test/cancellable_request.sjs
rename to dom/media/test/cancellable_request.sjs
diff --git a/content/media/test/chain.ogg b/dom/media/test/chain.ogg
similarity index 100%
rename from content/media/test/chain.ogg
rename to dom/media/test/chain.ogg
diff --git a/content/media/test/chain.ogg^headers^ b/dom/media/test/chain.ogg^headers^
similarity index 100%
rename from content/media/test/chain.ogg^headers^
rename to dom/media/test/chain.ogg^headers^
diff --git a/content/media/test/chain.ogv b/dom/media/test/chain.ogv
similarity index 100%
rename from content/media/test/chain.ogv
rename to dom/media/test/chain.ogv
diff --git a/content/media/test/chain.ogv^headers^ b/dom/media/test/chain.ogv^headers^
similarity index 100%
rename from content/media/test/chain.ogv^headers^
rename to dom/media/test/chain.ogv^headers^
diff --git a/content/media/test/chain.opus b/dom/media/test/chain.opus
similarity index 100%
rename from content/media/test/chain.opus
rename to dom/media/test/chain.opus
diff --git a/content/media/test/chain.opus^headers^ b/dom/media/test/chain.opus^headers^
similarity index 100%
rename from content/media/test/chain.opus^headers^
rename to dom/media/test/chain.opus^headers^
diff --git a/content/media/test/chained-audio-video.ogg b/dom/media/test/chained-audio-video.ogg
similarity index 100%
rename from content/media/test/chained-audio-video.ogg
rename to dom/media/test/chained-audio-video.ogg
diff --git a/content/media/test/chained-audio-video.ogg^headers^ b/dom/media/test/chained-audio-video.ogg^headers^
similarity index 100%
rename from content/media/test/chained-audio-video.ogg^headers^
rename to dom/media/test/chained-audio-video.ogg^headers^
diff --git a/content/media/test/chained-video.ogv b/dom/media/test/chained-video.ogv
similarity index 100%
rename from content/media/test/chained-video.ogv
rename to dom/media/test/chained-video.ogv
diff --git a/content/media/test/chained-video.ogv^headers^ b/dom/media/test/chained-video.ogv^headers^
similarity index 100%
rename from content/media/test/chained-video.ogv^headers^
rename to dom/media/test/chained-video.ogv^headers^
diff --git a/content/media/test/chrome.ini b/dom/media/test/chrome.ini
similarity index 100%
rename from content/media/test/chrome.ini
rename to dom/media/test/chrome.ini
diff --git a/content/media/test/contentDuration1.sjs b/dom/media/test/contentDuration1.sjs
similarity index 95%
rename from content/media/test/contentDuration1.sjs
rename to dom/media/test/contentDuration1.sjs
index 59fcfad26c0..0e21c95488c 100644
--- a/content/media/test/contentDuration1.sjs
+++ b/dom/media/test/contentDuration1.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration2.sjs b/dom/media/test/contentDuration2.sjs
similarity index 95%
rename from content/media/test/contentDuration2.sjs
rename to dom/media/test/contentDuration2.sjs
index 09678fb7e59..259e8b09a3a 100644
--- a/content/media/test/contentDuration2.sjs
+++ b/dom/media/test/contentDuration2.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration3.sjs b/dom/media/test/contentDuration3.sjs
similarity index 95%
rename from content/media/test/contentDuration3.sjs
rename to dom/media/test/contentDuration3.sjs
index 63af808c876..25a7570caa6 100644
--- a/content/media/test/contentDuration3.sjs
+++ b/dom/media/test/contentDuration3.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration4.sjs b/dom/media/test/contentDuration4.sjs
similarity index 95%
rename from content/media/test/contentDuration4.sjs
rename to dom/media/test/contentDuration4.sjs
index 5e06799c186..540f48857dc 100644
--- a/content/media/test/contentDuration4.sjs
+++ b/dom/media/test/contentDuration4.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration5.sjs b/dom/media/test/contentDuration5.sjs
similarity index 95%
rename from content/media/test/contentDuration5.sjs
rename to dom/media/test/contentDuration5.sjs
index c853afdc506..71fb71101ed 100644
--- a/content/media/test/contentDuration5.sjs
+++ b/dom/media/test/contentDuration5.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration6.sjs b/dom/media/test/contentDuration6.sjs
similarity index 95%
rename from content/media/test/contentDuration6.sjs
rename to dom/media/test/contentDuration6.sjs
index 4755beb8ca1..0cd9bee8713 100644
--- a/content/media/test/contentDuration6.sjs
+++ b/dom/media/test/contentDuration6.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentDuration7.sjs b/dom/media/test/contentDuration7.sjs
similarity index 95%
rename from content/media/test/contentDuration7.sjs
rename to dom/media/test/contentDuration7.sjs
index 5bf0101173b..53eaaff4a9c 100644
--- a/content/media/test/contentDuration7.sjs
+++ b/dom/media/test/contentDuration7.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/contentType.sjs b/dom/media/test/contentType.sjs
similarity index 98%
rename from content/media/test/contentType.sjs
rename to dom/media/test/contentType.sjs
index b6eb757c3c9..d79cdf03404 100644
--- a/content/media/test/contentType.sjs
+++ b/dom/media/test/contentType.sjs
@@ -30,7 +30,7 @@ function handleRequest(request, response) {
       createInstance(Components.interfaces.nsIFileInputStream);
     var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
       createInstance(Components.interfaces.nsIBinaryInputStream);
-    var paths = "tests/content/media/test/" + filename;
+    var paths = "tests/dom/media/test/" + filename;
     dump(paths + '\n');
     var split = paths.split("/");
     for(var i = 0; i < split.length; ++i) {
diff --git a/content/media/test/crashtests/0-timescale.html b/dom/media/test/crashtests/0-timescale.html
similarity index 100%
rename from content/media/test/crashtests/0-timescale.html
rename to dom/media/test/crashtests/0-timescale.html
diff --git a/content/media/test/crashtests/0-timescale.mp4 b/dom/media/test/crashtests/0-timescale.mp4
similarity index 100%
rename from content/media/test/crashtests/0-timescale.mp4
rename to dom/media/test/crashtests/0-timescale.mp4
diff --git a/content/media/test/crashtests/1015662.html b/dom/media/test/crashtests/1015662.html
similarity index 100%
rename from content/media/test/crashtests/1015662.html
rename to dom/media/test/crashtests/1015662.html
diff --git a/content/media/test/crashtests/1028458.html b/dom/media/test/crashtests/1028458.html
similarity index 100%
rename from content/media/test/crashtests/1028458.html
rename to dom/media/test/crashtests/1028458.html
diff --git a/content/media/test/crashtests/1080986.html b/dom/media/test/crashtests/1080986.html
similarity index 100%
rename from content/media/test/crashtests/1080986.html
rename to dom/media/test/crashtests/1080986.html
diff --git a/content/media/test/crashtests/1080986.wav b/dom/media/test/crashtests/1080986.wav
similarity index 100%
rename from content/media/test/crashtests/1080986.wav
rename to dom/media/test/crashtests/1080986.wav
diff --git a/content/media/test/crashtests/459439-1.html b/dom/media/test/crashtests/459439-1.html
similarity index 100%
rename from content/media/test/crashtests/459439-1.html
rename to dom/media/test/crashtests/459439-1.html
diff --git a/content/media/test/crashtests/466607-1.html b/dom/media/test/crashtests/466607-1.html
similarity index 100%
rename from content/media/test/crashtests/466607-1.html
rename to dom/media/test/crashtests/466607-1.html
diff --git a/content/media/test/crashtests/466945-1.html b/dom/media/test/crashtests/466945-1.html
similarity index 100%
rename from content/media/test/crashtests/466945-1.html
rename to dom/media/test/crashtests/466945-1.html
diff --git a/content/media/test/crashtests/468763-1.html b/dom/media/test/crashtests/468763-1.html
similarity index 100%
rename from content/media/test/crashtests/468763-1.html
rename to dom/media/test/crashtests/468763-1.html
diff --git a/content/media/test/crashtests/474744-1.html b/dom/media/test/crashtests/474744-1.html
similarity index 100%
rename from content/media/test/crashtests/474744-1.html
rename to dom/media/test/crashtests/474744-1.html
diff --git a/content/media/test/crashtests/481136-1.html b/dom/media/test/crashtests/481136-1.html
similarity index 100%
rename from content/media/test/crashtests/481136-1.html
rename to dom/media/test/crashtests/481136-1.html
diff --git a/content/media/test/crashtests/492286-1.xhtml b/dom/media/test/crashtests/492286-1.xhtml
similarity index 100%
rename from content/media/test/crashtests/492286-1.xhtml
rename to dom/media/test/crashtests/492286-1.xhtml
diff --git a/content/media/test/crashtests/493915-1.html b/dom/media/test/crashtests/493915-1.html
similarity index 100%
rename from content/media/test/crashtests/493915-1.html
rename to dom/media/test/crashtests/493915-1.html
diff --git a/content/media/test/crashtests/495794-1.html b/dom/media/test/crashtests/495794-1.html
similarity index 100%
rename from content/media/test/crashtests/495794-1.html
rename to dom/media/test/crashtests/495794-1.html
diff --git a/content/media/test/crashtests/495794-1.ogg b/dom/media/test/crashtests/495794-1.ogg
similarity index 100%
rename from content/media/test/crashtests/495794-1.ogg
rename to dom/media/test/crashtests/495794-1.ogg
diff --git a/content/media/test/crashtests/576612-1.html b/dom/media/test/crashtests/576612-1.html
similarity index 100%
rename from content/media/test/crashtests/576612-1.html
rename to dom/media/test/crashtests/576612-1.html
diff --git a/content/media/test/crashtests/691096-1.html b/dom/media/test/crashtests/691096-1.html
similarity index 100%
rename from content/media/test/crashtests/691096-1.html
rename to dom/media/test/crashtests/691096-1.html
diff --git a/content/media/test/crashtests/752784-1.html b/dom/media/test/crashtests/752784-1.html
similarity index 100%
rename from content/media/test/crashtests/752784-1.html
rename to dom/media/test/crashtests/752784-1.html
diff --git a/content/media/test/crashtests/789075-1.html b/dom/media/test/crashtests/789075-1.html
similarity index 100%
rename from content/media/test/crashtests/789075-1.html
rename to dom/media/test/crashtests/789075-1.html
diff --git a/content/media/test/crashtests/789075.webm b/dom/media/test/crashtests/789075.webm
similarity index 100%
rename from content/media/test/crashtests/789075.webm
rename to dom/media/test/crashtests/789075.webm
diff --git a/content/media/test/crashtests/795892-1.html b/dom/media/test/crashtests/795892-1.html
similarity index 100%
rename from content/media/test/crashtests/795892-1.html
rename to dom/media/test/crashtests/795892-1.html
diff --git a/content/media/test/crashtests/844563.html b/dom/media/test/crashtests/844563.html
similarity index 100%
rename from content/media/test/crashtests/844563.html
rename to dom/media/test/crashtests/844563.html
diff --git a/content/media/test/crashtests/846612.html b/dom/media/test/crashtests/846612.html
similarity index 100%
rename from content/media/test/crashtests/846612.html
rename to dom/media/test/crashtests/846612.html
diff --git a/content/media/test/crashtests/852838.html b/dom/media/test/crashtests/852838.html
similarity index 100%
rename from content/media/test/crashtests/852838.html
rename to dom/media/test/crashtests/852838.html
diff --git a/content/media/test/crashtests/865537-1.html b/dom/media/test/crashtests/865537-1.html
similarity index 100%
rename from content/media/test/crashtests/865537-1.html
rename to dom/media/test/crashtests/865537-1.html
diff --git a/content/media/test/crashtests/868504.html b/dom/media/test/crashtests/868504.html
similarity index 100%
rename from content/media/test/crashtests/868504.html
rename to dom/media/test/crashtests/868504.html
diff --git a/content/media/test/crashtests/874869.html b/dom/media/test/crashtests/874869.html
similarity index 100%
rename from content/media/test/crashtests/874869.html
rename to dom/media/test/crashtests/874869.html
diff --git a/content/media/test/crashtests/874915.html b/dom/media/test/crashtests/874915.html
similarity index 100%
rename from content/media/test/crashtests/874915.html
rename to dom/media/test/crashtests/874915.html
diff --git a/content/media/test/crashtests/874934.html b/dom/media/test/crashtests/874934.html
similarity index 100%
rename from content/media/test/crashtests/874934.html
rename to dom/media/test/crashtests/874934.html
diff --git a/content/media/test/crashtests/874952.html b/dom/media/test/crashtests/874952.html
similarity index 100%
rename from content/media/test/crashtests/874952.html
rename to dom/media/test/crashtests/874952.html
diff --git a/content/media/test/crashtests/875144.html b/dom/media/test/crashtests/875144.html
similarity index 100%
rename from content/media/test/crashtests/875144.html
rename to dom/media/test/crashtests/875144.html
diff --git a/content/media/test/crashtests/875596.html b/dom/media/test/crashtests/875596.html
similarity index 100%
rename from content/media/test/crashtests/875596.html
rename to dom/media/test/crashtests/875596.html
diff --git a/content/media/test/crashtests/875911.html b/dom/media/test/crashtests/875911.html
similarity index 100%
rename from content/media/test/crashtests/875911.html
rename to dom/media/test/crashtests/875911.html
diff --git a/content/media/test/crashtests/876024-1.html b/dom/media/test/crashtests/876024-1.html
similarity index 100%
rename from content/media/test/crashtests/876024-1.html
rename to dom/media/test/crashtests/876024-1.html
diff --git a/content/media/test/crashtests/876024-2.html b/dom/media/test/crashtests/876024-2.html
similarity index 100%
rename from content/media/test/crashtests/876024-2.html
rename to dom/media/test/crashtests/876024-2.html
diff --git a/content/media/test/crashtests/876118.html b/dom/media/test/crashtests/876118.html
similarity index 100%
rename from content/media/test/crashtests/876118.html
rename to dom/media/test/crashtests/876118.html
diff --git a/content/media/test/crashtests/876207.html b/dom/media/test/crashtests/876207.html
similarity index 100%
rename from content/media/test/crashtests/876207.html
rename to dom/media/test/crashtests/876207.html
diff --git a/content/media/test/crashtests/876215.html b/dom/media/test/crashtests/876215.html
similarity index 100%
rename from content/media/test/crashtests/876215.html
rename to dom/media/test/crashtests/876215.html
diff --git a/content/media/test/crashtests/876249.html b/dom/media/test/crashtests/876249.html
similarity index 100%
rename from content/media/test/crashtests/876249.html
rename to dom/media/test/crashtests/876249.html
diff --git a/content/media/test/crashtests/876252.html b/dom/media/test/crashtests/876252.html
similarity index 100%
rename from content/media/test/crashtests/876252.html
rename to dom/media/test/crashtests/876252.html
diff --git a/content/media/test/crashtests/876834.html b/dom/media/test/crashtests/876834.html
similarity index 100%
rename from content/media/test/crashtests/876834.html
rename to dom/media/test/crashtests/876834.html
diff --git a/content/media/test/crashtests/877527.html b/dom/media/test/crashtests/877527.html
similarity index 100%
rename from content/media/test/crashtests/877527.html
rename to dom/media/test/crashtests/877527.html
diff --git a/content/media/test/crashtests/877820.html b/dom/media/test/crashtests/877820.html
similarity index 100%
rename from content/media/test/crashtests/877820.html
rename to dom/media/test/crashtests/877820.html
diff --git a/content/media/test/crashtests/878014.html b/dom/media/test/crashtests/878014.html
similarity index 100%
rename from content/media/test/crashtests/878014.html
rename to dom/media/test/crashtests/878014.html
diff --git a/content/media/test/crashtests/878328.html b/dom/media/test/crashtests/878328.html
similarity index 100%
rename from content/media/test/crashtests/878328.html
rename to dom/media/test/crashtests/878328.html
diff --git a/content/media/test/crashtests/878407.html b/dom/media/test/crashtests/878407.html
similarity index 100%
rename from content/media/test/crashtests/878407.html
rename to dom/media/test/crashtests/878407.html
diff --git a/content/media/test/crashtests/878478.html b/dom/media/test/crashtests/878478.html
similarity index 100%
rename from content/media/test/crashtests/878478.html
rename to dom/media/test/crashtests/878478.html
diff --git a/content/media/test/crashtests/880129.html b/dom/media/test/crashtests/880129.html
similarity index 100%
rename from content/media/test/crashtests/880129.html
rename to dom/media/test/crashtests/880129.html
diff --git a/content/media/test/crashtests/880202.html b/dom/media/test/crashtests/880202.html
similarity index 100%
rename from content/media/test/crashtests/880202.html
rename to dom/media/test/crashtests/880202.html
diff --git a/content/media/test/crashtests/880342-1.html b/dom/media/test/crashtests/880342-1.html
similarity index 100%
rename from content/media/test/crashtests/880342-1.html
rename to dom/media/test/crashtests/880342-1.html
diff --git a/content/media/test/crashtests/880342-2.html b/dom/media/test/crashtests/880342-2.html
similarity index 100%
rename from content/media/test/crashtests/880342-2.html
rename to dom/media/test/crashtests/880342-2.html
diff --git a/content/media/test/crashtests/880384.html b/dom/media/test/crashtests/880384.html
similarity index 100%
rename from content/media/test/crashtests/880384.html
rename to dom/media/test/crashtests/880384.html
diff --git a/content/media/test/crashtests/880404.html b/dom/media/test/crashtests/880404.html
similarity index 100%
rename from content/media/test/crashtests/880404.html
rename to dom/media/test/crashtests/880404.html
diff --git a/content/media/test/crashtests/880724.html b/dom/media/test/crashtests/880724.html
similarity index 100%
rename from content/media/test/crashtests/880724.html
rename to dom/media/test/crashtests/880724.html
diff --git a/content/media/test/crashtests/881775.html b/dom/media/test/crashtests/881775.html
similarity index 100%
rename from content/media/test/crashtests/881775.html
rename to dom/media/test/crashtests/881775.html
diff --git a/content/media/test/crashtests/882549.html b/dom/media/test/crashtests/882549.html
similarity index 100%
rename from content/media/test/crashtests/882549.html
rename to dom/media/test/crashtests/882549.html
diff --git a/content/media/test/crashtests/882956.html b/dom/media/test/crashtests/882956.html
similarity index 100%
rename from content/media/test/crashtests/882956.html
rename to dom/media/test/crashtests/882956.html
diff --git a/content/media/test/crashtests/884459.html b/dom/media/test/crashtests/884459.html
similarity index 100%
rename from content/media/test/crashtests/884459.html
rename to dom/media/test/crashtests/884459.html
diff --git a/content/media/test/crashtests/889042.html b/dom/media/test/crashtests/889042.html
similarity index 100%
rename from content/media/test/crashtests/889042.html
rename to dom/media/test/crashtests/889042.html
diff --git a/content/media/test/crashtests/894104.html b/dom/media/test/crashtests/894104.html
similarity index 100%
rename from content/media/test/crashtests/894104.html
rename to dom/media/test/crashtests/894104.html
diff --git a/content/media/test/crashtests/907986-1.html b/dom/media/test/crashtests/907986-1.html
similarity index 100%
rename from content/media/test/crashtests/907986-1.html
rename to dom/media/test/crashtests/907986-1.html
diff --git a/content/media/test/crashtests/907986-2.html b/dom/media/test/crashtests/907986-2.html
similarity index 100%
rename from content/media/test/crashtests/907986-2.html
rename to dom/media/test/crashtests/907986-2.html
diff --git a/content/media/test/crashtests/907986-3.html b/dom/media/test/crashtests/907986-3.html
similarity index 100%
rename from content/media/test/crashtests/907986-3.html
rename to dom/media/test/crashtests/907986-3.html
diff --git a/content/media/test/crashtests/907986-4.html b/dom/media/test/crashtests/907986-4.html
similarity index 100%
rename from content/media/test/crashtests/907986-4.html
rename to dom/media/test/crashtests/907986-4.html
diff --git a/content/media/test/crashtests/910171-1.html b/dom/media/test/crashtests/910171-1.html
similarity index 100%
rename from content/media/test/crashtests/910171-1.html
rename to dom/media/test/crashtests/910171-1.html
diff --git a/content/media/test/crashtests/920987.html b/dom/media/test/crashtests/920987.html
similarity index 100%
rename from content/media/test/crashtests/920987.html
rename to dom/media/test/crashtests/920987.html
diff --git a/content/media/test/crashtests/925619-1.html b/dom/media/test/crashtests/925619-1.html
similarity index 100%
rename from content/media/test/crashtests/925619-1.html
rename to dom/media/test/crashtests/925619-1.html
diff --git a/content/media/test/crashtests/925619-2.html b/dom/media/test/crashtests/925619-2.html
similarity index 100%
rename from content/media/test/crashtests/925619-2.html
rename to dom/media/test/crashtests/925619-2.html
diff --git a/content/media/test/crashtests/926619.html b/dom/media/test/crashtests/926619.html
similarity index 100%
rename from content/media/test/crashtests/926619.html
rename to dom/media/test/crashtests/926619.html
diff --git a/content/media/test/crashtests/933151.html b/dom/media/test/crashtests/933151.html
similarity index 100%
rename from content/media/test/crashtests/933151.html
rename to dom/media/test/crashtests/933151.html
diff --git a/content/media/test/crashtests/933156.html b/dom/media/test/crashtests/933156.html
similarity index 100%
rename from content/media/test/crashtests/933156.html
rename to dom/media/test/crashtests/933156.html
diff --git a/content/media/test/crashtests/944851.html b/dom/media/test/crashtests/944851.html
similarity index 100%
rename from content/media/test/crashtests/944851.html
rename to dom/media/test/crashtests/944851.html
diff --git a/content/media/test/crashtests/952756.html b/dom/media/test/crashtests/952756.html
similarity index 100%
rename from content/media/test/crashtests/952756.html
rename to dom/media/test/crashtests/952756.html
diff --git a/content/media/test/crashtests/966636.html b/dom/media/test/crashtests/966636.html
similarity index 100%
rename from content/media/test/crashtests/966636.html
rename to dom/media/test/crashtests/966636.html
diff --git a/content/media/test/crashtests/986901.html b/dom/media/test/crashtests/986901.html
similarity index 100%
rename from content/media/test/crashtests/986901.html
rename to dom/media/test/crashtests/986901.html
diff --git a/content/media/test/crashtests/990794.html b/dom/media/test/crashtests/990794.html
similarity index 100%
rename from content/media/test/crashtests/990794.html
rename to dom/media/test/crashtests/990794.html
diff --git a/content/media/test/crashtests/buffer-source-ended-1.html b/dom/media/test/crashtests/buffer-source-ended-1.html
similarity index 100%
rename from content/media/test/crashtests/buffer-source-ended-1.html
rename to dom/media/test/crashtests/buffer-source-ended-1.html
diff --git a/content/media/test/crashtests/cors.webm b/dom/media/test/crashtests/cors.webm
similarity index 100%
rename from content/media/test/crashtests/cors.webm
rename to dom/media/test/crashtests/cors.webm
diff --git a/content/media/test/crashtests/cors.webm^headers^ b/dom/media/test/crashtests/cors.webm^headers^
similarity index 100%
rename from content/media/test/crashtests/cors.webm^headers^
rename to dom/media/test/crashtests/cors.webm^headers^
diff --git a/content/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
similarity index 100%
rename from content/media/test/crashtests/crashtests.list
rename to dom/media/test/crashtests/crashtests.list
diff --git a/content/media/test/crashtests/media-element-source-seek-1.html b/dom/media/test/crashtests/media-element-source-seek-1.html
similarity index 100%
rename from content/media/test/crashtests/media-element-source-seek-1.html
rename to dom/media/test/crashtests/media-element-source-seek-1.html
diff --git a/content/media/test/crashtests/offline-buffer-source-ended-1.html b/dom/media/test/crashtests/offline-buffer-source-ended-1.html
similarity index 100%
rename from content/media/test/crashtests/offline-buffer-source-ended-1.html
rename to dom/media/test/crashtests/offline-buffer-source-ended-1.html
diff --git a/content/media/test/crashtests/oscillator-ended-1.html b/dom/media/test/crashtests/oscillator-ended-1.html
similarity index 100%
rename from content/media/test/crashtests/oscillator-ended-1.html
rename to dom/media/test/crashtests/oscillator-ended-1.html
diff --git a/content/media/test/crashtests/oscillator-ended-2.html b/dom/media/test/crashtests/oscillator-ended-2.html
similarity index 100%
rename from content/media/test/crashtests/oscillator-ended-2.html
rename to dom/media/test/crashtests/oscillator-ended-2.html
diff --git a/content/media/test/crashtests/sound.ogg b/dom/media/test/crashtests/sound.ogg
similarity index 100%
rename from content/media/test/crashtests/sound.ogg
rename to dom/media/test/crashtests/sound.ogg
diff --git a/content/media/test/dash/dash-manifest-garbled-webm.mpd b/dom/media/test/dash/dash-manifest-garbled-webm.mpd
similarity index 100%
rename from content/media/test/dash/dash-manifest-garbled-webm.mpd
rename to dom/media/test/dash/dash-manifest-garbled-webm.mpd
diff --git a/content/media/test/dash/dash-manifest-garbled.mpd b/dom/media/test/dash/dash-manifest-garbled.mpd
similarity index 100%
rename from content/media/test/dash/dash-manifest-garbled.mpd
rename to dom/media/test/dash/dash-manifest-garbled.mpd
diff --git a/content/media/test/dash/dash-manifest-sjs.mpd b/dom/media/test/dash/dash-manifest-sjs.mpd
similarity index 100%
rename from content/media/test/dash/dash-manifest-sjs.mpd
rename to dom/media/test/dash/dash-manifest-sjs.mpd
diff --git a/content/media/test/dash/dash-manifest.mpd b/dom/media/test/dash/dash-manifest.mpd
similarity index 100%
rename from content/media/test/dash/dash-manifest.mpd
rename to dom/media/test/dash/dash-manifest.mpd
diff --git a/content/media/test/dash/dash-webm-audio-128k.webm b/dom/media/test/dash/dash-webm-audio-128k.webm
similarity index 100%
rename from content/media/test/dash/dash-webm-audio-128k.webm
rename to dom/media/test/dash/dash-webm-audio-128k.webm
diff --git a/content/media/test/dash/dash-webm-video-320x180.webm b/dom/media/test/dash/dash-webm-video-320x180.webm
similarity index 100%
rename from content/media/test/dash/dash-webm-video-320x180.webm
rename to dom/media/test/dash/dash-webm-video-320x180.webm
diff --git a/content/media/test/dash/dash-webm-video-428x240.webm b/dom/media/test/dash/dash-webm-video-428x240.webm
similarity index 100%
rename from content/media/test/dash/dash-webm-video-428x240.webm
rename to dom/media/test/dash/dash-webm-video-428x240.webm
diff --git a/content/media/test/dash/garbled.webm b/dom/media/test/dash/garbled.webm
similarity index 100%
rename from content/media/test/dash/garbled.webm
rename to dom/media/test/dash/garbled.webm
diff --git a/content/media/test/dash_detect_stream_switch.sjs b/dom/media/test/dash_detect_stream_switch.sjs
similarity index 98%
rename from content/media/test/dash_detect_stream_switch.sjs
rename to dom/media/test/dash_detect_stream_switch.sjs
index 3ceecf9c7ea..378db10ca5d 100644
--- a/content/media/test/dash_detect_stream_switch.sjs
+++ b/dom/media/test/dash_detect_stream_switch.sjs
@@ -65,7 +65,7 @@ function handleRequest(request, response)
       var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                             createInstance(Components.interfaces.nsIBinaryInputStream);
 
-      var paths = "tests/content/media/test/" + name;
+      var paths = "tests/dom/media/test/" + name;
       var split = paths.split("/");
       for (var i = 0; i < split.length; ++i) {
         file.append(split[i]);
diff --git a/content/media/test/detodos.opus b/dom/media/test/detodos.opus
similarity index 100%
rename from content/media/test/detodos.opus
rename to dom/media/test/detodos.opus
diff --git a/content/media/test/detodos.opus^headers^ b/dom/media/test/detodos.opus^headers^
similarity index 100%
rename from content/media/test/detodos.opus^headers^
rename to dom/media/test/detodos.opus^headers^
diff --git a/content/media/test/detodos.webm b/dom/media/test/detodos.webm
similarity index 100%
rename from content/media/test/detodos.webm
rename to dom/media/test/detodos.webm
diff --git a/content/media/test/detodos.webm^headers^ b/dom/media/test/detodos.webm^headers^
similarity index 100%
rename from content/media/test/detodos.webm^headers^
rename to dom/media/test/detodos.webm^headers^
diff --git a/content/media/test/dirac.ogg b/dom/media/test/dirac.ogg
similarity index 100%
rename from content/media/test/dirac.ogg
rename to dom/media/test/dirac.ogg
diff --git a/content/media/test/dirac.ogg^headers^ b/dom/media/test/dirac.ogg^headers^
similarity index 100%
rename from content/media/test/dirac.ogg^headers^
rename to dom/media/test/dirac.ogg^headers^
diff --git a/content/media/test/dynamic_redirect.sjs b/dom/media/test/dynamic_redirect.sjs
similarity index 95%
rename from content/media/test/dynamic_redirect.sjs
rename to dom/media/test/dynamic_redirect.sjs
index 4b09e7ea25a..b78272c3307 100644
--- a/content/media/test/dynamic_redirect.sjs
+++ b/dom/media/test/dynamic_redirect.sjs
@@ -22,7 +22,7 @@ function handleRequest(request, response)
   if (getState(key) == "redirect") {
     var origin = request.host == "mochi.test" ? "example.org" : "mochi.test:8888";
     response.setStatusLine(request.httpVersion, 303, "See Other");
-    response.setHeader("Location", "http://" + origin + "/tests/content/media/test/" + resource);
+    response.setHeader("Location", "http://" + origin + "/tests/dom/media/test/" + resource);
     response.setHeader("Content-Type", "text/html");
     return;
   }
@@ -36,7 +36,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/" + resource;
+  var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/dynamic_resource.sjs b/dom/media/test/dynamic_resource.sjs
similarity index 97%
rename from content/media/test/dynamic_resource.sjs
rename to dom/media/test/dynamic_resource.sjs
index 07001375123..12a43f92a59 100644
--- a/content/media/test/dynamic_resource.sjs
+++ b/dom/media/test/dynamic_resource.sjs
@@ -30,7 +30,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/" + resource;
+  var paths = "tests/dom/media/test/" + resource;
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/file_access_controls.html b/dom/media/test/file_access_controls.html
similarity index 86%
rename from content/media/test/file_access_controls.html
rename to dom/media/test/file_access_controls.html
index 90f7b4211fa..ae55154c037 100644
--- a/content/media/test/file_access_controls.html
+++ b/dom/media/test/file_access_controls.html
@@ -5,7 +5,7 @@
 <body onload="setTimeout(load, 0);" onunload="done()">
 <script>
 
-// Page URL: http://example.org/tests/content/media/test/file_access_controls.html
+// Page URL: http://example.org/tests/dom/media/test/file_access_controls.html
 
 var gResource = getPlayableVideo(gSmallTests).name;
 
@@ -37,37 +37,37 @@ var gTests = [
     description: "Can load when redirected to same domain",
   },{
     // Test 5
-    url: "http://example.org/tests/content/media/test/" + gResource,
+    url: "http://example.org/tests/dom/media/test/" + gResource,
     result: "loadeddata",
     description: "Can load from same domain"
   },{
     // Test 6
-    url: "http://example.org:8000/tests/content/media/test/" + gResource,
+    url: "http://example.org:8000/tests/dom/media/test/" + gResource,
     result: "error",
     description: "Won't load from different port on same domain"
   },{
     // Test 7
-    url: "http://example.org:8000/tests/content/media/test/allowed.sjs?" + gResource,
+    url: "http://example.org:8000/tests/dom/media/test/allowed.sjs?" + gResource,
     result: "loadeddata",
     description: "Can load from different port on same domain with allow-origin",
   },{
     // Test 8
-    url: "http://example.com/tests/content/media/test/" + gResource,
+    url: "http://example.com/tests/dom/media/test/" + gResource,
     result: "error",
     description: "Won't load cross domain",
   },{
     // Test 9
-    url: "http://example.com/tests/content/media/test/allowed.sjs?" + gResource,
+    url: "http://example.com/tests/dom/media/test/allowed.sjs?" + gResource,
     result: "loadeddata",
     description: "Can load cross domain with allow-origin",
   },{
     // Test 10
-    url: "http://test1.example.org/tests/content/media/test/allowed.sjs?" + gResource,
+    url: "http://test1.example.org/tests/dom/media/test/allowed.sjs?" + gResource,
     result: "loadeddata",
     description: "Can load from subdomain with allow-origin",
   },{
     // Test 11
-    url: "http://test1.example.org/tests/content/media/test/" + gResource,
+    url: "http://test1.example.org/tests/dom/media/test/" + gResource,
     result: "error",
     description: "Won't load from subdomain",
   }
@@ -97,7 +97,7 @@ function createVideo() {
 }
 
 function load() {
-  opener.postMessage({"result": (window.location.href == "http://example.org/tests/content/media/test/file_access_controls.html"),
+  opener.postMessage({"result": (window.location.href == "http://example.org/tests/dom/media/test/file_access_controls.html"),
                       "message":  "We must be on a example.org:80"},
                      "http://mochi.test:8888");
 
diff --git a/content/media/test/fragment_noplay.js b/dom/media/test/fragment_noplay.js
similarity index 100%
rename from content/media/test/fragment_noplay.js
rename to dom/media/test/fragment_noplay.js
diff --git a/content/media/test/fragment_play.js b/dom/media/test/fragment_play.js
similarity index 100%
rename from content/media/test/fragment_play.js
rename to dom/media/test/fragment_play.js
diff --git a/content/media/test/gizmo-frag-cenc.xml b/dom/media/test/gizmo-frag-cenc.xml
similarity index 100%
rename from content/media/test/gizmo-frag-cenc.xml
rename to dom/media/test/gizmo-frag-cenc.xml
diff --git a/content/media/test/gizmo-frag-cenc1.m4s b/dom/media/test/gizmo-frag-cenc1.m4s
similarity index 100%
rename from content/media/test/gizmo-frag-cenc1.m4s
rename to dom/media/test/gizmo-frag-cenc1.m4s
diff --git a/content/media/test/gizmo-frag-cenc2.m4s b/dom/media/test/gizmo-frag-cenc2.m4s
similarity index 100%
rename from content/media/test/gizmo-frag-cenc2.m4s
rename to dom/media/test/gizmo-frag-cenc2.m4s
diff --git a/content/media/test/gizmo-frag-cencinit.mp4 b/dom/media/test/gizmo-frag-cencinit.mp4
similarity index 100%
rename from content/media/test/gizmo-frag-cencinit.mp4
rename to dom/media/test/gizmo-frag-cencinit.mp4
diff --git a/content/media/test/gizmo.mp4 b/dom/media/test/gizmo.mp4
similarity index 100%
rename from content/media/test/gizmo.mp4
rename to dom/media/test/gizmo.mp4
diff --git a/content/media/test/gizmo.mp4^headers^ b/dom/media/test/gizmo.mp4^headers^
similarity index 100%
rename from content/media/test/gizmo.mp4^headers^
rename to dom/media/test/gizmo.mp4^headers^
diff --git a/content/media/test/graph_latency.py b/dom/media/test/graph_latency.py
similarity index 100%
rename from content/media/test/graph_latency.py
rename to dom/media/test/graph_latency.py
diff --git a/content/media/test/huge-id3.mp3 b/dom/media/test/huge-id3.mp3
similarity index 100%
rename from content/media/test/huge-id3.mp3
rename to dom/media/test/huge-id3.mp3
diff --git a/content/media/test/huge-id3.mp3^headers^ b/dom/media/test/huge-id3.mp3^headers^
similarity index 100%
rename from content/media/test/huge-id3.mp3^headers^
rename to dom/media/test/huge-id3.mp3^headers^
diff --git a/content/media/test/id3tags.mp3 b/dom/media/test/id3tags.mp3
similarity index 100%
rename from content/media/test/id3tags.mp3
rename to dom/media/test/id3tags.mp3
diff --git a/content/media/test/id3tags.mp3^headers^ b/dom/media/test/id3tags.mp3^headers^
similarity index 100%
rename from content/media/test/id3tags.mp3^headers^
rename to dom/media/test/id3tags.mp3^headers^
diff --git a/content/media/test/invalid-cmap-s0c0.opus b/dom/media/test/invalid-cmap-s0c0.opus
similarity index 100%
rename from content/media/test/invalid-cmap-s0c0.opus
rename to dom/media/test/invalid-cmap-s0c0.opus
diff --git a/content/media/test/invalid-cmap-s0c0.opus^headers^ b/dom/media/test/invalid-cmap-s0c0.opus^headers^
similarity index 100%
rename from content/media/test/invalid-cmap-s0c0.opus^headers^
rename to dom/media/test/invalid-cmap-s0c0.opus^headers^
diff --git a/content/media/test/invalid-cmap-s0c2.opus b/dom/media/test/invalid-cmap-s0c2.opus
similarity index 100%
rename from content/media/test/invalid-cmap-s0c2.opus
rename to dom/media/test/invalid-cmap-s0c2.opus
diff --git a/content/media/test/invalid-cmap-s0c2.opus^headers^ b/dom/media/test/invalid-cmap-s0c2.opus^headers^
similarity index 100%
rename from content/media/test/invalid-cmap-s0c2.opus^headers^
rename to dom/media/test/invalid-cmap-s0c2.opus^headers^
diff --git a/content/media/test/invalid-cmap-s1c2.opus b/dom/media/test/invalid-cmap-s1c2.opus
similarity index 100%
rename from content/media/test/invalid-cmap-s1c2.opus
rename to dom/media/test/invalid-cmap-s1c2.opus
diff --git a/content/media/test/invalid-cmap-s1c2.opus^headers^ b/dom/media/test/invalid-cmap-s1c2.opus^headers^
similarity index 100%
rename from content/media/test/invalid-cmap-s1c2.opus^headers^
rename to dom/media/test/invalid-cmap-s1c2.opus^headers^
diff --git a/content/media/test/invalid-cmap-short.opus b/dom/media/test/invalid-cmap-short.opus
similarity index 100%
rename from content/media/test/invalid-cmap-short.opus
rename to dom/media/test/invalid-cmap-short.opus
diff --git a/content/media/test/invalid-cmap-short.opus^headers^ b/dom/media/test/invalid-cmap-short.opus^headers^
similarity index 100%
rename from content/media/test/invalid-cmap-short.opus^headers^
rename to dom/media/test/invalid-cmap-short.opus^headers^
diff --git a/content/media/test/invalid-discard_on_multi_blocks.webm b/dom/media/test/invalid-discard_on_multi_blocks.webm
similarity index 100%
rename from content/media/test/invalid-discard_on_multi_blocks.webm
rename to dom/media/test/invalid-discard_on_multi_blocks.webm
diff --git a/content/media/test/invalid-discard_on_multi_blocks.webm^headers^ b/dom/media/test/invalid-discard_on_multi_blocks.webm^headers^
similarity index 100%
rename from content/media/test/invalid-discard_on_multi_blocks.webm^headers^
rename to dom/media/test/invalid-discard_on_multi_blocks.webm^headers^
diff --git a/content/media/test/invalid-excess_discard.webm b/dom/media/test/invalid-excess_discard.webm
similarity index 100%
rename from content/media/test/invalid-excess_discard.webm
rename to dom/media/test/invalid-excess_discard.webm
diff --git a/content/media/test/invalid-excess_discard.webm^headers^ b/dom/media/test/invalid-excess_discard.webm^headers^
similarity index 100%
rename from content/media/test/invalid-excess_discard.webm^headers^
rename to dom/media/test/invalid-excess_discard.webm^headers^
diff --git a/content/media/test/invalid-excess_neg_discard.webm b/dom/media/test/invalid-excess_neg_discard.webm
similarity index 100%
rename from content/media/test/invalid-excess_neg_discard.webm
rename to dom/media/test/invalid-excess_neg_discard.webm
diff --git a/content/media/test/invalid-excess_neg_discard.webm^headers^ b/dom/media/test/invalid-excess_neg_discard.webm^headers^
similarity index 100%
rename from content/media/test/invalid-excess_neg_discard.webm^headers^
rename to dom/media/test/invalid-excess_neg_discard.webm^headers^
diff --git a/content/media/test/invalid-m0c0.opus b/dom/media/test/invalid-m0c0.opus
similarity index 100%
rename from content/media/test/invalid-m0c0.opus
rename to dom/media/test/invalid-m0c0.opus
diff --git a/content/media/test/invalid-m0c0.opus^headers^ b/dom/media/test/invalid-m0c0.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m0c0.opus^headers^
rename to dom/media/test/invalid-m0c0.opus^headers^
diff --git a/content/media/test/invalid-m0c3.opus b/dom/media/test/invalid-m0c3.opus
similarity index 100%
rename from content/media/test/invalid-m0c3.opus
rename to dom/media/test/invalid-m0c3.opus
diff --git a/content/media/test/invalid-m0c3.opus^headers^ b/dom/media/test/invalid-m0c3.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m0c3.opus^headers^
rename to dom/media/test/invalid-m0c3.opus^headers^
diff --git a/content/media/test/invalid-m1c0.opus b/dom/media/test/invalid-m1c0.opus
similarity index 100%
rename from content/media/test/invalid-m1c0.opus
rename to dom/media/test/invalid-m1c0.opus
diff --git a/content/media/test/invalid-m1c0.opus^headers^ b/dom/media/test/invalid-m1c0.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m1c0.opus^headers^
rename to dom/media/test/invalid-m1c0.opus^headers^
diff --git a/content/media/test/invalid-m1c9.opus b/dom/media/test/invalid-m1c9.opus
similarity index 100%
rename from content/media/test/invalid-m1c9.opus
rename to dom/media/test/invalid-m1c9.opus
diff --git a/content/media/test/invalid-m1c9.opus^headers^ b/dom/media/test/invalid-m1c9.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m1c9.opus^headers^
rename to dom/media/test/invalid-m1c9.opus^headers^
diff --git a/content/media/test/invalid-m2c0.opus b/dom/media/test/invalid-m2c0.opus
similarity index 100%
rename from content/media/test/invalid-m2c0.opus
rename to dom/media/test/invalid-m2c0.opus
diff --git a/content/media/test/invalid-m2c0.opus^headers^ b/dom/media/test/invalid-m2c0.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m2c0.opus^headers^
rename to dom/media/test/invalid-m2c0.opus^headers^
diff --git a/content/media/test/invalid-m2c1.opus b/dom/media/test/invalid-m2c1.opus
similarity index 100%
rename from content/media/test/invalid-m2c1.opus
rename to dom/media/test/invalid-m2c1.opus
diff --git a/content/media/test/invalid-m2c1.opus^headers^ b/dom/media/test/invalid-m2c1.opus^headers^
similarity index 100%
rename from content/media/test/invalid-m2c1.opus^headers^
rename to dom/media/test/invalid-m2c1.opus^headers^
diff --git a/content/media/test/invalid-neg_discard.webm b/dom/media/test/invalid-neg_discard.webm
similarity index 100%
rename from content/media/test/invalid-neg_discard.webm
rename to dom/media/test/invalid-neg_discard.webm
diff --git a/content/media/test/invalid-neg_discard.webm^headers^ b/dom/media/test/invalid-neg_discard.webm^headers^
similarity index 100%
rename from content/media/test/invalid-neg_discard.webm^headers^
rename to dom/media/test/invalid-neg_discard.webm^headers^
diff --git a/content/media/test/invalid-preskip.webm b/dom/media/test/invalid-preskip.webm
similarity index 100%
rename from content/media/test/invalid-preskip.webm
rename to dom/media/test/invalid-preskip.webm
diff --git a/content/media/test/invalid-preskip.webm^headers^ b/dom/media/test/invalid-preskip.webm^headers^
similarity index 100%
rename from content/media/test/invalid-preskip.webm^headers^
rename to dom/media/test/invalid-preskip.webm^headers^
diff --git a/content/media/test/long.vtt b/dom/media/test/long.vtt
similarity index 100%
rename from content/media/test/long.vtt
rename to dom/media/test/long.vtt
diff --git a/content/media/test/make-headers.sh b/dom/media/test/make-headers.sh
similarity index 100%
rename from content/media/test/make-headers.sh
rename to dom/media/test/make-headers.sh
diff --git a/content/media/test/manifest.js b/dom/media/test/manifest.js
similarity index 98%
rename from content/media/test/manifest.js
rename to dom/media/test/manifest.js
index 6d77bff7f86..6d4c87a67e0 100644
--- a/content/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -365,28 +365,28 @@ function range_equals(r1, r2) {
 var gInfoLeakTests = [
   {
     type: 'video/ogg',
-    src: fileUriToSrc("tests/content/media/test/320x240.ogv", true),
+    src: fileUriToSrc("tests/dom/media/test/320x240.ogv", true),
   },{
     type: 'video/ogg',
-    src: fileUriToSrc("tests/content/media/test/404.ogv", false),
+    src: fileUriToSrc("tests/dom/media/test/404.ogv", false),
   }, {
     type: 'audio/x-wav',
-    src: fileUriToSrc("tests/content/media/test/r11025_s16_c1.wav", true),
+    src: fileUriToSrc("tests/dom/media/test/r11025_s16_c1.wav", true),
   }, {
     type: 'audio/x-wav',
-    src: fileUriToSrc("tests/content/media/test/404.wav", false),
+    src: fileUriToSrc("tests/dom/media/test/404.wav", false),
   }, {
     type: 'audio/ogg',
-    src: fileUriToSrc("tests/content/media/test/bug461281.ogg", true),
+    src: fileUriToSrc("tests/dom/media/test/bug461281.ogg", true),
   }, {
     type: 'audio/ogg',
-    src: fileUriToSrc("tests/content/media/test/404.ogg", false),
+    src: fileUriToSrc("tests/dom/media/test/404.ogg", false),
   }, {
     type: 'video/webm',
-    src: fileUriToSrc("tests/content/media/test/seek.webm", true),
+    src: fileUriToSrc("tests/dom/media/test/seek.webm", true),
   }, {
     type: 'video/webm',
-    src: fileUriToSrc("tests/content/media/test/404.webm", false),
+    src: fileUriToSrc("tests/dom/media/test/404.webm", false),
   }, {
     type: 'video/ogg',
     src: 'http://localhost/404.ogv',
@@ -398,10 +398,10 @@ var gInfoLeakTests = [
     src: 'http://localhost/404.webm',
   }, {
     type: 'video/ogg',
-    src: 'http://example.com/tests/content/media/test/test_info_leak.html'
+    src: 'http://example.com/tests/dom/media/test/test_info_leak.html'
   }, {
     type: 'audio/ogg',
-    src: 'http://example.com/tests/content/media/test/test_info_leak.html'
+    src: 'http://example.com/tests/dom/media/test/test_info_leak.html'
   }
 ];
 
diff --git a/content/media/test/mochitest.ini b/dom/media/test/mochitest.ini
similarity index 100%
rename from content/media/test/mochitest.ini
rename to dom/media/test/mochitest.ini
diff --git a/content/media/test/multiple-bos-more-header-fileds.ogg b/dom/media/test/multiple-bos-more-header-fileds.ogg
similarity index 100%
rename from content/media/test/multiple-bos-more-header-fileds.ogg
rename to dom/media/test/multiple-bos-more-header-fileds.ogg
diff --git a/content/media/test/multiple-bos-more-header-fileds.ogg^headers^ b/dom/media/test/multiple-bos-more-header-fileds.ogg^headers^
similarity index 100%
rename from content/media/test/multiple-bos-more-header-fileds.ogg^headers^
rename to dom/media/test/multiple-bos-more-header-fileds.ogg^headers^
diff --git a/content/media/test/multiple-bos.ogg b/dom/media/test/multiple-bos.ogg
similarity index 100%
rename from content/media/test/multiple-bos.ogg
rename to dom/media/test/multiple-bos.ogg
diff --git a/content/media/test/multiple-bos.ogg^headers^ b/dom/media/test/multiple-bos.ogg^headers^
similarity index 100%
rename from content/media/test/multiple-bos.ogg^headers^
rename to dom/media/test/multiple-bos.ogg^headers^
diff --git a/content/media/test/no-cues.webm b/dom/media/test/no-cues.webm
similarity index 100%
rename from content/media/test/no-cues.webm
rename to dom/media/test/no-cues.webm
diff --git a/content/media/test/no-cues.webm^headers^ b/dom/media/test/no-cues.webm^headers^
similarity index 100%
rename from content/media/test/no-cues.webm^headers^
rename to dom/media/test/no-cues.webm^headers^
diff --git a/content/media/test/noContentLength.sjs b/dom/media/test/noContentLength.sjs
similarity index 95%
rename from content/media/test/noContentLength.sjs
rename to dom/media/test/noContentLength.sjs
index f4df875d231..0cb00f0669d 100644
--- a/content/media/test/noContentLength.sjs
+++ b/dom/media/test/noContentLength.sjs
@@ -8,7 +8,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/320x240.ogv";
+  var paths = "tests/dom/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/notags.mp3 b/dom/media/test/notags.mp3
similarity index 100%
rename from content/media/test/notags.mp3
rename to dom/media/test/notags.mp3
diff --git a/content/media/test/notags.mp3^headers^ b/dom/media/test/notags.mp3^headers^
similarity index 100%
rename from content/media/test/notags.mp3^headers^
rename to dom/media/test/notags.mp3^headers^
diff --git a/content/media/test/owl-funnier-id3.mp3 b/dom/media/test/owl-funnier-id3.mp3
similarity index 100%
rename from content/media/test/owl-funnier-id3.mp3
rename to dom/media/test/owl-funnier-id3.mp3
diff --git a/content/media/test/owl-funnier-id3.mp3^headers^ b/dom/media/test/owl-funnier-id3.mp3^headers^
similarity index 100%
rename from content/media/test/owl-funnier-id3.mp3^headers^
rename to dom/media/test/owl-funnier-id3.mp3^headers^
diff --git a/content/media/test/owl-funny-id3.mp3 b/dom/media/test/owl-funny-id3.mp3
similarity index 100%
rename from content/media/test/owl-funny-id3.mp3
rename to dom/media/test/owl-funny-id3.mp3
diff --git a/content/media/test/owl-funny-id3.mp3^headers^ b/dom/media/test/owl-funny-id3.mp3^headers^
similarity index 100%
rename from content/media/test/owl-funny-id3.mp3^headers^
rename to dom/media/test/owl-funny-id3.mp3^headers^
diff --git a/content/media/test/owl.mp3 b/dom/media/test/owl.mp3
similarity index 100%
rename from content/media/test/owl.mp3
rename to dom/media/test/owl.mp3
diff --git a/content/media/test/owl.mp3^headers^ b/dom/media/test/owl.mp3^headers^
similarity index 100%
rename from content/media/test/owl.mp3^headers^
rename to dom/media/test/owl.mp3^headers^
diff --git a/content/media/test/parser.vtt b/dom/media/test/parser.vtt
similarity index 100%
rename from content/media/test/parser.vtt
rename to dom/media/test/parser.vtt
diff --git a/content/media/test/pixel_aspect_ratio.mp4 b/dom/media/test/pixel_aspect_ratio.mp4
similarity index 100%
rename from content/media/test/pixel_aspect_ratio.mp4
rename to dom/media/test/pixel_aspect_ratio.mp4
diff --git a/content/media/test/r11025_msadpcm_c1.wav b/dom/media/test/r11025_msadpcm_c1.wav
similarity index 100%
rename from content/media/test/r11025_msadpcm_c1.wav
rename to dom/media/test/r11025_msadpcm_c1.wav
diff --git a/content/media/test/r11025_msadpcm_c1.wav^headers^ b/dom/media/test/r11025_msadpcm_c1.wav^headers^
similarity index 100%
rename from content/media/test/r11025_msadpcm_c1.wav^headers^
rename to dom/media/test/r11025_msadpcm_c1.wav^headers^
diff --git a/content/media/test/r11025_s16_c1.wav b/dom/media/test/r11025_s16_c1.wav
similarity index 100%
rename from content/media/test/r11025_s16_c1.wav
rename to dom/media/test/r11025_s16_c1.wav
diff --git a/content/media/test/r11025_s16_c1.wav^headers^ b/dom/media/test/r11025_s16_c1.wav^headers^
similarity index 100%
rename from content/media/test/r11025_s16_c1.wav^headers^
rename to dom/media/test/r11025_s16_c1.wav^headers^
diff --git a/content/media/test/r11025_s16_c1_trailing.wav b/dom/media/test/r11025_s16_c1_trailing.wav
similarity index 100%
rename from content/media/test/r11025_s16_c1_trailing.wav
rename to dom/media/test/r11025_s16_c1_trailing.wav
diff --git a/content/media/test/r11025_s16_c1_trailing.wav^headers^ b/dom/media/test/r11025_s16_c1_trailing.wav^headers^
similarity index 100%
rename from content/media/test/r11025_s16_c1_trailing.wav^headers^
rename to dom/media/test/r11025_s16_c1_trailing.wav^headers^
diff --git a/content/media/test/r11025_u8_c1.wav b/dom/media/test/r11025_u8_c1.wav
similarity index 100%
rename from content/media/test/r11025_u8_c1.wav
rename to dom/media/test/r11025_u8_c1.wav
diff --git a/content/media/test/r11025_u8_c1.wav^headers^ b/dom/media/test/r11025_u8_c1.wav^headers^
similarity index 100%
rename from content/media/test/r11025_u8_c1.wav^headers^
rename to dom/media/test/r11025_u8_c1.wav^headers^
diff --git a/content/media/test/r11025_u8_c1_trunc.wav b/dom/media/test/r11025_u8_c1_trunc.wav
similarity index 100%
rename from content/media/test/r11025_u8_c1_trunc.wav
rename to dom/media/test/r11025_u8_c1_trunc.wav
diff --git a/content/media/test/r11025_u8_c1_trunc.wav^headers^ b/dom/media/test/r11025_u8_c1_trunc.wav^headers^
similarity index 100%
rename from content/media/test/r11025_u8_c1_trunc.wav^headers^
rename to dom/media/test/r11025_u8_c1_trunc.wav^headers^
diff --git a/content/media/test/r16000_u8_c1_list.wav b/dom/media/test/r16000_u8_c1_list.wav
similarity index 100%
rename from content/media/test/r16000_u8_c1_list.wav
rename to dom/media/test/r16000_u8_c1_list.wav
diff --git a/content/media/test/r16000_u8_c1_list.wav^headers^ b/dom/media/test/r16000_u8_c1_list.wav^headers^
similarity index 100%
rename from content/media/test/r16000_u8_c1_list.wav^headers^
rename to dom/media/test/r16000_u8_c1_list.wav^headers^
diff --git a/content/media/test/reactivate_helper.html b/dom/media/test/reactivate_helper.html
similarity index 100%
rename from content/media/test/reactivate_helper.html
rename to dom/media/test/reactivate_helper.html
diff --git a/content/media/test/redirect.sjs b/dom/media/test/redirect.sjs
similarity index 85%
rename from content/media/test/redirect.sjs
rename to dom/media/test/redirect.sjs
index 68ac8234b8a..1653e8efc07 100644
--- a/content/media/test/redirect.sjs
+++ b/dom/media/test/redirect.sjs
@@ -21,6 +21,6 @@ function handleRequest(request, response)
   var allowed = parseQuery(request, "allowed");
 
   response.setStatusLine(request.httpVersion, 303, "See Other");
-  response.setHeader("Location", "http://" + domain + "/tests/content/media/test/" + (allowed ? "allowed.sjs?" : "") + file);
+  response.setHeader("Location", "http://" + domain + "/tests/dom/media/test/" + (allowed ? "allowed.sjs?" : "") + file);
   response.setHeader("Content-Type", "text/html");
 }
diff --git a/content/media/test/referer.sjs b/dom/media/test/referer.sjs
similarity index 92%
rename from content/media/test/referer.sjs
rename to dom/media/test/referer.sjs
index c304f80d057..1ddec572132 100644
--- a/content/media/test/referer.sjs
+++ b/dom/media/test/referer.sjs
@@ -16,7 +16,7 @@ function handleRequest(request, response)
 {
   var referer = request.hasHeader("Referer") ? request.getHeader("Referer")
                                              : undefined; 
-  if (referer == "http://mochi.test:8888/tests/content/media/test/test_referer.html") {
+  if (referer == "http://mochi.test:8888/tests/dom/media/test/test_referer.html") {
     var name = parseQuery(request, "name");
 	var type = parseQuery(request, "type");
     var file = Components.classes["@mozilla.org/file/directory_service;1"].
@@ -26,7 +26,7 @@ function handleRequest(request, response)
                           createInstance(Components.interfaces.nsIFileInputStream);
     var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                           createInstance(Components.interfaces.nsIBinaryInputStream);
-    var paths = "tests/content/media/test/" + name;
+    var paths = "tests/dom/media/test/" + name;
     var split = paths.split("/");
     for(var i = 0; i < split.length; ++i) {
       file.append(split[i]);
diff --git a/content/media/test/region.vtt b/dom/media/test/region.vtt
similarity index 100%
rename from content/media/test/region.vtt
rename to dom/media/test/region.vtt
diff --git a/content/media/test/sample-fisbone-skeleton4.ogv b/dom/media/test/sample-fisbone-skeleton4.ogv
similarity index 100%
rename from content/media/test/sample-fisbone-skeleton4.ogv
rename to dom/media/test/sample-fisbone-skeleton4.ogv
diff --git a/content/media/test/sample-fisbone-skeleton4.ogv^headers^ b/dom/media/test/sample-fisbone-skeleton4.ogv^headers^
similarity index 100%
rename from content/media/test/sample-fisbone-skeleton4.ogv^headers^
rename to dom/media/test/sample-fisbone-skeleton4.ogv^headers^
diff --git a/content/media/test/sample-fisbone-wrong-header.ogv b/dom/media/test/sample-fisbone-wrong-header.ogv
similarity index 100%
rename from content/media/test/sample-fisbone-wrong-header.ogv
rename to dom/media/test/sample-fisbone-wrong-header.ogv
diff --git a/content/media/test/sample-fisbone-wrong-header.ogv^headers^ b/dom/media/test/sample-fisbone-wrong-header.ogv^headers^
similarity index 100%
rename from content/media/test/sample-fisbone-wrong-header.ogv^headers^
rename to dom/media/test/sample-fisbone-wrong-header.ogv^headers^
diff --git a/content/media/test/sample.3g2 b/dom/media/test/sample.3g2
similarity index 100%
rename from content/media/test/sample.3g2
rename to dom/media/test/sample.3g2
diff --git a/content/media/test/sample.3gp b/dom/media/test/sample.3gp
similarity index 100%
rename from content/media/test/sample.3gp
rename to dom/media/test/sample.3gp
diff --git a/content/media/test/seek.ogv b/dom/media/test/seek.ogv
similarity index 100%
rename from content/media/test/seek.ogv
rename to dom/media/test/seek.ogv
diff --git a/content/media/test/seek.ogv^headers^ b/dom/media/test/seek.ogv^headers^
similarity index 100%
rename from content/media/test/seek.ogv^headers^
rename to dom/media/test/seek.ogv^headers^
diff --git a/content/media/test/seek.webm b/dom/media/test/seek.webm
similarity index 100%
rename from content/media/test/seek.webm
rename to dom/media/test/seek.webm
diff --git a/content/media/test/seek.webm^headers^ b/dom/media/test/seek.webm^headers^
similarity index 100%
rename from content/media/test/seek.webm^headers^
rename to dom/media/test/seek.webm^headers^
diff --git a/content/media/test/seek.yuv b/dom/media/test/seek.yuv
similarity index 100%
rename from content/media/test/seek.yuv
rename to dom/media/test/seek.yuv
diff --git a/content/media/test/seekLies.sjs b/dom/media/test/seekLies.sjs
similarity index 95%
rename from content/media/test/seekLies.sjs
rename to dom/media/test/seekLies.sjs
index 7d72d6ce7e2..d9c6fd0513a 100644
--- a/content/media/test/seekLies.sjs
+++ b/dom/media/test/seekLies.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/test/seek.ogv";
+  var paths = "tests/dom/media/test/seek.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/test/seek_support.js b/dom/media/test/seek_support.js
similarity index 100%
rename from content/media/test/seek_support.js
rename to dom/media/test/seek_support.js
diff --git a/content/media/test/seek_with_sound.ogg b/dom/media/test/seek_with_sound.ogg
similarity index 100%
rename from content/media/test/seek_with_sound.ogg
rename to dom/media/test/seek_with_sound.ogg
diff --git a/content/media/test/seek_with_sound.ogg^headers^ b/dom/media/test/seek_with_sound.ogg^headers^
similarity index 100%
rename from content/media/test/seek_with_sound.ogg^headers^
rename to dom/media/test/seek_with_sound.ogg^headers^
diff --git a/content/media/test/short-cenc.mp4 b/dom/media/test/short-cenc.mp4
similarity index 100%
rename from content/media/test/short-cenc.mp4
rename to dom/media/test/short-cenc.mp4
diff --git a/content/media/test/short-cenc.xml b/dom/media/test/short-cenc.xml
similarity index 100%
rename from content/media/test/short-cenc.xml
rename to dom/media/test/short-cenc.xml
diff --git a/content/media/test/short-video.ogv b/dom/media/test/short-video.ogv
similarity index 100%
rename from content/media/test/short-video.ogv
rename to dom/media/test/short-video.ogv
diff --git a/content/media/test/short-video.ogv^headers^ b/dom/media/test/short-video.ogv^headers^
similarity index 100%
rename from content/media/test/short-video.ogv^headers^
rename to dom/media/test/short-video.ogv^headers^
diff --git a/content/media/test/short.mp4 b/dom/media/test/short.mp4
similarity index 100%
rename from content/media/test/short.mp4
rename to dom/media/test/short.mp4
diff --git a/content/media/test/small-shot-mp3.mp4 b/dom/media/test/small-shot-mp3.mp4
similarity index 100%
rename from content/media/test/small-shot-mp3.mp4
rename to dom/media/test/small-shot-mp3.mp4
diff --git a/content/media/test/small-shot-mp3.mp4^headers^ b/dom/media/test/small-shot-mp3.mp4^headers^
similarity index 100%
rename from content/media/test/small-shot-mp3.mp4^headers^
rename to dom/media/test/small-shot-mp3.mp4^headers^
diff --git a/content/media/test/small-shot.m4a b/dom/media/test/small-shot.m4a
similarity index 100%
rename from content/media/test/small-shot.m4a
rename to dom/media/test/small-shot.m4a
diff --git a/content/media/test/small-shot.mp3 b/dom/media/test/small-shot.mp3
similarity index 100%
rename from content/media/test/small-shot.mp3
rename to dom/media/test/small-shot.mp3
diff --git a/content/media/test/small-shot.mp3^headers^ b/dom/media/test/small-shot.mp3^headers^
similarity index 100%
rename from content/media/test/small-shot.mp3^headers^
rename to dom/media/test/small-shot.mp3^headers^
diff --git a/content/media/test/small-shot.ogg b/dom/media/test/small-shot.ogg
similarity index 100%
rename from content/media/test/small-shot.ogg
rename to dom/media/test/small-shot.ogg
diff --git a/content/media/test/small-shot.ogg^headers^ b/dom/media/test/small-shot.ogg^headers^
similarity index 100%
rename from content/media/test/small-shot.ogg^headers^
rename to dom/media/test/small-shot.ogg^headers^
diff --git a/content/media/test/sound.ogg b/dom/media/test/sound.ogg
similarity index 100%
rename from content/media/test/sound.ogg
rename to dom/media/test/sound.ogg
diff --git a/content/media/test/sound.ogg^headers^ b/dom/media/test/sound.ogg^headers^
similarity index 100%
rename from content/media/test/sound.ogg^headers^
rename to dom/media/test/sound.ogg^headers^
diff --git a/content/media/test/spacestorm-1000Hz-100ms.ogg b/dom/media/test/spacestorm-1000Hz-100ms.ogg
similarity index 100%
rename from content/media/test/spacestorm-1000Hz-100ms.ogg
rename to dom/media/test/spacestorm-1000Hz-100ms.ogg
diff --git a/content/media/test/spacestorm-1000Hz-100ms.ogg^headers^ b/dom/media/test/spacestorm-1000Hz-100ms.ogg^headers^
similarity index 100%
rename from content/media/test/spacestorm-1000Hz-100ms.ogg^headers^
rename to dom/media/test/spacestorm-1000Hz-100ms.ogg^headers^
diff --git a/content/media/test/split.webm b/dom/media/test/split.webm
similarity index 100%
rename from content/media/test/split.webm
rename to dom/media/test/split.webm
diff --git a/content/media/test/split.webm^headers^ b/dom/media/test/split.webm^headers^
similarity index 100%
rename from content/media/test/split.webm^headers^
rename to dom/media/test/split.webm^headers^
diff --git a/content/media/test/street.mp4 b/dom/media/test/street.mp4
similarity index 100%
rename from content/media/test/street.mp4
rename to dom/media/test/street.mp4
diff --git a/content/media/test/street.mp4^headers^ b/dom/media/test/street.mp4^headers^
similarity index 100%
rename from content/media/test/street.mp4^headers^
rename to dom/media/test/street.mp4^headers^
diff --git a/content/media/test/test-1-mono.opus b/dom/media/test/test-1-mono.opus
similarity index 100%
rename from content/media/test/test-1-mono.opus
rename to dom/media/test/test-1-mono.opus
diff --git a/content/media/test/test-1-mono.opus^headers^ b/dom/media/test/test-1-mono.opus^headers^
similarity index 100%
rename from content/media/test/test-1-mono.opus^headers^
rename to dom/media/test/test-1-mono.opus^headers^
diff --git a/content/media/test/test-2-stereo.opus b/dom/media/test/test-2-stereo.opus
similarity index 100%
rename from content/media/test/test-2-stereo.opus
rename to dom/media/test/test-2-stereo.opus
diff --git a/content/media/test/test-2-stereo.opus^headers^ b/dom/media/test/test-2-stereo.opus^headers^
similarity index 100%
rename from content/media/test/test-2-stereo.opus^headers^
rename to dom/media/test/test-2-stereo.opus^headers^
diff --git a/content/media/test/test-3-LCR.opus b/dom/media/test/test-3-LCR.opus
similarity index 100%
rename from content/media/test/test-3-LCR.opus
rename to dom/media/test/test-3-LCR.opus
diff --git a/content/media/test/test-3-LCR.opus^headers^ b/dom/media/test/test-3-LCR.opus^headers^
similarity index 100%
rename from content/media/test/test-3-LCR.opus^headers^
rename to dom/media/test/test-3-LCR.opus^headers^
diff --git a/content/media/test/test-4-quad.opus b/dom/media/test/test-4-quad.opus
similarity index 100%
rename from content/media/test/test-4-quad.opus
rename to dom/media/test/test-4-quad.opus
diff --git a/content/media/test/test-4-quad.opus^headers^ b/dom/media/test/test-4-quad.opus^headers^
similarity index 100%
rename from content/media/test/test-4-quad.opus^headers^
rename to dom/media/test/test-4-quad.opus^headers^
diff --git a/content/media/test/test-5-5.0.opus b/dom/media/test/test-5-5.0.opus
similarity index 100%
rename from content/media/test/test-5-5.0.opus
rename to dom/media/test/test-5-5.0.opus
diff --git a/content/media/test/test-5-5.0.opus^headers^ b/dom/media/test/test-5-5.0.opus^headers^
similarity index 100%
rename from content/media/test/test-5-5.0.opus^headers^
rename to dom/media/test/test-5-5.0.opus^headers^
diff --git a/content/media/test/test-6-5.1.opus b/dom/media/test/test-6-5.1.opus
similarity index 100%
rename from content/media/test/test-6-5.1.opus
rename to dom/media/test/test-6-5.1.opus
diff --git a/content/media/test/test-6-5.1.opus^headers^ b/dom/media/test/test-6-5.1.opus^headers^
similarity index 100%
rename from content/media/test/test-6-5.1.opus^headers^
rename to dom/media/test/test-6-5.1.opus^headers^
diff --git a/content/media/test/test-7-6.1.opus b/dom/media/test/test-7-6.1.opus
similarity index 100%
rename from content/media/test/test-7-6.1.opus
rename to dom/media/test/test-7-6.1.opus
diff --git a/content/media/test/test-7-6.1.opus^headers^ b/dom/media/test/test-7-6.1.opus^headers^
similarity index 100%
rename from content/media/test/test-7-6.1.opus^headers^
rename to dom/media/test/test-7-6.1.opus^headers^
diff --git a/content/media/test/test-8-7.1.opus b/dom/media/test/test-8-7.1.opus
similarity index 100%
rename from content/media/test/test-8-7.1.opus
rename to dom/media/test/test-8-7.1.opus
diff --git a/content/media/test/test-8-7.1.opus^headers^ b/dom/media/test/test-8-7.1.opus^headers^
similarity index 100%
rename from content/media/test/test-8-7.1.opus^headers^
rename to dom/media/test/test-8-7.1.opus^headers^
diff --git a/content/media/test/test_VideoPlaybackQuality.html b/dom/media/test/test_VideoPlaybackQuality.html
similarity index 100%
rename from content/media/test/test_VideoPlaybackQuality.html
rename to dom/media/test/test_VideoPlaybackQuality.html
diff --git a/content/media/test/test_VideoPlaybackQuality_disabled.html b/dom/media/test/test_VideoPlaybackQuality_disabled.html
similarity index 100%
rename from content/media/test/test_VideoPlaybackQuality_disabled.html
rename to dom/media/test/test_VideoPlaybackQuality_disabled.html
diff --git a/content/media/test/test_access_control.html b/dom/media/test/test_access_control.html
similarity index 90%
rename from content/media/test/test_access_control.html
rename to dom/media/test/test_access_control.html
index 6729c4aa48f..57bfeb97b50 100644
--- a/content/media/test/test_access_control.html
+++ b/dom/media/test/test_access_control.html
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=451958
 /** Test for Bug 451958 **/
 
 function run() {
-  window.open("http://example.org:80/tests/content/media/test/file_access_controls.html", "", "width=500,height=500");
+  window.open("http://example.org:80/tests/dom/media/test/file_access_controls.html", "", "width=500,height=500");
 }
 
 function done() {
diff --git a/content/media/test/test_aspectratio_mp4.html b/dom/media/test/test_aspectratio_mp4.html
similarity index 100%
rename from content/media/test/test_aspectratio_mp4.html
rename to dom/media/test/test_aspectratio_mp4.html
diff --git a/content/media/test/test_audio1.html b/dom/media/test/test_audio1.html
similarity index 100%
rename from content/media/test/test_audio1.html
rename to dom/media/test/test_audio1.html
diff --git a/content/media/test/test_audio2.html b/dom/media/test/test_audio2.html
similarity index 100%
rename from content/media/test/test_audio2.html
rename to dom/media/test/test_audio2.html
diff --git a/content/media/test/test_audioDocumentTitle.html b/dom/media/test/test_audioDocumentTitle.html
similarity index 100%
rename from content/media/test/test_audioDocumentTitle.html
rename to dom/media/test/test_audioDocumentTitle.html
diff --git a/content/media/test/test_autoplay.html b/dom/media/test/test_autoplay.html
similarity index 100%
rename from content/media/test/test_autoplay.html
rename to dom/media/test/test_autoplay.html
diff --git a/content/media/test/test_autoplay_contentEditable.html b/dom/media/test/test_autoplay_contentEditable.html
similarity index 100%
rename from content/media/test/test_autoplay_contentEditable.html
rename to dom/media/test/test_autoplay_contentEditable.html
diff --git a/content/media/test/test_buffered.html b/dom/media/test/test_buffered.html
similarity index 100%
rename from content/media/test/test_buffered.html
rename to dom/media/test/test_buffered.html
diff --git a/content/media/test/test_bug1018933.html b/dom/media/test/test_bug1018933.html
similarity index 100%
rename from content/media/test/test_bug1018933.html
rename to dom/media/test/test_bug1018933.html
diff --git a/content/media/test/test_bug448534.html b/dom/media/test/test_bug448534.html
similarity index 100%
rename from content/media/test/test_bug448534.html
rename to dom/media/test/test_bug448534.html
diff --git a/content/media/test/test_bug463162.xhtml b/dom/media/test/test_bug463162.xhtml
similarity index 100%
rename from content/media/test/test_bug463162.xhtml
rename to dom/media/test/test_bug463162.xhtml
diff --git a/content/media/test/test_bug465498.html b/dom/media/test/test_bug465498.html
similarity index 100%
rename from content/media/test/test_bug465498.html
rename to dom/media/test/test_bug465498.html
diff --git a/content/media/test/test_bug493187.html b/dom/media/test/test_bug493187.html
similarity index 100%
rename from content/media/test/test_bug493187.html
rename to dom/media/test/test_bug493187.html
diff --git a/content/media/test/test_bug495145.html b/dom/media/test/test_bug495145.html
similarity index 100%
rename from content/media/test/test_bug495145.html
rename to dom/media/test/test_bug495145.html
diff --git a/content/media/test/test_bug495300.html b/dom/media/test/test_bug495300.html
similarity index 100%
rename from content/media/test/test_bug495300.html
rename to dom/media/test/test_bug495300.html
diff --git a/content/media/test/test_bug654550.html b/dom/media/test/test_bug654550.html
similarity index 100%
rename from content/media/test/test_bug654550.html
rename to dom/media/test/test_bug654550.html
diff --git a/content/media/test/test_bug686942.html b/dom/media/test/test_bug686942.html
similarity index 100%
rename from content/media/test/test_bug686942.html
rename to dom/media/test/test_bug686942.html
diff --git a/content/media/test/test_bug726904.html b/dom/media/test/test_bug726904.html
similarity index 95%
rename from content/media/test/test_bug726904.html
rename to dom/media/test/test_bug726904.html
index e5658a66fea..7c319bbc7aa 100644
--- a/content/media/test/test_bug726904.html
+++ b/dom/media/test/test_bug726904.html
@@ -37,7 +37,7 @@ function bodyLoaded(){
 if (resource) {
   v1.poster = v2.poster = poster;
 
-  v1.src = v2.src = "http://mochi.test:8888/tests/content/media/test/" + resource.name;
+  v1.src = v2.src = "http://mochi.test:8888/tests/dom/media/test/" + resource.name;
 
   v1.preload = "auto";
   v2.preload = "none";
diff --git a/content/media/test/test_bug874897.html b/dom/media/test/test_bug874897.html
similarity index 100%
rename from content/media/test/test_bug874897.html
rename to dom/media/test/test_bug874897.html
diff --git a/content/media/test/test_bug883173.html b/dom/media/test/test_bug883173.html
similarity index 100%
rename from content/media/test/test_bug883173.html
rename to dom/media/test/test_bug883173.html
diff --git a/content/media/test/test_bug895091.html b/dom/media/test/test_bug895091.html
similarity index 100%
rename from content/media/test/test_bug895091.html
rename to dom/media/test/test_bug895091.html
diff --git a/content/media/test/test_bug895305.html b/dom/media/test/test_bug895305.html
similarity index 100%
rename from content/media/test/test_bug895305.html
rename to dom/media/test/test_bug895305.html
diff --git a/content/media/test/test_bug919265.html b/dom/media/test/test_bug919265.html
similarity index 100%
rename from content/media/test/test_bug919265.html
rename to dom/media/test/test_bug919265.html
diff --git a/content/media/test/test_bug957847.html b/dom/media/test/test_bug957847.html
similarity index 100%
rename from content/media/test/test_bug957847.html
rename to dom/media/test/test_bug957847.html
diff --git a/content/media/test/test_can_play_type.html b/dom/media/test/test_can_play_type.html
similarity index 100%
rename from content/media/test/test_can_play_type.html
rename to dom/media/test/test_can_play_type.html
diff --git a/content/media/test/test_can_play_type_mpeg.html b/dom/media/test/test_can_play_type_mpeg.html
similarity index 100%
rename from content/media/test/test_can_play_type_mpeg.html
rename to dom/media/test/test_can_play_type_mpeg.html
diff --git a/content/media/test/test_can_play_type_no_ogg.html b/dom/media/test/test_can_play_type_no_ogg.html
similarity index 100%
rename from content/media/test/test_can_play_type_no_ogg.html
rename to dom/media/test/test_can_play_type_no_ogg.html
diff --git a/content/media/test/test_can_play_type_no_wave.html b/dom/media/test/test_can_play_type_no_wave.html
similarity index 100%
rename from content/media/test/test_can_play_type_no_wave.html
rename to dom/media/test/test_can_play_type_no_wave.html
diff --git a/content/media/test/test_can_play_type_no_webm.html b/dom/media/test/test_can_play_type_no_webm.html
similarity index 100%
rename from content/media/test/test_can_play_type_no_webm.html
rename to dom/media/test/test_can_play_type_no_webm.html
diff --git a/content/media/test/test_can_play_type_ogg.html b/dom/media/test/test_can_play_type_ogg.html
similarity index 100%
rename from content/media/test/test_can_play_type_ogg.html
rename to dom/media/test/test_can_play_type_ogg.html
diff --git a/content/media/test/test_can_play_type_wave.html b/dom/media/test/test_can_play_type_wave.html
similarity index 100%
rename from content/media/test/test_can_play_type_wave.html
rename to dom/media/test/test_can_play_type_wave.html
diff --git a/content/media/test/test_can_play_type_webm.html b/dom/media/test/test_can_play_type_webm.html
similarity index 100%
rename from content/media/test/test_can_play_type_webm.html
rename to dom/media/test/test_can_play_type_webm.html
diff --git a/content/media/test/test_chaining.html b/dom/media/test/test_chaining.html
similarity index 100%
rename from content/media/test/test_chaining.html
rename to dom/media/test/test_chaining.html
diff --git a/content/media/test/test_clone_media_element.html b/dom/media/test/test_clone_media_element.html
similarity index 100%
rename from content/media/test/test_clone_media_element.html
rename to dom/media/test/test_clone_media_element.html
diff --git a/content/media/test/test_closing_connections.html b/dom/media/test/test_closing_connections.html
similarity index 100%
rename from content/media/test/test_closing_connections.html
rename to dom/media/test/test_closing_connections.html
diff --git a/content/media/test/test_constants.html b/dom/media/test/test_constants.html
similarity index 100%
rename from content/media/test/test_constants.html
rename to dom/media/test/test_constants.html
diff --git a/content/media/test/test_contentDuration1.html b/dom/media/test/test_contentDuration1.html
similarity index 100%
rename from content/media/test/test_contentDuration1.html
rename to dom/media/test/test_contentDuration1.html
diff --git a/content/media/test/test_contentDuration2.html b/dom/media/test/test_contentDuration2.html
similarity index 100%
rename from content/media/test/test_contentDuration2.html
rename to dom/media/test/test_contentDuration2.html
diff --git a/content/media/test/test_contentDuration3.html b/dom/media/test/test_contentDuration3.html
similarity index 100%
rename from content/media/test/test_contentDuration3.html
rename to dom/media/test/test_contentDuration3.html
diff --git a/content/media/test/test_contentDuration4.html b/dom/media/test/test_contentDuration4.html
similarity index 100%
rename from content/media/test/test_contentDuration4.html
rename to dom/media/test/test_contentDuration4.html
diff --git a/content/media/test/test_contentDuration5.html b/dom/media/test/test_contentDuration5.html
similarity index 100%
rename from content/media/test/test_contentDuration5.html
rename to dom/media/test/test_contentDuration5.html
diff --git a/content/media/test/test_contentDuration6.html b/dom/media/test/test_contentDuration6.html
similarity index 100%
rename from content/media/test/test_contentDuration6.html
rename to dom/media/test/test_contentDuration6.html
diff --git a/content/media/test/test_contentDuration7.html b/dom/media/test/test_contentDuration7.html
similarity index 100%
rename from content/media/test/test_contentDuration7.html
rename to dom/media/test/test_contentDuration7.html
diff --git a/content/media/test/test_controls.html b/dom/media/test/test_controls.html
similarity index 100%
rename from content/media/test/test_controls.html
rename to dom/media/test/test_controls.html
diff --git a/content/media/test/test_currentTime.html b/dom/media/test/test_currentTime.html
similarity index 100%
rename from content/media/test/test_currentTime.html
rename to dom/media/test/test_currentTime.html
diff --git a/content/media/test/test_decode_error.html b/dom/media/test/test_decode_error.html
similarity index 100%
rename from content/media/test/test_decode_error.html
rename to dom/media/test/test_decode_error.html
diff --git a/content/media/test/test_decoder_disable.html b/dom/media/test/test_decoder_disable.html
similarity index 100%
rename from content/media/test/test_decoder_disable.html
rename to dom/media/test/test_decoder_disable.html
diff --git a/content/media/test/test_defaultMuted.html b/dom/media/test/test_defaultMuted.html
similarity index 95%
rename from content/media/test/test_defaultMuted.html
rename to dom/media/test/test_defaultMuted.html
index 6a4bfa328a0..5dd30e302e9 100644
--- a/content/media/test/test_defaultMuted.html
+++ b/dom/media/test/test_defaultMuted.html
@@ -5,7 +5,7 @@
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
-  <script type="text/javascript" src="../../html/content/test/reflect.js"></script>
+  <script type="text/javascript" src="../../../content/html/content/test/reflect.js"></script>
 </head>
 <body>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=706731">Mozilla Bug 706731</a>
diff --git a/content/media/test/test_delay_load.html b/dom/media/test/test_delay_load.html
similarity index 100%
rename from content/media/test/test_delay_load.html
rename to dom/media/test/test_delay_load.html
diff --git a/content/media/test/test_encryptedMediaExtensions.html b/dom/media/test/test_encryptedMediaExtensions.html
similarity index 100%
rename from content/media/test/test_encryptedMediaExtensions.html
rename to dom/media/test/test_encryptedMediaExtensions.html
diff --git a/content/media/test/test_error_in_video_document.html b/dom/media/test/test_error_in_video_document.html
similarity index 100%
rename from content/media/test/test_error_in_video_document.html
rename to dom/media/test/test_error_in_video_document.html
diff --git a/content/media/test/test_error_on_404.html b/dom/media/test/test_error_on_404.html
similarity index 100%
rename from content/media/test/test_error_on_404.html
rename to dom/media/test/test_error_on_404.html
diff --git a/content/media/test/test_fastSeek-forwards.html b/dom/media/test/test_fastSeek-forwards.html
similarity index 100%
rename from content/media/test/test_fastSeek-forwards.html
rename to dom/media/test/test_fastSeek-forwards.html
diff --git a/content/media/test/test_fastSeek.html b/dom/media/test/test_fastSeek.html
similarity index 100%
rename from content/media/test/test_fastSeek.html
rename to dom/media/test/test_fastSeek.html
diff --git a/content/media/test/test_fragment_noplay.html b/dom/media/test/test_fragment_noplay.html
similarity index 100%
rename from content/media/test/test_fragment_noplay.html
rename to dom/media/test/test_fragment_noplay.html
diff --git a/content/media/test/test_fragment_play.html b/dom/media/test/test_fragment_play.html
similarity index 100%
rename from content/media/test/test_fragment_play.html
rename to dom/media/test/test_fragment_play.html
diff --git a/content/media/test/test_imagecapture.html b/dom/media/test/test_imagecapture.html
similarity index 100%
rename from content/media/test/test_imagecapture.html
rename to dom/media/test/test_imagecapture.html
diff --git a/content/media/test/test_info_leak.html b/dom/media/test/test_info_leak.html
similarity index 100%
rename from content/media/test/test_info_leak.html
rename to dom/media/test/test_info_leak.html
diff --git a/content/media/test/test_invalid_reject.html b/dom/media/test/test_invalid_reject.html
similarity index 100%
rename from content/media/test/test_invalid_reject.html
rename to dom/media/test/test_invalid_reject.html
diff --git a/content/media/test/test_invalid_reject_play.html b/dom/media/test/test_invalid_reject_play.html
similarity index 100%
rename from content/media/test/test_invalid_reject_play.html
rename to dom/media/test/test_invalid_reject_play.html
diff --git a/content/media/test/test_invalid_seek.html b/dom/media/test/test_invalid_seek.html
similarity index 100%
rename from content/media/test/test_invalid_seek.html
rename to dom/media/test/test_invalid_seek.html
diff --git a/content/media/test/test_load.html b/dom/media/test/test_load.html
similarity index 100%
rename from content/media/test/test_load.html
rename to dom/media/test/test_load.html
diff --git a/content/media/test/test_load_candidates.html b/dom/media/test/test_load_candidates.html
similarity index 100%
rename from content/media/test/test_load_candidates.html
rename to dom/media/test/test_load_candidates.html
diff --git a/content/media/test/test_load_same_resource.html b/dom/media/test/test_load_same_resource.html
similarity index 100%
rename from content/media/test/test_load_same_resource.html
rename to dom/media/test/test_load_same_resource.html
diff --git a/content/media/test/test_load_source.html b/dom/media/test/test_load_source.html
similarity index 100%
rename from content/media/test/test_load_source.html
rename to dom/media/test/test_load_source.html
diff --git a/content/media/test/test_loop.html b/dom/media/test/test_loop.html
similarity index 100%
rename from content/media/test/test_loop.html
rename to dom/media/test/test_loop.html
diff --git a/content/media/test/test_media_selection.html b/dom/media/test/test_media_selection.html
similarity index 100%
rename from content/media/test/test_media_selection.html
rename to dom/media/test/test_media_selection.html
diff --git a/content/media/test/test_media_sniffer.html b/dom/media/test/test_media_sniffer.html
similarity index 100%
rename from content/media/test/test_media_sniffer.html
rename to dom/media/test/test_media_sniffer.html
diff --git a/content/media/test/test_mediarecorder_avoid_recursion.html b/dom/media/test/test_mediarecorder_avoid_recursion.html
similarity index 100%
rename from content/media/test/test_mediarecorder_avoid_recursion.html
rename to dom/media/test/test_mediarecorder_avoid_recursion.html
diff --git a/content/media/test/test_mediarecorder_creation.html b/dom/media/test/test_mediarecorder_creation.html
similarity index 100%
rename from content/media/test/test_mediarecorder_creation.html
rename to dom/media/test/test_mediarecorder_creation.html
diff --git a/content/media/test/test_mediarecorder_creation_fail.html b/dom/media/test/test_mediarecorder_creation_fail.html
similarity index 100%
rename from content/media/test/test_mediarecorder_creation_fail.html
rename to dom/media/test/test_mediarecorder_creation_fail.html
diff --git a/content/media/test/test_mediarecorder_getencodeddata.html b/dom/media/test/test_mediarecorder_getencodeddata.html
similarity index 100%
rename from content/media/test/test_mediarecorder_getencodeddata.html
rename to dom/media/test/test_mediarecorder_getencodeddata.html
diff --git a/content/media/test/test_mediarecorder_record_4ch_audiocontext.html b/dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_4ch_audiocontext.html
rename to dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
diff --git a/content/media/test/test_mediarecorder_record_audiocontext.html b/dom/media/test/test_mediarecorder_record_audiocontext.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_audiocontext.html
rename to dom/media/test/test_mediarecorder_record_audiocontext.html
diff --git a/content/media/test/test_mediarecorder_record_audiocontext_mlk.html b/dom/media/test/test_mediarecorder_record_audiocontext_mlk.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_audiocontext_mlk.html
rename to dom/media/test/test_mediarecorder_record_audiocontext_mlk.html
diff --git a/content/media/test/test_mediarecorder_record_audionode.html b/dom/media/test/test_mediarecorder_record_audionode.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_audionode.html
rename to dom/media/test/test_mediarecorder_record_audionode.html
diff --git a/content/media/test/test_mediarecorder_record_getdata_afterstart.html b/dom/media/test/test_mediarecorder_record_getdata_afterstart.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_getdata_afterstart.html
rename to dom/media/test/test_mediarecorder_record_getdata_afterstart.html
diff --git a/content/media/test/test_mediarecorder_record_gum_video_timeslice.html b/dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_gum_video_timeslice.html
rename to dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
diff --git a/content/media/test/test_mediarecorder_record_immediate_stop.html b/dom/media/test/test_mediarecorder_record_immediate_stop.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_immediate_stop.html
rename to dom/media/test/test_mediarecorder_record_immediate_stop.html
diff --git a/content/media/test/test_mediarecorder_record_no_timeslice.html b/dom/media/test/test_mediarecorder_record_no_timeslice.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_no_timeslice.html
rename to dom/media/test/test_mediarecorder_record_no_timeslice.html
diff --git a/content/media/test/test_mediarecorder_record_nosrc.html b/dom/media/test/test_mediarecorder_record_nosrc.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_nosrc.html
rename to dom/media/test/test_mediarecorder_record_nosrc.html
diff --git a/content/media/test/test_mediarecorder_record_session.html b/dom/media/test/test_mediarecorder_record_session.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_session.html
rename to dom/media/test/test_mediarecorder_record_session.html
diff --git a/content/media/test/test_mediarecorder_record_startstopstart.html b/dom/media/test/test_mediarecorder_record_startstopstart.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_startstopstart.html
rename to dom/media/test/test_mediarecorder_record_startstopstart.html
diff --git a/content/media/test/test_mediarecorder_record_stopms.html b/dom/media/test/test_mediarecorder_record_stopms.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_stopms.html
rename to dom/media/test/test_mediarecorder_record_stopms.html
diff --git a/content/media/test/test_mediarecorder_record_timeslice.html b/dom/media/test/test_mediarecorder_record_timeslice.html
similarity index 100%
rename from content/media/test/test_mediarecorder_record_timeslice.html
rename to dom/media/test/test_mediarecorder_record_timeslice.html
diff --git a/content/media/test/test_mediarecorder_reload_crash.html b/dom/media/test/test_mediarecorder_reload_crash.html
similarity index 100%
rename from content/media/test/test_mediarecorder_reload_crash.html
rename to dom/media/test/test_mediarecorder_reload_crash.html
diff --git a/content/media/test/test_mediarecorder_state_transition.html b/dom/media/test/test_mediarecorder_state_transition.html
similarity index 100%
rename from content/media/test/test_mediarecorder_state_transition.html
rename to dom/media/test/test_mediarecorder_state_transition.html
diff --git a/content/media/test/test_mediarecorder_unsupported_src.html b/dom/media/test/test_mediarecorder_unsupported_src.html
similarity index 100%
rename from content/media/test/test_mediarecorder_unsupported_src.html
rename to dom/media/test/test_mediarecorder_unsupported_src.html
diff --git a/content/media/test/test_mediatrack_consuming_mediaresource.html b/dom/media/test/test_mediatrack_consuming_mediaresource.html
similarity index 100%
rename from content/media/test/test_mediatrack_consuming_mediaresource.html
rename to dom/media/test/test_mediatrack_consuming_mediaresource.html
diff --git a/content/media/test/test_mediatrack_consuming_mediastream.html b/dom/media/test/test_mediatrack_consuming_mediastream.html
similarity index 100%
rename from content/media/test/test_mediatrack_consuming_mediastream.html
rename to dom/media/test/test_mediatrack_consuming_mediastream.html
diff --git a/content/media/test/test_mediatrack_events.html b/dom/media/test/test_mediatrack_events.html
similarity index 100%
rename from content/media/test/test_mediatrack_events.html
rename to dom/media/test/test_mediatrack_events.html
diff --git a/content/media/test/test_mediatrack_parsing_ogg.html b/dom/media/test/test_mediatrack_parsing_ogg.html
similarity index 100%
rename from content/media/test/test_mediatrack_parsing_ogg.html
rename to dom/media/test/test_mediatrack_parsing_ogg.html
diff --git a/content/media/test/test_mediatrack_replay_from_end.html b/dom/media/test/test_mediatrack_replay_from_end.html
similarity index 100%
rename from content/media/test/test_mediatrack_replay_from_end.html
rename to dom/media/test/test_mediatrack_replay_from_end.html
diff --git a/content/media/test/test_metadata.html b/dom/media/test/test_metadata.html
similarity index 100%
rename from content/media/test/test_metadata.html
rename to dom/media/test/test_metadata.html
diff --git a/content/media/test/test_mixed_principals.html b/dom/media/test/test_mixed_principals.html
similarity index 90%
rename from content/media/test/test_mixed_principals.html
rename to dom/media/test/test_mixed_principals.html
index 14d911ef274..a864f75034e 100644
--- a/content/media/test/test_mixed_principals.html
+++ b/dom/media/test/test_mixed_principals.html
@@ -57,12 +57,12 @@ if (resource != null) {
 
   // In v1, try loading from same-origin first and then getting redirected to
   // another origin.
-  v1.src = "http://mochi.test:8888/tests/content/media/test/dynamic_redirect.sjs?key=v1_" + key + "&res=" + resource.name;
+  v1.src = "http://mochi.test:8888/tests/dom/media/test/dynamic_redirect.sjs?key=v1_" + key + "&res=" + resource.name;
   v1.load();
 
   // In v2, try loading cross-origin first and then getting redirected to
   // our origin.
-  v2.src = "http://example.org/tests/content/media/test/dynamic_redirect.sjs?key=v2_" + key + "&res=" + resource.name;
+  v2.src = "http://example.org/tests/dom/media/test/dynamic_redirect.sjs?key=v2_" + key + "&res=" + resource.name;
   v2.load();
   
 } else {
diff --git a/content/media/test/test_mozHasAudio.html b/dom/media/test/test_mozHasAudio.html
similarity index 100%
rename from content/media/test/test_mozHasAudio.html
rename to dom/media/test/test_mozHasAudio.html
diff --git a/content/media/test/test_networkState.html b/dom/media/test/test_networkState.html
similarity index 100%
rename from content/media/test/test_networkState.html
rename to dom/media/test/test_networkState.html
diff --git a/content/media/test/test_new_audio.html b/dom/media/test/test_new_audio.html
similarity index 100%
rename from content/media/test/test_new_audio.html
rename to dom/media/test/test_new_audio.html
diff --git a/content/media/test/test_no_load_event.html b/dom/media/test/test_no_load_event.html
similarity index 100%
rename from content/media/test/test_no_load_event.html
rename to dom/media/test/test_no_load_event.html
diff --git a/content/media/test/test_paused.html b/dom/media/test/test_paused.html
similarity index 100%
rename from content/media/test/test_paused.html
rename to dom/media/test/test_paused.html
diff --git a/content/media/test/test_paused_after_ended.html b/dom/media/test/test_paused_after_ended.html
similarity index 100%
rename from content/media/test/test_paused_after_ended.html
rename to dom/media/test/test_paused_after_ended.html
diff --git a/content/media/test/test_play_events.html b/dom/media/test/test_play_events.html
similarity index 100%
rename from content/media/test/test_play_events.html
rename to dom/media/test/test_play_events.html
diff --git a/content/media/test/test_play_events_2.html b/dom/media/test/test_play_events_2.html
similarity index 100%
rename from content/media/test/test_play_events_2.html
rename to dom/media/test/test_play_events_2.html
diff --git a/content/media/test/test_play_twice.html b/dom/media/test/test_play_twice.html
similarity index 100%
rename from content/media/test/test_play_twice.html
rename to dom/media/test/test_play_twice.html
diff --git a/content/media/test/test_playback.html b/dom/media/test/test_playback.html
similarity index 100%
rename from content/media/test/test_playback.html
rename to dom/media/test/test_playback.html
diff --git a/content/media/test/test_playback_errors.html b/dom/media/test/test_playback_errors.html
similarity index 100%
rename from content/media/test/test_playback_errors.html
rename to dom/media/test/test_playback_errors.html
diff --git a/content/media/test/test_playback_rate.html b/dom/media/test/test_playback_rate.html
similarity index 100%
rename from content/media/test/test_playback_rate.html
rename to dom/media/test/test_playback_rate.html
diff --git a/content/media/test/test_playback_rate_playpause.html b/dom/media/test/test_playback_rate_playpause.html
similarity index 100%
rename from content/media/test/test_playback_rate_playpause.html
rename to dom/media/test/test_playback_rate_playpause.html
diff --git a/content/media/test/test_played.html b/dom/media/test/test_played.html
similarity index 100%
rename from content/media/test/test_played.html
rename to dom/media/test/test_played.html
diff --git a/content/media/test/test_preload_actions.html b/dom/media/test/test_preload_actions.html
similarity index 100%
rename from content/media/test/test_preload_actions.html
rename to dom/media/test/test_preload_actions.html
diff --git a/content/media/test/test_preload_attribute.html b/dom/media/test/test_preload_attribute.html
similarity index 100%
rename from content/media/test/test_preload_attribute.html
rename to dom/media/test/test_preload_attribute.html
diff --git a/content/media/test/test_preload_suspend.html b/dom/media/test/test_preload_suspend.html
similarity index 100%
rename from content/media/test/test_preload_suspend.html
rename to dom/media/test/test_preload_suspend.html
diff --git a/content/media/test/test_progress.html b/dom/media/test/test_progress.html
similarity index 100%
rename from content/media/test/test_progress.html
rename to dom/media/test/test_progress.html
diff --git a/content/media/test/test_reactivate.html b/dom/media/test/test_reactivate.html
similarity index 100%
rename from content/media/test/test_reactivate.html
rename to dom/media/test/test_reactivate.html
diff --git a/content/media/test/test_readyState.html b/dom/media/test/test_readyState.html
similarity index 100%
rename from content/media/test/test_readyState.html
rename to dom/media/test/test_readyState.html
diff --git a/content/media/test/test_referer.html b/dom/media/test/test_referer.html
similarity index 100%
rename from content/media/test/test_referer.html
rename to dom/media/test/test_referer.html
diff --git a/content/media/test/test_replay_metadata.html b/dom/media/test/test_replay_metadata.html
similarity index 100%
rename from content/media/test/test_replay_metadata.html
rename to dom/media/test/test_replay_metadata.html
diff --git a/content/media/test/test_reset_events_async.html b/dom/media/test/test_reset_events_async.html
similarity index 100%
rename from content/media/test/test_reset_events_async.html
rename to dom/media/test/test_reset_events_async.html
diff --git a/content/media/test/test_reset_src.html b/dom/media/test/test_reset_src.html
similarity index 100%
rename from content/media/test/test_reset_src.html
rename to dom/media/test/test_reset_src.html
diff --git a/content/media/test/test_resume.html b/dom/media/test/test_resume.html
similarity index 100%
rename from content/media/test/test_resume.html
rename to dom/media/test/test_resume.html
diff --git a/content/media/test/test_seek-1.html b/dom/media/test/test_seek-1.html
similarity index 100%
rename from content/media/test/test_seek-1.html
rename to dom/media/test/test_seek-1.html
diff --git a/content/media/test/test_seek-10.html b/dom/media/test/test_seek-10.html
similarity index 100%
rename from content/media/test/test_seek-10.html
rename to dom/media/test/test_seek-10.html
diff --git a/content/media/test/test_seek-11.html b/dom/media/test/test_seek-11.html
similarity index 100%
rename from content/media/test/test_seek-11.html
rename to dom/media/test/test_seek-11.html
diff --git a/content/media/test/test_seek-12.html b/dom/media/test/test_seek-12.html
similarity index 100%
rename from content/media/test/test_seek-12.html
rename to dom/media/test/test_seek-12.html
diff --git a/content/media/test/test_seek-13.html b/dom/media/test/test_seek-13.html
similarity index 100%
rename from content/media/test/test_seek-13.html
rename to dom/media/test/test_seek-13.html
diff --git a/content/media/test/test_seek-2.html b/dom/media/test/test_seek-2.html
similarity index 100%
rename from content/media/test/test_seek-2.html
rename to dom/media/test/test_seek-2.html
diff --git a/content/media/test/test_seek-3.html b/dom/media/test/test_seek-3.html
similarity index 100%
rename from content/media/test/test_seek-3.html
rename to dom/media/test/test_seek-3.html
diff --git a/content/media/test/test_seek-4.html b/dom/media/test/test_seek-4.html
similarity index 100%
rename from content/media/test/test_seek-4.html
rename to dom/media/test/test_seek-4.html
diff --git a/content/media/test/test_seek-5.html b/dom/media/test/test_seek-5.html
similarity index 100%
rename from content/media/test/test_seek-5.html
rename to dom/media/test/test_seek-5.html
diff --git a/content/media/test/test_seek-6.html b/dom/media/test/test_seek-6.html
similarity index 100%
rename from content/media/test/test_seek-6.html
rename to dom/media/test/test_seek-6.html
diff --git a/content/media/test/test_seek-7.html b/dom/media/test/test_seek-7.html
similarity index 100%
rename from content/media/test/test_seek-7.html
rename to dom/media/test/test_seek-7.html
diff --git a/content/media/test/test_seek-8.html b/dom/media/test/test_seek-8.html
similarity index 100%
rename from content/media/test/test_seek-8.html
rename to dom/media/test/test_seek-8.html
diff --git a/content/media/test/test_seek-9.html b/dom/media/test/test_seek-9.html
similarity index 100%
rename from content/media/test/test_seek-9.html
rename to dom/media/test/test_seek-9.html
diff --git a/content/media/test/test_seekLies.html b/dom/media/test/test_seekLies.html
similarity index 100%
rename from content/media/test/test_seekLies.html
rename to dom/media/test/test_seekLies.html
diff --git a/content/media/test/test_seek_out_of_range.html b/dom/media/test/test_seek_out_of_range.html
similarity index 100%
rename from content/media/test/test_seek_out_of_range.html
rename to dom/media/test/test_seek_out_of_range.html
diff --git a/content/media/test/test_seekable1.html b/dom/media/test/test_seekable1.html
similarity index 100%
rename from content/media/test/test_seekable1.html
rename to dom/media/test/test_seekable1.html
diff --git a/content/media/test/test_seekable2.html b/dom/media/test/test_seekable2.html
similarity index 100%
rename from content/media/test/test_seekable2.html
rename to dom/media/test/test_seekable2.html
diff --git a/content/media/test/test_seekable3.html b/dom/media/test/test_seekable3.html
similarity index 100%
rename from content/media/test/test_seekable3.html
rename to dom/media/test/test_seekable3.html
diff --git a/content/media/test/test_source.html b/dom/media/test/test_source.html
similarity index 100%
rename from content/media/test/test_source.html
rename to dom/media/test/test_source.html
diff --git a/content/media/test/test_source_media.html b/dom/media/test/test_source_media.html
similarity index 95%
rename from content/media/test/test_source_media.html
rename to dom/media/test/test_source_media.html
index ede522b1e01..add5452e0cb 100644
--- a/content/media/test/test_source_media.html
+++ b/dom/media/test/test_source_media.html
@@ -6,7 +6,7 @@
 <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 <script type="text/javascript" src="manifest.js"></script>
-<script type="text/javascript" src="../../html/content/test/reflect.js"></script>
+<script type="text/javascript" src="../../../content/html/content/test/reflect.js"></script>
 </head>
 <body>
 <pre id="test">
diff --git a/content/media/test/test_source_null.html b/dom/media/test/test_source_null.html
similarity index 100%
rename from content/media/test/test_source_null.html
rename to dom/media/test/test_source_null.html
diff --git a/content/media/test/test_source_write.html b/dom/media/test/test_source_write.html
similarity index 100%
rename from content/media/test/test_source_write.html
rename to dom/media/test/test_source_write.html
diff --git a/content/media/test/test_standalone.html b/dom/media/test/test_standalone.html
similarity index 100%
rename from content/media/test/test_standalone.html
rename to dom/media/test/test_standalone.html
diff --git a/content/media/test/test_streams_autoplay.html b/dom/media/test/test_streams_autoplay.html
similarity index 100%
rename from content/media/test/test_streams_autoplay.html
rename to dom/media/test/test_streams_autoplay.html
diff --git a/content/media/test/test_streams_element_capture.html b/dom/media/test/test_streams_element_capture.html
similarity index 100%
rename from content/media/test/test_streams_element_capture.html
rename to dom/media/test/test_streams_element_capture.html
diff --git a/content/media/test/test_streams_element_capture_createObjectURL.html b/dom/media/test/test_streams_element_capture_createObjectURL.html
similarity index 100%
rename from content/media/test/test_streams_element_capture_createObjectURL.html
rename to dom/media/test/test_streams_element_capture_createObjectURL.html
diff --git a/content/media/test/test_streams_element_capture_playback.html b/dom/media/test/test_streams_element_capture_playback.html
similarity index 100%
rename from content/media/test/test_streams_element_capture_playback.html
rename to dom/media/test/test_streams_element_capture_playback.html
diff --git a/content/media/test/test_streams_element_capture_reset.html b/dom/media/test/test_streams_element_capture_reset.html
similarity index 100%
rename from content/media/test/test_streams_element_capture_reset.html
rename to dom/media/test/test_streams_element_capture_reset.html
diff --git a/content/media/test/test_streams_gc.html b/dom/media/test/test_streams_gc.html
similarity index 100%
rename from content/media/test/test_streams_gc.html
rename to dom/media/test/test_streams_gc.html
diff --git a/content/media/test/test_streams_srcObject.html b/dom/media/test/test_streams_srcObject.html
similarity index 100%
rename from content/media/test/test_streams_srcObject.html
rename to dom/media/test/test_streams_srcObject.html
diff --git a/content/media/test/test_streams_tracks.html b/dom/media/test/test_streams_tracks.html
similarity index 100%
rename from content/media/test/test_streams_tracks.html
rename to dom/media/test/test_streams_tracks.html
diff --git a/content/media/test/test_texttrack.html b/dom/media/test/test_texttrack.html
similarity index 100%
rename from content/media/test/test_texttrack.html
rename to dom/media/test/test_texttrack.html
diff --git a/content/media/test/test_texttrack_chrome.html b/dom/media/test/test_texttrack_chrome.html
similarity index 100%
rename from content/media/test/test_texttrack_chrome.html
rename to dom/media/test/test_texttrack_chrome.html
diff --git a/content/media/test/test_texttrackcue.html b/dom/media/test/test_texttrackcue.html
similarity index 100%
rename from content/media/test/test_texttrackcue.html
rename to dom/media/test/test_texttrackcue.html
diff --git a/content/media/test/test_texttrackcue_chrome.html b/dom/media/test/test_texttrackcue_chrome.html
similarity index 100%
rename from content/media/test/test_texttrackcue_chrome.html
rename to dom/media/test/test_texttrackcue_chrome.html
diff --git a/content/media/test/test_texttracklist.html b/dom/media/test/test_texttracklist.html
similarity index 100%
rename from content/media/test/test_texttracklist.html
rename to dom/media/test/test_texttracklist.html
diff --git a/content/media/test/test_texttracklist_chrome.html b/dom/media/test/test_texttracklist_chrome.html
similarity index 100%
rename from content/media/test/test_texttracklist_chrome.html
rename to dom/media/test/test_texttracklist_chrome.html
diff --git a/content/media/test/test_texttrackregion.html b/dom/media/test/test_texttrackregion.html
similarity index 100%
rename from content/media/test/test_texttrackregion.html
rename to dom/media/test/test_texttrackregion.html
diff --git a/content/media/test/test_timeupdate_small_files.html b/dom/media/test/test_timeupdate_small_files.html
similarity index 100%
rename from content/media/test/test_timeupdate_small_files.html
rename to dom/media/test/test_timeupdate_small_files.html
diff --git a/content/media/test/test_trackelementevent.html b/dom/media/test/test_trackelementevent.html
similarity index 100%
rename from content/media/test/test_trackelementevent.html
rename to dom/media/test/test_trackelementevent.html
diff --git a/content/media/test/test_trackevent.html b/dom/media/test/test_trackevent.html
similarity index 100%
rename from content/media/test/test_trackevent.html
rename to dom/media/test/test_trackevent.html
diff --git a/content/media/test/test_unseekable.html b/dom/media/test/test_unseekable.html
similarity index 100%
rename from content/media/test/test_unseekable.html
rename to dom/media/test/test_unseekable.html
diff --git a/content/media/test/test_videoDocumentTitle.html b/dom/media/test/test_videoDocumentTitle.html
similarity index 100%
rename from content/media/test/test_videoDocumentTitle.html
rename to dom/media/test/test_videoDocumentTitle.html
diff --git a/content/media/test/test_video_in_audio_element.html b/dom/media/test/test_video_in_audio_element.html
similarity index 100%
rename from content/media/test/test_video_in_audio_element.html
rename to dom/media/test/test_video_in_audio_element.html
diff --git a/content/media/test/test_video_to_canvas.html b/dom/media/test/test_video_to_canvas.html
similarity index 100%
rename from content/media/test/test_video_to_canvas.html
rename to dom/media/test/test_video_to_canvas.html
diff --git a/content/media/test/test_volume.html b/dom/media/test/test_volume.html
similarity index 100%
rename from content/media/test/test_volume.html
rename to dom/media/test/test_volume.html
diff --git a/content/media/test/test_vttparser.html b/dom/media/test/test_vttparser.html
similarity index 100%
rename from content/media/test/test_vttparser.html
rename to dom/media/test/test_vttparser.html
diff --git a/content/media/test/test_wav_ended1.html b/dom/media/test/test_wav_ended1.html
similarity index 100%
rename from content/media/test/test_wav_ended1.html
rename to dom/media/test/test_wav_ended1.html
diff --git a/content/media/test/test_wav_ended2.html b/dom/media/test/test_wav_ended2.html
similarity index 100%
rename from content/media/test/test_wav_ended2.html
rename to dom/media/test/test_wav_ended2.html
diff --git a/content/media/test/test_webvtt_disabled.html b/dom/media/test/test_webvtt_disabled.html
similarity index 100%
rename from content/media/test/test_webvtt_disabled.html
rename to dom/media/test/test_webvtt_disabled.html
diff --git a/content/media/test/variable-channel.ogg b/dom/media/test/variable-channel.ogg
similarity index 100%
rename from content/media/test/variable-channel.ogg
rename to dom/media/test/variable-channel.ogg
diff --git a/content/media/test/variable-channel.ogg^headers^ b/dom/media/test/variable-channel.ogg^headers^
similarity index 100%
rename from content/media/test/variable-channel.ogg^headers^
rename to dom/media/test/variable-channel.ogg^headers^
diff --git a/content/media/test/variable-channel.opus b/dom/media/test/variable-channel.opus
similarity index 100%
rename from content/media/test/variable-channel.opus
rename to dom/media/test/variable-channel.opus
diff --git a/content/media/test/variable-channel.opus^headers^ b/dom/media/test/variable-channel.opus^headers^
similarity index 100%
rename from content/media/test/variable-channel.opus^headers^
rename to dom/media/test/variable-channel.opus^headers^
diff --git a/content/media/test/variable-preskip.opus b/dom/media/test/variable-preskip.opus
similarity index 100%
rename from content/media/test/variable-preskip.opus
rename to dom/media/test/variable-preskip.opus
diff --git a/content/media/test/variable-preskip.opus^headers^ b/dom/media/test/variable-preskip.opus^headers^
similarity index 100%
rename from content/media/test/variable-preskip.opus^headers^
rename to dom/media/test/variable-preskip.opus^headers^
diff --git a/content/media/test/variable-samplerate.ogg b/dom/media/test/variable-samplerate.ogg
similarity index 100%
rename from content/media/test/variable-samplerate.ogg
rename to dom/media/test/variable-samplerate.ogg
diff --git a/content/media/test/variable-samplerate.ogg^headers^ b/dom/media/test/variable-samplerate.ogg^headers^
similarity index 100%
rename from content/media/test/variable-samplerate.ogg^headers^
rename to dom/media/test/variable-samplerate.ogg^headers^
diff --git a/content/media/test/variable-samplerate.opus b/dom/media/test/variable-samplerate.opus
similarity index 100%
rename from content/media/test/variable-samplerate.opus
rename to dom/media/test/variable-samplerate.opus
diff --git a/content/media/test/variable-samplerate.opus^headers^ b/dom/media/test/variable-samplerate.opus^headers^
similarity index 100%
rename from content/media/test/variable-samplerate.opus^headers^
rename to dom/media/test/variable-samplerate.opus^headers^
diff --git a/content/media/test/vbr-head.mp3 b/dom/media/test/vbr-head.mp3
similarity index 100%
rename from content/media/test/vbr-head.mp3
rename to dom/media/test/vbr-head.mp3
diff --git a/content/media/test/vbr-head.mp3^headers^ b/dom/media/test/vbr-head.mp3^headers^
similarity index 100%
rename from content/media/test/vbr-head.mp3^headers^
rename to dom/media/test/vbr-head.mp3^headers^
diff --git a/content/media/test/vbr.mp3 b/dom/media/test/vbr.mp3
similarity index 100%
rename from content/media/test/vbr.mp3
rename to dom/media/test/vbr.mp3
diff --git a/content/media/test/vbr.mp3^headers^ b/dom/media/test/vbr.mp3^headers^
similarity index 100%
rename from content/media/test/vbr.mp3^headers^
rename to dom/media/test/vbr.mp3^headers^
diff --git a/content/media/test/video-overhang.ogg b/dom/media/test/video-overhang.ogg
similarity index 100%
rename from content/media/test/video-overhang.ogg
rename to dom/media/test/video-overhang.ogg
diff --git a/content/media/test/video-overhang.ogg^headers^ b/dom/media/test/video-overhang.ogg^headers^
similarity index 100%
rename from content/media/test/video-overhang.ogg^headers^
rename to dom/media/test/video-overhang.ogg^headers^
diff --git a/content/media/test/vp9.webm b/dom/media/test/vp9.webm
similarity index 100%
rename from content/media/test/vp9.webm
rename to dom/media/test/vp9.webm
diff --git a/content/media/test/vp9.webm^headers^ b/dom/media/test/vp9.webm^headers^
similarity index 100%
rename from content/media/test/vp9.webm^headers^
rename to dom/media/test/vp9.webm^headers^
diff --git a/content/media/test/vp9cake.webm b/dom/media/test/vp9cake.webm
similarity index 100%
rename from content/media/test/vp9cake.webm
rename to dom/media/test/vp9cake.webm
diff --git a/content/media/test/vp9cake.webm^headers^ b/dom/media/test/vp9cake.webm^headers^
similarity index 100%
rename from content/media/test/vp9cake.webm^headers^
rename to dom/media/test/vp9cake.webm^headers^
diff --git a/content/media/test/wave_metadata.wav b/dom/media/test/wave_metadata.wav
similarity index 100%
rename from content/media/test/wave_metadata.wav
rename to dom/media/test/wave_metadata.wav
diff --git a/content/media/test/wave_metadata.wav^headers^ b/dom/media/test/wave_metadata.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata.wav^headers^
rename to dom/media/test/wave_metadata.wav^headers^
diff --git a/content/media/test/wave_metadata_bad_len.wav b/dom/media/test/wave_metadata_bad_len.wav
similarity index 100%
rename from content/media/test/wave_metadata_bad_len.wav
rename to dom/media/test/wave_metadata_bad_len.wav
diff --git a/content/media/test/wave_metadata_bad_len.wav^headers^ b/dom/media/test/wave_metadata_bad_len.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata_bad_len.wav^headers^
rename to dom/media/test/wave_metadata_bad_len.wav^headers^
diff --git a/content/media/test/wave_metadata_bad_no_null.wav b/dom/media/test/wave_metadata_bad_no_null.wav
similarity index 100%
rename from content/media/test/wave_metadata_bad_no_null.wav
rename to dom/media/test/wave_metadata_bad_no_null.wav
diff --git a/content/media/test/wave_metadata_bad_no_null.wav^headers^ b/dom/media/test/wave_metadata_bad_no_null.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata_bad_no_null.wav^headers^
rename to dom/media/test/wave_metadata_bad_no_null.wav^headers^
diff --git a/content/media/test/wave_metadata_bad_utf8.wav b/dom/media/test/wave_metadata_bad_utf8.wav
similarity index 100%
rename from content/media/test/wave_metadata_bad_utf8.wav
rename to dom/media/test/wave_metadata_bad_utf8.wav
diff --git a/content/media/test/wave_metadata_bad_utf8.wav^headers^ b/dom/media/test/wave_metadata_bad_utf8.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata_bad_utf8.wav^headers^
rename to dom/media/test/wave_metadata_bad_utf8.wav^headers^
diff --git a/content/media/test/wave_metadata_unknown_tag.wav b/dom/media/test/wave_metadata_unknown_tag.wav
similarity index 100%
rename from content/media/test/wave_metadata_unknown_tag.wav
rename to dom/media/test/wave_metadata_unknown_tag.wav
diff --git a/content/media/test/wave_metadata_unknown_tag.wav^headers^ b/dom/media/test/wave_metadata_unknown_tag.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata_unknown_tag.wav^headers^
rename to dom/media/test/wave_metadata_unknown_tag.wav^headers^
diff --git a/content/media/test/wave_metadata_utf8.wav b/dom/media/test/wave_metadata_utf8.wav
similarity index 100%
rename from content/media/test/wave_metadata_utf8.wav
rename to dom/media/test/wave_metadata_utf8.wav
diff --git a/content/media/test/wave_metadata_utf8.wav^headers^ b/dom/media/test/wave_metadata_utf8.wav^headers^
similarity index 100%
rename from content/media/test/wave_metadata_utf8.wav^headers^
rename to dom/media/test/wave_metadata_utf8.wav^headers^
diff --git a/content/media/test/wavedata_s16.wav b/dom/media/test/wavedata_s16.wav
similarity index 100%
rename from content/media/test/wavedata_s16.wav
rename to dom/media/test/wavedata_s16.wav
diff --git a/content/media/test/wavedata_s16.wav^headers^ b/dom/media/test/wavedata_s16.wav^headers^
similarity index 100%
rename from content/media/test/wavedata_s16.wav^headers^
rename to dom/media/test/wavedata_s16.wav^headers^
diff --git a/content/media/test/wavedata_u8.wav b/dom/media/test/wavedata_u8.wav
similarity index 100%
rename from content/media/test/wavedata_u8.wav
rename to dom/media/test/wavedata_u8.wav
diff --git a/content/media/test/wavedata_u8.wav^headers^ b/dom/media/test/wavedata_u8.wav^headers^
similarity index 100%
rename from content/media/test/wavedata_u8.wav^headers^
rename to dom/media/test/wavedata_u8.wav^headers^
diff --git a/content/media/wave/WaveDecoder.cpp b/dom/media/wave/WaveDecoder.cpp
similarity index 100%
rename from content/media/wave/WaveDecoder.cpp
rename to dom/media/wave/WaveDecoder.cpp
diff --git a/content/media/wave/WaveDecoder.h b/dom/media/wave/WaveDecoder.h
similarity index 100%
rename from content/media/wave/WaveDecoder.h
rename to dom/media/wave/WaveDecoder.h
diff --git a/content/media/wave/WaveReader.cpp b/dom/media/wave/WaveReader.cpp
similarity index 100%
rename from content/media/wave/WaveReader.cpp
rename to dom/media/wave/WaveReader.cpp
diff --git a/content/media/wave/WaveReader.h b/dom/media/wave/WaveReader.h
similarity index 100%
rename from content/media/wave/WaveReader.h
rename to dom/media/wave/WaveReader.h
diff --git a/content/media/wave/moz.build b/dom/media/wave/moz.build
similarity index 100%
rename from content/media/wave/moz.build
rename to dom/media/wave/moz.build
diff --git a/content/media/webaudio/AnalyserNode.cpp b/dom/media/webaudio/AnalyserNode.cpp
similarity index 100%
rename from content/media/webaudio/AnalyserNode.cpp
rename to dom/media/webaudio/AnalyserNode.cpp
diff --git a/content/media/webaudio/AnalyserNode.h b/dom/media/webaudio/AnalyserNode.h
similarity index 100%
rename from content/media/webaudio/AnalyserNode.h
rename to dom/media/webaudio/AnalyserNode.h
diff --git a/content/media/webaudio/AudioBuffer.cpp b/dom/media/webaudio/AudioBuffer.cpp
similarity index 100%
rename from content/media/webaudio/AudioBuffer.cpp
rename to dom/media/webaudio/AudioBuffer.cpp
diff --git a/content/media/webaudio/AudioBuffer.h b/dom/media/webaudio/AudioBuffer.h
similarity index 100%
rename from content/media/webaudio/AudioBuffer.h
rename to dom/media/webaudio/AudioBuffer.h
diff --git a/content/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp
similarity index 100%
rename from content/media/webaudio/AudioBufferSourceNode.cpp
rename to dom/media/webaudio/AudioBufferSourceNode.cpp
diff --git a/content/media/webaudio/AudioBufferSourceNode.h b/dom/media/webaudio/AudioBufferSourceNode.h
similarity index 100%
rename from content/media/webaudio/AudioBufferSourceNode.h
rename to dom/media/webaudio/AudioBufferSourceNode.h
diff --git a/content/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
similarity index 100%
rename from content/media/webaudio/AudioContext.cpp
rename to dom/media/webaudio/AudioContext.cpp
diff --git a/content/media/webaudio/AudioContext.h b/dom/media/webaudio/AudioContext.h
similarity index 99%
rename from content/media/webaudio/AudioContext.h
rename to dom/media/webaudio/AudioContext.h
index 857f66e790c..42dda249ca4 100644
--- a/content/media/webaudio/AudioContext.h
+++ b/dom/media/webaudio/AudioContext.h
@@ -22,7 +22,7 @@
 #include "nsIMemoryReporter.h"
 
 // X11 has a #define for CurrentTime. Unbelievable :-(.
-// See content/media/DOMMediaStream.h for more fun!
+// See dom/media/DOMMediaStream.h for more fun!
 #ifdef CurrentTime
 #undef CurrentTime
 #endif
diff --git a/content/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp
similarity index 100%
rename from content/media/webaudio/AudioDestinationNode.cpp
rename to dom/media/webaudio/AudioDestinationNode.cpp
diff --git a/content/media/webaudio/AudioDestinationNode.h b/dom/media/webaudio/AudioDestinationNode.h
similarity index 100%
rename from content/media/webaudio/AudioDestinationNode.h
rename to dom/media/webaudio/AudioDestinationNode.h
diff --git a/content/media/webaudio/AudioEventTimeline.h b/dom/media/webaudio/AudioEventTimeline.h
similarity index 100%
rename from content/media/webaudio/AudioEventTimeline.h
rename to dom/media/webaudio/AudioEventTimeline.h
diff --git a/content/media/webaudio/AudioListener.cpp b/dom/media/webaudio/AudioListener.cpp
similarity index 100%
rename from content/media/webaudio/AudioListener.cpp
rename to dom/media/webaudio/AudioListener.cpp
diff --git a/content/media/webaudio/AudioListener.h b/dom/media/webaudio/AudioListener.h
similarity index 100%
rename from content/media/webaudio/AudioListener.h
rename to dom/media/webaudio/AudioListener.h
diff --git a/content/media/webaudio/AudioNode.cpp b/dom/media/webaudio/AudioNode.cpp
similarity index 100%
rename from content/media/webaudio/AudioNode.cpp
rename to dom/media/webaudio/AudioNode.cpp
diff --git a/content/media/webaudio/AudioNode.h b/dom/media/webaudio/AudioNode.h
similarity index 100%
rename from content/media/webaudio/AudioNode.h
rename to dom/media/webaudio/AudioNode.h
diff --git a/content/media/webaudio/AudioNodeEngine.cpp b/dom/media/webaudio/AudioNodeEngine.cpp
similarity index 100%
rename from content/media/webaudio/AudioNodeEngine.cpp
rename to dom/media/webaudio/AudioNodeEngine.cpp
diff --git a/content/media/webaudio/AudioNodeEngine.h b/dom/media/webaudio/AudioNodeEngine.h
similarity index 100%
rename from content/media/webaudio/AudioNodeEngine.h
rename to dom/media/webaudio/AudioNodeEngine.h
diff --git a/content/media/webaudio/AudioNodeEngineNEON.cpp b/dom/media/webaudio/AudioNodeEngineNEON.cpp
similarity index 100%
rename from content/media/webaudio/AudioNodeEngineNEON.cpp
rename to dom/media/webaudio/AudioNodeEngineNEON.cpp
diff --git a/content/media/webaudio/AudioNodeEngineNEON.h b/dom/media/webaudio/AudioNodeEngineNEON.h
similarity index 100%
rename from content/media/webaudio/AudioNodeEngineNEON.h
rename to dom/media/webaudio/AudioNodeEngineNEON.h
diff --git a/content/media/webaudio/AudioNodeExternalInputStream.cpp b/dom/media/webaudio/AudioNodeExternalInputStream.cpp
similarity index 100%
rename from content/media/webaudio/AudioNodeExternalInputStream.cpp
rename to dom/media/webaudio/AudioNodeExternalInputStream.cpp
diff --git a/content/media/webaudio/AudioNodeExternalInputStream.h b/dom/media/webaudio/AudioNodeExternalInputStream.h
similarity index 100%
rename from content/media/webaudio/AudioNodeExternalInputStream.h
rename to dom/media/webaudio/AudioNodeExternalInputStream.h
diff --git a/content/media/webaudio/AudioNodeStream.cpp b/dom/media/webaudio/AudioNodeStream.cpp
similarity index 100%
rename from content/media/webaudio/AudioNodeStream.cpp
rename to dom/media/webaudio/AudioNodeStream.cpp
diff --git a/content/media/webaudio/AudioNodeStream.h b/dom/media/webaudio/AudioNodeStream.h
similarity index 100%
rename from content/media/webaudio/AudioNodeStream.h
rename to dom/media/webaudio/AudioNodeStream.h
diff --git a/content/media/webaudio/AudioParam.cpp b/dom/media/webaudio/AudioParam.cpp
similarity index 100%
rename from content/media/webaudio/AudioParam.cpp
rename to dom/media/webaudio/AudioParam.cpp
diff --git a/content/media/webaudio/AudioParam.h b/dom/media/webaudio/AudioParam.h
similarity index 100%
rename from content/media/webaudio/AudioParam.h
rename to dom/media/webaudio/AudioParam.h
diff --git a/content/media/webaudio/AudioParamTimeline.h b/dom/media/webaudio/AudioParamTimeline.h
similarity index 100%
rename from content/media/webaudio/AudioParamTimeline.h
rename to dom/media/webaudio/AudioParamTimeline.h
diff --git a/content/media/webaudio/AudioProcessingEvent.cpp b/dom/media/webaudio/AudioProcessingEvent.cpp
similarity index 100%
rename from content/media/webaudio/AudioProcessingEvent.cpp
rename to dom/media/webaudio/AudioProcessingEvent.cpp
diff --git a/content/media/webaudio/AudioProcessingEvent.h b/dom/media/webaudio/AudioProcessingEvent.h
similarity index 100%
rename from content/media/webaudio/AudioProcessingEvent.h
rename to dom/media/webaudio/AudioProcessingEvent.h
diff --git a/content/media/webaudio/BiquadFilterNode.cpp b/dom/media/webaudio/BiquadFilterNode.cpp
similarity index 100%
rename from content/media/webaudio/BiquadFilterNode.cpp
rename to dom/media/webaudio/BiquadFilterNode.cpp
diff --git a/content/media/webaudio/BiquadFilterNode.h b/dom/media/webaudio/BiquadFilterNode.h
similarity index 100%
rename from content/media/webaudio/BiquadFilterNode.h
rename to dom/media/webaudio/BiquadFilterNode.h
diff --git a/content/media/webaudio/BufferDecoder.cpp b/dom/media/webaudio/BufferDecoder.cpp
similarity index 100%
rename from content/media/webaudio/BufferDecoder.cpp
rename to dom/media/webaudio/BufferDecoder.cpp
diff --git a/content/media/webaudio/BufferDecoder.h b/dom/media/webaudio/BufferDecoder.h
similarity index 100%
rename from content/media/webaudio/BufferDecoder.h
rename to dom/media/webaudio/BufferDecoder.h
diff --git a/content/media/webaudio/ChannelMergerNode.cpp b/dom/media/webaudio/ChannelMergerNode.cpp
similarity index 100%
rename from content/media/webaudio/ChannelMergerNode.cpp
rename to dom/media/webaudio/ChannelMergerNode.cpp
diff --git a/content/media/webaudio/ChannelMergerNode.h b/dom/media/webaudio/ChannelMergerNode.h
similarity index 100%
rename from content/media/webaudio/ChannelMergerNode.h
rename to dom/media/webaudio/ChannelMergerNode.h
diff --git a/content/media/webaudio/ChannelSplitterNode.cpp b/dom/media/webaudio/ChannelSplitterNode.cpp
similarity index 100%
rename from content/media/webaudio/ChannelSplitterNode.cpp
rename to dom/media/webaudio/ChannelSplitterNode.cpp
diff --git a/content/media/webaudio/ChannelSplitterNode.h b/dom/media/webaudio/ChannelSplitterNode.h
similarity index 100%
rename from content/media/webaudio/ChannelSplitterNode.h
rename to dom/media/webaudio/ChannelSplitterNode.h
diff --git a/content/media/webaudio/ConvolverNode.cpp b/dom/media/webaudio/ConvolverNode.cpp
similarity index 100%
rename from content/media/webaudio/ConvolverNode.cpp
rename to dom/media/webaudio/ConvolverNode.cpp
diff --git a/content/media/webaudio/ConvolverNode.h b/dom/media/webaudio/ConvolverNode.h
similarity index 100%
rename from content/media/webaudio/ConvolverNode.h
rename to dom/media/webaudio/ConvolverNode.h
diff --git a/content/media/webaudio/DelayBuffer.cpp b/dom/media/webaudio/DelayBuffer.cpp
similarity index 100%
rename from content/media/webaudio/DelayBuffer.cpp
rename to dom/media/webaudio/DelayBuffer.cpp
diff --git a/content/media/webaudio/DelayBuffer.h b/dom/media/webaudio/DelayBuffer.h
similarity index 100%
rename from content/media/webaudio/DelayBuffer.h
rename to dom/media/webaudio/DelayBuffer.h
diff --git a/content/media/webaudio/DelayNode.cpp b/dom/media/webaudio/DelayNode.cpp
similarity index 100%
rename from content/media/webaudio/DelayNode.cpp
rename to dom/media/webaudio/DelayNode.cpp
diff --git a/content/media/webaudio/DelayNode.h b/dom/media/webaudio/DelayNode.h
similarity index 100%
rename from content/media/webaudio/DelayNode.h
rename to dom/media/webaudio/DelayNode.h
diff --git a/content/media/webaudio/DynamicsCompressorNode.cpp b/dom/media/webaudio/DynamicsCompressorNode.cpp
similarity index 100%
rename from content/media/webaudio/DynamicsCompressorNode.cpp
rename to dom/media/webaudio/DynamicsCompressorNode.cpp
diff --git a/content/media/webaudio/DynamicsCompressorNode.h b/dom/media/webaudio/DynamicsCompressorNode.h
similarity index 100%
rename from content/media/webaudio/DynamicsCompressorNode.h
rename to dom/media/webaudio/DynamicsCompressorNode.h
diff --git a/content/media/webaudio/FFTBlock.cpp b/dom/media/webaudio/FFTBlock.cpp
similarity index 100%
rename from content/media/webaudio/FFTBlock.cpp
rename to dom/media/webaudio/FFTBlock.cpp
diff --git a/content/media/webaudio/FFTBlock.h b/dom/media/webaudio/FFTBlock.h
similarity index 100%
rename from content/media/webaudio/FFTBlock.h
rename to dom/media/webaudio/FFTBlock.h
diff --git a/content/media/webaudio/GainNode.cpp b/dom/media/webaudio/GainNode.cpp
similarity index 100%
rename from content/media/webaudio/GainNode.cpp
rename to dom/media/webaudio/GainNode.cpp
diff --git a/content/media/webaudio/GainNode.h b/dom/media/webaudio/GainNode.h
similarity index 100%
rename from content/media/webaudio/GainNode.h
rename to dom/media/webaudio/GainNode.h
diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/dom/media/webaudio/MediaBufferDecoder.cpp
similarity index 100%
rename from content/media/webaudio/MediaBufferDecoder.cpp
rename to dom/media/webaudio/MediaBufferDecoder.cpp
diff --git a/content/media/webaudio/MediaBufferDecoder.h b/dom/media/webaudio/MediaBufferDecoder.h
similarity index 100%
rename from content/media/webaudio/MediaBufferDecoder.h
rename to dom/media/webaudio/MediaBufferDecoder.h
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.cpp b/dom/media/webaudio/MediaElementAudioSourceNode.cpp
similarity index 100%
rename from content/media/webaudio/MediaElementAudioSourceNode.cpp
rename to dom/media/webaudio/MediaElementAudioSourceNode.cpp
diff --git a/content/media/webaudio/MediaElementAudioSourceNode.h b/dom/media/webaudio/MediaElementAudioSourceNode.h
similarity index 100%
rename from content/media/webaudio/MediaElementAudioSourceNode.h
rename to dom/media/webaudio/MediaElementAudioSourceNode.h
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.cpp b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
similarity index 100%
rename from content/media/webaudio/MediaStreamAudioDestinationNode.cpp
rename to dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
diff --git a/content/media/webaudio/MediaStreamAudioDestinationNode.h b/dom/media/webaudio/MediaStreamAudioDestinationNode.h
similarity index 100%
rename from content/media/webaudio/MediaStreamAudioDestinationNode.h
rename to dom/media/webaudio/MediaStreamAudioDestinationNode.h
diff --git a/content/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
similarity index 100%
rename from content/media/webaudio/MediaStreamAudioSourceNode.cpp
rename to dom/media/webaudio/MediaStreamAudioSourceNode.cpp
diff --git a/content/media/webaudio/MediaStreamAudioSourceNode.h b/dom/media/webaudio/MediaStreamAudioSourceNode.h
similarity index 100%
rename from content/media/webaudio/MediaStreamAudioSourceNode.h
rename to dom/media/webaudio/MediaStreamAudioSourceNode.h
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.cpp b/dom/media/webaudio/OfflineAudioCompletionEvent.cpp
similarity index 100%
rename from content/media/webaudio/OfflineAudioCompletionEvent.cpp
rename to dom/media/webaudio/OfflineAudioCompletionEvent.cpp
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.h b/dom/media/webaudio/OfflineAudioCompletionEvent.h
similarity index 100%
rename from content/media/webaudio/OfflineAudioCompletionEvent.h
rename to dom/media/webaudio/OfflineAudioCompletionEvent.h
diff --git a/content/media/webaudio/OscillatorNode.cpp b/dom/media/webaudio/OscillatorNode.cpp
similarity index 100%
rename from content/media/webaudio/OscillatorNode.cpp
rename to dom/media/webaudio/OscillatorNode.cpp
diff --git a/content/media/webaudio/OscillatorNode.h b/dom/media/webaudio/OscillatorNode.h
similarity index 100%
rename from content/media/webaudio/OscillatorNode.h
rename to dom/media/webaudio/OscillatorNode.h
diff --git a/content/media/webaudio/PannerNode.cpp b/dom/media/webaudio/PannerNode.cpp
similarity index 100%
rename from content/media/webaudio/PannerNode.cpp
rename to dom/media/webaudio/PannerNode.cpp
diff --git a/content/media/webaudio/PannerNode.h b/dom/media/webaudio/PannerNode.h
similarity index 100%
rename from content/media/webaudio/PannerNode.h
rename to dom/media/webaudio/PannerNode.h
diff --git a/content/media/webaudio/PeriodicWave.cpp b/dom/media/webaudio/PeriodicWave.cpp
similarity index 100%
rename from content/media/webaudio/PeriodicWave.cpp
rename to dom/media/webaudio/PeriodicWave.cpp
diff --git a/content/media/webaudio/PeriodicWave.h b/dom/media/webaudio/PeriodicWave.h
similarity index 100%
rename from content/media/webaudio/PeriodicWave.h
rename to dom/media/webaudio/PeriodicWave.h
diff --git a/content/media/webaudio/PlayingRefChangeHandler.h b/dom/media/webaudio/PlayingRefChangeHandler.h
similarity index 100%
rename from content/media/webaudio/PlayingRefChangeHandler.h
rename to dom/media/webaudio/PlayingRefChangeHandler.h
diff --git a/content/media/webaudio/ReportDecodeResultTask.h b/dom/media/webaudio/ReportDecodeResultTask.h
similarity index 100%
rename from content/media/webaudio/ReportDecodeResultTask.h
rename to dom/media/webaudio/ReportDecodeResultTask.h
diff --git a/content/media/webaudio/ScriptProcessorNode.cpp b/dom/media/webaudio/ScriptProcessorNode.cpp
similarity index 100%
rename from content/media/webaudio/ScriptProcessorNode.cpp
rename to dom/media/webaudio/ScriptProcessorNode.cpp
diff --git a/content/media/webaudio/ScriptProcessorNode.h b/dom/media/webaudio/ScriptProcessorNode.h
similarity index 100%
rename from content/media/webaudio/ScriptProcessorNode.h
rename to dom/media/webaudio/ScriptProcessorNode.h
diff --git a/content/media/webaudio/ThreeDPoint.cpp b/dom/media/webaudio/ThreeDPoint.cpp
similarity index 100%
rename from content/media/webaudio/ThreeDPoint.cpp
rename to dom/media/webaudio/ThreeDPoint.cpp
diff --git a/content/media/webaudio/ThreeDPoint.h b/dom/media/webaudio/ThreeDPoint.h
similarity index 100%
rename from content/media/webaudio/ThreeDPoint.h
rename to dom/media/webaudio/ThreeDPoint.h
diff --git a/content/media/webaudio/WaveShaperNode.cpp b/dom/media/webaudio/WaveShaperNode.cpp
similarity index 100%
rename from content/media/webaudio/WaveShaperNode.cpp
rename to dom/media/webaudio/WaveShaperNode.cpp
diff --git a/content/media/webaudio/WaveShaperNode.h b/dom/media/webaudio/WaveShaperNode.h
similarity index 100%
rename from content/media/webaudio/WaveShaperNode.h
rename to dom/media/webaudio/WaveShaperNode.h
diff --git a/content/media/webaudio/WebAudioUtils.cpp b/dom/media/webaudio/WebAudioUtils.cpp
similarity index 100%
rename from content/media/webaudio/WebAudioUtils.cpp
rename to dom/media/webaudio/WebAudioUtils.cpp
diff --git a/content/media/webaudio/WebAudioUtils.h b/dom/media/webaudio/WebAudioUtils.h
similarity index 100%
rename from content/media/webaudio/WebAudioUtils.h
rename to dom/media/webaudio/WebAudioUtils.h
diff --git a/content/media/webaudio/blink/Biquad.cpp b/dom/media/webaudio/blink/Biquad.cpp
similarity index 100%
rename from content/media/webaudio/blink/Biquad.cpp
rename to dom/media/webaudio/blink/Biquad.cpp
diff --git a/content/media/webaudio/blink/Biquad.h b/dom/media/webaudio/blink/Biquad.h
similarity index 100%
rename from content/media/webaudio/blink/Biquad.h
rename to dom/media/webaudio/blink/Biquad.h
diff --git a/content/media/webaudio/blink/DenormalDisabler.h b/dom/media/webaudio/blink/DenormalDisabler.h
similarity index 100%
rename from content/media/webaudio/blink/DenormalDisabler.h
rename to dom/media/webaudio/blink/DenormalDisabler.h
diff --git a/content/media/webaudio/blink/DirectConvolver.cpp b/dom/media/webaudio/blink/DirectConvolver.cpp
similarity index 100%
rename from content/media/webaudio/blink/DirectConvolver.cpp
rename to dom/media/webaudio/blink/DirectConvolver.cpp
diff --git a/content/media/webaudio/blink/DirectConvolver.h b/dom/media/webaudio/blink/DirectConvolver.h
similarity index 100%
rename from content/media/webaudio/blink/DirectConvolver.h
rename to dom/media/webaudio/blink/DirectConvolver.h
diff --git a/content/media/webaudio/blink/DynamicsCompressor.cpp b/dom/media/webaudio/blink/DynamicsCompressor.cpp
similarity index 100%
rename from content/media/webaudio/blink/DynamicsCompressor.cpp
rename to dom/media/webaudio/blink/DynamicsCompressor.cpp
diff --git a/content/media/webaudio/blink/DynamicsCompressor.h b/dom/media/webaudio/blink/DynamicsCompressor.h
similarity index 100%
rename from content/media/webaudio/blink/DynamicsCompressor.h
rename to dom/media/webaudio/blink/DynamicsCompressor.h
diff --git a/content/media/webaudio/blink/DynamicsCompressorKernel.cpp b/dom/media/webaudio/blink/DynamicsCompressorKernel.cpp
similarity index 100%
rename from content/media/webaudio/blink/DynamicsCompressorKernel.cpp
rename to dom/media/webaudio/blink/DynamicsCompressorKernel.cpp
diff --git a/content/media/webaudio/blink/DynamicsCompressorKernel.h b/dom/media/webaudio/blink/DynamicsCompressorKernel.h
similarity index 100%
rename from content/media/webaudio/blink/DynamicsCompressorKernel.h
rename to dom/media/webaudio/blink/DynamicsCompressorKernel.h
diff --git a/content/media/webaudio/blink/FFTConvolver.cpp b/dom/media/webaudio/blink/FFTConvolver.cpp
similarity index 100%
rename from content/media/webaudio/blink/FFTConvolver.cpp
rename to dom/media/webaudio/blink/FFTConvolver.cpp
diff --git a/content/media/webaudio/blink/FFTConvolver.h b/dom/media/webaudio/blink/FFTConvolver.h
similarity index 100%
rename from content/media/webaudio/blink/FFTConvolver.h
rename to dom/media/webaudio/blink/FFTConvolver.h
diff --git a/content/media/webaudio/blink/HRTFDatabase.cpp b/dom/media/webaudio/blink/HRTFDatabase.cpp
similarity index 100%
rename from content/media/webaudio/blink/HRTFDatabase.cpp
rename to dom/media/webaudio/blink/HRTFDatabase.cpp
diff --git a/content/media/webaudio/blink/HRTFDatabase.h b/dom/media/webaudio/blink/HRTFDatabase.h
similarity index 100%
rename from content/media/webaudio/blink/HRTFDatabase.h
rename to dom/media/webaudio/blink/HRTFDatabase.h
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.cpp b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
similarity index 100%
rename from content/media/webaudio/blink/HRTFDatabaseLoader.cpp
rename to dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
diff --git a/content/media/webaudio/blink/HRTFDatabaseLoader.h b/dom/media/webaudio/blink/HRTFDatabaseLoader.h
similarity index 100%
rename from content/media/webaudio/blink/HRTFDatabaseLoader.h
rename to dom/media/webaudio/blink/HRTFDatabaseLoader.h
diff --git a/content/media/webaudio/blink/HRTFElevation.cpp b/dom/media/webaudio/blink/HRTFElevation.cpp
similarity index 100%
rename from content/media/webaudio/blink/HRTFElevation.cpp
rename to dom/media/webaudio/blink/HRTFElevation.cpp
diff --git a/content/media/webaudio/blink/HRTFElevation.h b/dom/media/webaudio/blink/HRTFElevation.h
similarity index 100%
rename from content/media/webaudio/blink/HRTFElevation.h
rename to dom/media/webaudio/blink/HRTFElevation.h
diff --git a/content/media/webaudio/blink/HRTFKernel.cpp b/dom/media/webaudio/blink/HRTFKernel.cpp
similarity index 100%
rename from content/media/webaudio/blink/HRTFKernel.cpp
rename to dom/media/webaudio/blink/HRTFKernel.cpp
diff --git a/content/media/webaudio/blink/HRTFKernel.h b/dom/media/webaudio/blink/HRTFKernel.h
similarity index 100%
rename from content/media/webaudio/blink/HRTFKernel.h
rename to dom/media/webaudio/blink/HRTFKernel.h
diff --git a/content/media/webaudio/blink/HRTFPanner.cpp b/dom/media/webaudio/blink/HRTFPanner.cpp
similarity index 100%
rename from content/media/webaudio/blink/HRTFPanner.cpp
rename to dom/media/webaudio/blink/HRTFPanner.cpp
diff --git a/content/media/webaudio/blink/HRTFPanner.h b/dom/media/webaudio/blink/HRTFPanner.h
similarity index 100%
rename from content/media/webaudio/blink/HRTFPanner.h
rename to dom/media/webaudio/blink/HRTFPanner.h
diff --git a/content/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp b/dom/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp
similarity index 100%
rename from content/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp
rename to dom/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp
diff --git a/content/media/webaudio/blink/PeriodicWave.cpp b/dom/media/webaudio/blink/PeriodicWave.cpp
similarity index 100%
rename from content/media/webaudio/blink/PeriodicWave.cpp
rename to dom/media/webaudio/blink/PeriodicWave.cpp
diff --git a/content/media/webaudio/blink/PeriodicWave.h b/dom/media/webaudio/blink/PeriodicWave.h
similarity index 100%
rename from content/media/webaudio/blink/PeriodicWave.h
rename to dom/media/webaudio/blink/PeriodicWave.h
diff --git a/content/media/webaudio/blink/README b/dom/media/webaudio/blink/README
similarity index 100%
rename from content/media/webaudio/blink/README
rename to dom/media/webaudio/blink/README
diff --git a/content/media/webaudio/blink/Reverb.cpp b/dom/media/webaudio/blink/Reverb.cpp
similarity index 100%
rename from content/media/webaudio/blink/Reverb.cpp
rename to dom/media/webaudio/blink/Reverb.cpp
diff --git a/content/media/webaudio/blink/Reverb.h b/dom/media/webaudio/blink/Reverb.h
similarity index 100%
rename from content/media/webaudio/blink/Reverb.h
rename to dom/media/webaudio/blink/Reverb.h
diff --git a/content/media/webaudio/blink/ReverbAccumulationBuffer.cpp b/dom/media/webaudio/blink/ReverbAccumulationBuffer.cpp
similarity index 100%
rename from content/media/webaudio/blink/ReverbAccumulationBuffer.cpp
rename to dom/media/webaudio/blink/ReverbAccumulationBuffer.cpp
diff --git a/content/media/webaudio/blink/ReverbAccumulationBuffer.h b/dom/media/webaudio/blink/ReverbAccumulationBuffer.h
similarity index 100%
rename from content/media/webaudio/blink/ReverbAccumulationBuffer.h
rename to dom/media/webaudio/blink/ReverbAccumulationBuffer.h
diff --git a/content/media/webaudio/blink/ReverbConvolver.cpp b/dom/media/webaudio/blink/ReverbConvolver.cpp
similarity index 100%
rename from content/media/webaudio/blink/ReverbConvolver.cpp
rename to dom/media/webaudio/blink/ReverbConvolver.cpp
diff --git a/content/media/webaudio/blink/ReverbConvolver.h b/dom/media/webaudio/blink/ReverbConvolver.h
similarity index 100%
rename from content/media/webaudio/blink/ReverbConvolver.h
rename to dom/media/webaudio/blink/ReverbConvolver.h
diff --git a/content/media/webaudio/blink/ReverbConvolverStage.cpp b/dom/media/webaudio/blink/ReverbConvolverStage.cpp
similarity index 100%
rename from content/media/webaudio/blink/ReverbConvolverStage.cpp
rename to dom/media/webaudio/blink/ReverbConvolverStage.cpp
diff --git a/content/media/webaudio/blink/ReverbConvolverStage.h b/dom/media/webaudio/blink/ReverbConvolverStage.h
similarity index 100%
rename from content/media/webaudio/blink/ReverbConvolverStage.h
rename to dom/media/webaudio/blink/ReverbConvolverStage.h
diff --git a/content/media/webaudio/blink/ReverbInputBuffer.cpp b/dom/media/webaudio/blink/ReverbInputBuffer.cpp
similarity index 100%
rename from content/media/webaudio/blink/ReverbInputBuffer.cpp
rename to dom/media/webaudio/blink/ReverbInputBuffer.cpp
diff --git a/content/media/webaudio/blink/ReverbInputBuffer.h b/dom/media/webaudio/blink/ReverbInputBuffer.h
similarity index 100%
rename from content/media/webaudio/blink/ReverbInputBuffer.h
rename to dom/media/webaudio/blink/ReverbInputBuffer.h
diff --git a/content/media/webaudio/blink/ZeroPole.cpp b/dom/media/webaudio/blink/ZeroPole.cpp
similarity index 100%
rename from content/media/webaudio/blink/ZeroPole.cpp
rename to dom/media/webaudio/blink/ZeroPole.cpp
diff --git a/content/media/webaudio/blink/ZeroPole.h b/dom/media/webaudio/blink/ZeroPole.h
similarity index 100%
rename from content/media/webaudio/blink/ZeroPole.h
rename to dom/media/webaudio/blink/ZeroPole.h
diff --git a/content/media/webaudio/blink/moz.build b/dom/media/webaudio/blink/moz.build
similarity index 96%
rename from content/media/webaudio/blink/moz.build
rename to dom/media/webaudio/blink/moz.build
index 25a3920b2ed..ae4652281e8 100644
--- a/content/media/webaudio/blink/moz.build
+++ b/dom/media/webaudio/blink/moz.build
@@ -28,6 +28,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/media/webaudio',
+    '/dom/media/webaudio',
 ]
 
diff --git a/content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp b/dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
similarity index 100%
rename from content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
rename to dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
diff --git a/content/media/webaudio/compiledtest/moz.build b/dom/media/webaudio/compiledtest/moz.build
similarity index 100%
rename from content/media/webaudio/compiledtest/moz.build
rename to dom/media/webaudio/compiledtest/moz.build
diff --git a/content/media/webaudio/moz.build b/dom/media/webaudio/moz.build
similarity index 100%
rename from content/media/webaudio/moz.build
rename to dom/media/webaudio/moz.build
diff --git a/content/media/webaudio/test/audio-expected.wav b/dom/media/webaudio/test/audio-expected.wav
similarity index 100%
rename from content/media/webaudio/test/audio-expected.wav
rename to dom/media/webaudio/test/audio-expected.wav
diff --git a/content/media/webaudio/test/audio-mono-expected-2.wav b/dom/media/webaudio/test/audio-mono-expected-2.wav
similarity index 100%
rename from content/media/webaudio/test/audio-mono-expected-2.wav
rename to dom/media/webaudio/test/audio-mono-expected-2.wav
diff --git a/content/media/webaudio/test/audio-mono-expected.wav b/dom/media/webaudio/test/audio-mono-expected.wav
similarity index 100%
rename from content/media/webaudio/test/audio-mono-expected.wav
rename to dom/media/webaudio/test/audio-mono-expected.wav
diff --git a/content/media/webaudio/test/audio-quad.wav b/dom/media/webaudio/test/audio-quad.wav
similarity index 100%
rename from content/media/webaudio/test/audio-quad.wav
rename to dom/media/webaudio/test/audio-quad.wav
diff --git a/content/media/webaudio/test/audio.ogv b/dom/media/webaudio/test/audio.ogv
similarity index 100%
rename from content/media/webaudio/test/audio.ogv
rename to dom/media/webaudio/test/audio.ogv
diff --git a/content/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js b/dom/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js
similarity index 100%
rename from content/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js
rename to dom/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js
diff --git a/content/media/webaudio/test/blink/README b/dom/media/webaudio/test/blink/README
similarity index 100%
rename from content/media/webaudio/test/blink/README
rename to dom/media/webaudio/test/blink/README
diff --git a/content/media/webaudio/test/blink/audio-testing.js b/dom/media/webaudio/test/blink/audio-testing.js
similarity index 100%
rename from content/media/webaudio/test/blink/audio-testing.js
rename to dom/media/webaudio/test/blink/audio-testing.js
diff --git a/content/media/webaudio/test/blink/convolution-testing.js b/dom/media/webaudio/test/blink/convolution-testing.js
similarity index 100%
rename from content/media/webaudio/test/blink/convolution-testing.js
rename to dom/media/webaudio/test/blink/convolution-testing.js
diff --git a/content/media/webaudio/test/blink/mochitest.ini b/dom/media/webaudio/test/blink/mochitest.ini
similarity index 100%
rename from content/media/webaudio/test/blink/mochitest.ini
rename to dom/media/webaudio/test/blink/mochitest.ini
diff --git a/content/media/webaudio/test/blink/panner-model-testing.js b/dom/media/webaudio/test/blink/panner-model-testing.js
similarity index 100%
rename from content/media/webaudio/test/blink/panner-model-testing.js
rename to dom/media/webaudio/test/blink/panner-model-testing.js
diff --git a/content/media/webaudio/test/browser.ini b/dom/media/webaudio/test/browser.ini
similarity index 100%
rename from content/media/webaudio/test/browser.ini
rename to dom/media/webaudio/test/browser.ini
diff --git a/content/media/webaudio/test/browser_mozAudioChannel.html b/dom/media/webaudio/test/browser_mozAudioChannel.html
similarity index 100%
rename from content/media/webaudio/test/browser_mozAudioChannel.html
rename to dom/media/webaudio/test/browser_mozAudioChannel.html
diff --git a/content/media/webaudio/test/browser_mozAudioChannel.js b/dom/media/webaudio/test/browser_mozAudioChannel.js
similarity index 97%
rename from content/media/webaudio/test/browser_mozAudioChannel.js
rename to dom/media/webaudio/test/browser_mozAudioChannel.js
index 32201645d3c..3da0b89bbe8 100644
--- a/content/media/webaudio/test/browser_mozAudioChannel.js
+++ b/dom/media/webaudio/test/browser_mozAudioChannel.js
@@ -32,7 +32,7 @@ function test() {
   waitForExplicitFinish();
 
   let testURL = "http://mochi.test:8888/browser/" +
-    "content/media/webaudio/test/browser_mozAudioChannel.html";
+    "dom/media/webaudio/test/browser_mozAudioChannel.html";
 
   SpecialPowers.pushPrefEnv({"set": [["media.defaultAudioChannel", "content" ],
                                      ["media.useAudioChannelService", true ]]},
diff --git a/content/media/webaudio/test/browser_mozAudioChannel_muted.html b/dom/media/webaudio/test/browser_mozAudioChannel_muted.html
similarity index 100%
rename from content/media/webaudio/test/browser_mozAudioChannel_muted.html
rename to dom/media/webaudio/test/browser_mozAudioChannel_muted.html
diff --git a/content/media/webaudio/test/browser_mozAudioChannel_muted.js b/dom/media/webaudio/test/browser_mozAudioChannel_muted.js
similarity index 97%
rename from content/media/webaudio/test/browser_mozAudioChannel_muted.js
rename to dom/media/webaudio/test/browser_mozAudioChannel_muted.js
index 188540a0fe6..551031e43fb 100644
--- a/content/media/webaudio/test/browser_mozAudioChannel_muted.js
+++ b/dom/media/webaudio/test/browser_mozAudioChannel_muted.js
@@ -32,7 +32,7 @@ function test() {
   waitForExplicitFinish();
 
   let testURL = "http://mochi.test:8888/browser/" +
-    "content/media/webaudio/test/browser_mozAudioChannel_muted.html";
+    "dom/media/webaudio/test/browser_mozAudioChannel_muted.html";
 
   SpecialPowers.pushPrefEnv({"set": [["media.defaultAudioChannel", "content" ],
                                      ["media.useAudioChannelService", true ]]},
diff --git a/content/media/webaudio/test/chrome.ini b/dom/media/webaudio/test/chrome.ini
similarity index 100%
rename from content/media/webaudio/test/chrome.ini
rename to dom/media/webaudio/test/chrome.ini
diff --git a/content/media/webaudio/test/invalid.txt b/dom/media/webaudio/test/invalid.txt
similarity index 100%
rename from content/media/webaudio/test/invalid.txt
rename to dom/media/webaudio/test/invalid.txt
diff --git a/content/media/webaudio/test/layouttest-glue.js b/dom/media/webaudio/test/layouttest-glue.js
similarity index 100%
rename from content/media/webaudio/test/layouttest-glue.js
rename to dom/media/webaudio/test/layouttest-glue.js
diff --git a/content/media/webaudio/test/mochitest.ini b/dom/media/webaudio/test/mochitest.ini
similarity index 100%
rename from content/media/webaudio/test/mochitest.ini
rename to dom/media/webaudio/test/mochitest.ini
diff --git a/content/media/webaudio/test/noaudio.webm b/dom/media/webaudio/test/noaudio.webm
similarity index 100%
rename from content/media/webaudio/test/noaudio.webm
rename to dom/media/webaudio/test/noaudio.webm
diff --git a/content/media/webaudio/test/small-shot-expected.wav b/dom/media/webaudio/test/small-shot-expected.wav
similarity index 100%
rename from content/media/webaudio/test/small-shot-expected.wav
rename to dom/media/webaudio/test/small-shot-expected.wav
diff --git a/content/media/webaudio/test/small-shot-mono-expected.wav b/dom/media/webaudio/test/small-shot-mono-expected.wav
similarity index 100%
rename from content/media/webaudio/test/small-shot-mono-expected.wav
rename to dom/media/webaudio/test/small-shot-mono-expected.wav
diff --git a/content/media/webaudio/test/small-shot.mp3 b/dom/media/webaudio/test/small-shot.mp3
similarity index 100%
rename from content/media/webaudio/test/small-shot.mp3
rename to dom/media/webaudio/test/small-shot.mp3
diff --git a/content/media/webaudio/test/small-shot.ogg b/dom/media/webaudio/test/small-shot.ogg
similarity index 100%
rename from content/media/webaudio/test/small-shot.ogg
rename to dom/media/webaudio/test/small-shot.ogg
diff --git a/content/media/webaudio/test/test_AudioBuffer.html b/dom/media/webaudio/test/test_AudioBuffer.html
similarity index 100%
rename from content/media/webaudio/test/test_AudioBuffer.html
rename to dom/media/webaudio/test/test_AudioBuffer.html
diff --git a/content/media/webaudio/test/test_AudioContext.html b/dom/media/webaudio/test/test_AudioContext.html
similarity index 100%
rename from content/media/webaudio/test/test_AudioContext.html
rename to dom/media/webaudio/test/test_AudioContext.html
diff --git a/content/media/webaudio/test/test_AudioListener.html b/dom/media/webaudio/test/test_AudioListener.html
similarity index 100%
rename from content/media/webaudio/test/test_AudioListener.html
rename to dom/media/webaudio/test/test_AudioListener.html
diff --git a/content/media/webaudio/test/test_AudioNodeDevtoolsAPI.html b/dom/media/webaudio/test/test_AudioNodeDevtoolsAPI.html
similarity index 100%
rename from content/media/webaudio/test/test_AudioNodeDevtoolsAPI.html
rename to dom/media/webaudio/test/test_AudioNodeDevtoolsAPI.html
diff --git a/content/media/webaudio/test/test_OfflineAudioContext.html b/dom/media/webaudio/test/test_OfflineAudioContext.html
similarity index 100%
rename from content/media/webaudio/test/test_OfflineAudioContext.html
rename to dom/media/webaudio/test/test_OfflineAudioContext.html
diff --git a/content/media/webaudio/test/test_analyserNode.html b/dom/media/webaudio/test/test_analyserNode.html
similarity index 100%
rename from content/media/webaudio/test/test_analyserNode.html
rename to dom/media/webaudio/test/test_analyserNode.html
diff --git a/content/media/webaudio/test/test_analyserNodeOutput.html b/dom/media/webaudio/test/test_analyserNodeOutput.html
similarity index 100%
rename from content/media/webaudio/test/test_analyserNodeOutput.html
rename to dom/media/webaudio/test/test_analyserNodeOutput.html
diff --git a/content/media/webaudio/test/test_analyserNodePassThrough.html b/dom/media/webaudio/test/test_analyserNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_analyserNodePassThrough.html
rename to dom/media/webaudio/test/test_analyserNodePassThrough.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNode.html b/dom/media/webaudio/test/test_audioBufferSourceNode.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNode.html
rename to dom/media/webaudio/test/test_audioBufferSourceNode.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeEnded.html b/dom/media/webaudio/test/test_audioBufferSourceNodeEnded.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeEnded.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeEnded.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html b/dom/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeLoop.html b/dom/media/webaudio/test/test_audioBufferSourceNodeLoop.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeLoop.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeLoop.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html b/dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html b/dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeNeutered.html b/dom/media/webaudio/test/test_audioBufferSourceNodeNeutered.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeNeutered.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeNeutered.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeNoStart.html b/dom/media/webaudio/test/test_audioBufferSourceNodeNoStart.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeNoStart.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeNoStart.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html b/dom/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodeOffset.html b/dom/media/webaudio/test/test_audioBufferSourceNodeOffset.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodeOffset.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodeOffset.html
diff --git a/content/media/webaudio/test/test_audioBufferSourceNodePassThrough.html b/dom/media/webaudio/test/test_audioBufferSourceNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_audioBufferSourceNodePassThrough.html
rename to dom/media/webaudio/test/test_audioBufferSourceNodePassThrough.html
diff --git a/content/media/webaudio/test/test_audioDestinationNode.html b/dom/media/webaudio/test/test_audioDestinationNode.html
similarity index 100%
rename from content/media/webaudio/test/test_audioDestinationNode.html
rename to dom/media/webaudio/test/test_audioDestinationNode.html
diff --git a/content/media/webaudio/test/test_audioParamExponentialRamp.html b/dom/media/webaudio/test/test_audioParamExponentialRamp.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamExponentialRamp.html
rename to dom/media/webaudio/test/test_audioParamExponentialRamp.html
diff --git a/content/media/webaudio/test/test_audioParamGain.html b/dom/media/webaudio/test/test_audioParamGain.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamGain.html
rename to dom/media/webaudio/test/test_audioParamGain.html
diff --git a/content/media/webaudio/test/test_audioParamLinearRamp.html b/dom/media/webaudio/test/test_audioParamLinearRamp.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamLinearRamp.html
rename to dom/media/webaudio/test/test_audioParamLinearRamp.html
diff --git a/content/media/webaudio/test/test_audioParamSetCurveAtTime.html b/dom/media/webaudio/test/test_audioParamSetCurveAtTime.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamSetCurveAtTime.html
rename to dom/media/webaudio/test/test_audioParamSetCurveAtTime.html
diff --git a/content/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html b/dom/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html
rename to dom/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html
diff --git a/content/media/webaudio/test/test_audioParamSetTargetAtTime.html b/dom/media/webaudio/test/test_audioParamSetTargetAtTime.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamSetTargetAtTime.html
rename to dom/media/webaudio/test/test_audioParamSetTargetAtTime.html
diff --git a/content/media/webaudio/test/test_audioParamSetValueAtTime.html b/dom/media/webaudio/test/test_audioParamSetValueAtTime.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamSetValueAtTime.html
rename to dom/media/webaudio/test/test_audioParamSetValueAtTime.html
diff --git a/content/media/webaudio/test/test_audioParamTimelineDestinationOffset.html b/dom/media/webaudio/test/test_audioParamTimelineDestinationOffset.html
similarity index 100%
rename from content/media/webaudio/test/test_audioParamTimelineDestinationOffset.html
rename to dom/media/webaudio/test/test_audioParamTimelineDestinationOffset.html
diff --git a/content/media/webaudio/test/test_badConnect.html b/dom/media/webaudio/test/test_badConnect.html
similarity index 100%
rename from content/media/webaudio/test/test_badConnect.html
rename to dom/media/webaudio/test/test_badConnect.html
diff --git a/content/media/webaudio/test/test_biquadFilterNode.html b/dom/media/webaudio/test/test_biquadFilterNode.html
similarity index 100%
rename from content/media/webaudio/test/test_biquadFilterNode.html
rename to dom/media/webaudio/test/test_biquadFilterNode.html
diff --git a/content/media/webaudio/test/test_biquadFilterNodePassThrough.html b/dom/media/webaudio/test/test_biquadFilterNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_biquadFilterNodePassThrough.html
rename to dom/media/webaudio/test/test_biquadFilterNodePassThrough.html
diff --git a/content/media/webaudio/test/test_biquadFilterNodeWithGain.html b/dom/media/webaudio/test/test_biquadFilterNodeWithGain.html
similarity index 100%
rename from content/media/webaudio/test/test_biquadFilterNodeWithGain.html
rename to dom/media/webaudio/test/test_biquadFilterNodeWithGain.html
diff --git a/content/media/webaudio/test/test_bug1056032.html b/dom/media/webaudio/test/test_bug1056032.html
similarity index 100%
rename from content/media/webaudio/test/test_bug1056032.html
rename to dom/media/webaudio/test/test_bug1056032.html
diff --git a/content/media/webaudio/test/test_bug808374.html b/dom/media/webaudio/test/test_bug808374.html
similarity index 100%
rename from content/media/webaudio/test/test_bug808374.html
rename to dom/media/webaudio/test/test_bug808374.html
diff --git a/content/media/webaudio/test/test_bug827541.html b/dom/media/webaudio/test/test_bug827541.html
similarity index 100%
rename from content/media/webaudio/test/test_bug827541.html
rename to dom/media/webaudio/test/test_bug827541.html
diff --git a/content/media/webaudio/test/test_bug839753.html b/dom/media/webaudio/test/test_bug839753.html
similarity index 100%
rename from content/media/webaudio/test/test_bug839753.html
rename to dom/media/webaudio/test/test_bug839753.html
diff --git a/content/media/webaudio/test/test_bug845960.html b/dom/media/webaudio/test/test_bug845960.html
similarity index 100%
rename from content/media/webaudio/test/test_bug845960.html
rename to dom/media/webaudio/test/test_bug845960.html
diff --git a/content/media/webaudio/test/test_bug856771.html b/dom/media/webaudio/test/test_bug856771.html
similarity index 100%
rename from content/media/webaudio/test/test_bug856771.html
rename to dom/media/webaudio/test/test_bug856771.html
diff --git a/content/media/webaudio/test/test_bug866570.html b/dom/media/webaudio/test/test_bug866570.html
similarity index 100%
rename from content/media/webaudio/test/test_bug866570.html
rename to dom/media/webaudio/test/test_bug866570.html
diff --git a/content/media/webaudio/test/test_bug866737.html b/dom/media/webaudio/test/test_bug866737.html
similarity index 100%
rename from content/media/webaudio/test/test_bug866737.html
rename to dom/media/webaudio/test/test_bug866737.html
diff --git a/content/media/webaudio/test/test_bug867089.html b/dom/media/webaudio/test/test_bug867089.html
similarity index 100%
rename from content/media/webaudio/test/test_bug867089.html
rename to dom/media/webaudio/test/test_bug867089.html
diff --git a/content/media/webaudio/test/test_bug867104.html b/dom/media/webaudio/test/test_bug867104.html
similarity index 100%
rename from content/media/webaudio/test/test_bug867104.html
rename to dom/media/webaudio/test/test_bug867104.html
diff --git a/content/media/webaudio/test/test_bug867174.html b/dom/media/webaudio/test/test_bug867174.html
similarity index 100%
rename from content/media/webaudio/test/test_bug867174.html
rename to dom/media/webaudio/test/test_bug867174.html
diff --git a/content/media/webaudio/test/test_bug867203.html b/dom/media/webaudio/test/test_bug867203.html
similarity index 100%
rename from content/media/webaudio/test/test_bug867203.html
rename to dom/media/webaudio/test/test_bug867203.html
diff --git a/content/media/webaudio/test/test_bug875221.html b/dom/media/webaudio/test/test_bug875221.html
similarity index 100%
rename from content/media/webaudio/test/test_bug875221.html
rename to dom/media/webaudio/test/test_bug875221.html
diff --git a/content/media/webaudio/test/test_bug875402.html b/dom/media/webaudio/test/test_bug875402.html
similarity index 100%
rename from content/media/webaudio/test/test_bug875402.html
rename to dom/media/webaudio/test/test_bug875402.html
diff --git a/content/media/webaudio/test/test_bug894150.html b/dom/media/webaudio/test/test_bug894150.html
similarity index 100%
rename from content/media/webaudio/test/test_bug894150.html
rename to dom/media/webaudio/test/test_bug894150.html
diff --git a/content/media/webaudio/test/test_bug956489.html b/dom/media/webaudio/test/test_bug956489.html
similarity index 100%
rename from content/media/webaudio/test/test_bug956489.html
rename to dom/media/webaudio/test/test_bug956489.html
diff --git a/content/media/webaudio/test/test_bug964376.html b/dom/media/webaudio/test/test_bug964376.html
similarity index 100%
rename from content/media/webaudio/test/test_bug964376.html
rename to dom/media/webaudio/test/test_bug964376.html
diff --git a/content/media/webaudio/test/test_bug972678.html b/dom/media/webaudio/test/test_bug972678.html
similarity index 100%
rename from content/media/webaudio/test/test_bug972678.html
rename to dom/media/webaudio/test/test_bug972678.html
diff --git a/content/media/webaudio/test/test_channelMergerNode.html b/dom/media/webaudio/test/test_channelMergerNode.html
similarity index 100%
rename from content/media/webaudio/test/test_channelMergerNode.html
rename to dom/media/webaudio/test/test_channelMergerNode.html
diff --git a/content/media/webaudio/test/test_channelMergerNodeWithVolume.html b/dom/media/webaudio/test/test_channelMergerNodeWithVolume.html
similarity index 100%
rename from content/media/webaudio/test/test_channelMergerNodeWithVolume.html
rename to dom/media/webaudio/test/test_channelMergerNodeWithVolume.html
diff --git a/content/media/webaudio/test/test_channelSplitterNode.html b/dom/media/webaudio/test/test_channelSplitterNode.html
similarity index 100%
rename from content/media/webaudio/test/test_channelSplitterNode.html
rename to dom/media/webaudio/test/test_channelSplitterNode.html
diff --git a/content/media/webaudio/test/test_channelSplitterNodeWithVolume.html b/dom/media/webaudio/test/test_channelSplitterNodeWithVolume.html
similarity index 100%
rename from content/media/webaudio/test/test_channelSplitterNodeWithVolume.html
rename to dom/media/webaudio/test/test_channelSplitterNodeWithVolume.html
diff --git a/content/media/webaudio/test/test_convolverNode.html b/dom/media/webaudio/test/test_convolverNode.html
similarity index 100%
rename from content/media/webaudio/test/test_convolverNode.html
rename to dom/media/webaudio/test/test_convolverNode.html
diff --git a/content/media/webaudio/test/test_convolverNodeChannelCount.html b/dom/media/webaudio/test/test_convolverNodeChannelCount.html
similarity index 100%
rename from content/media/webaudio/test/test_convolverNodeChannelCount.html
rename to dom/media/webaudio/test/test_convolverNodeChannelCount.html
diff --git a/content/media/webaudio/test/test_convolverNodePassThrough.html b/dom/media/webaudio/test/test_convolverNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_convolverNodePassThrough.html
rename to dom/media/webaudio/test/test_convolverNodePassThrough.html
diff --git a/content/media/webaudio/test/test_convolverNodeWithGain.html b/dom/media/webaudio/test/test_convolverNodeWithGain.html
similarity index 100%
rename from content/media/webaudio/test/test_convolverNodeWithGain.html
rename to dom/media/webaudio/test/test_convolverNodeWithGain.html
diff --git a/content/media/webaudio/test/test_convolverNode_mono_mono.html b/dom/media/webaudio/test/test_convolverNode_mono_mono.html
similarity index 100%
rename from content/media/webaudio/test/test_convolverNode_mono_mono.html
rename to dom/media/webaudio/test/test_convolverNode_mono_mono.html
diff --git a/content/media/webaudio/test/test_currentTime.html b/dom/media/webaudio/test/test_currentTime.html
similarity index 100%
rename from content/media/webaudio/test/test_currentTime.html
rename to dom/media/webaudio/test/test_currentTime.html
diff --git a/content/media/webaudio/test/test_decodeMultichannel.html b/dom/media/webaudio/test/test_decodeMultichannel.html
similarity index 100%
rename from content/media/webaudio/test/test_decodeMultichannel.html
rename to dom/media/webaudio/test/test_decodeMultichannel.html
diff --git a/content/media/webaudio/test/test_delayNode.html b/dom/media/webaudio/test/test_delayNode.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNode.html
rename to dom/media/webaudio/test/test_delayNode.html
diff --git a/content/media/webaudio/test/test_delayNodeAtMax.html b/dom/media/webaudio/test/test_delayNodeAtMax.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeAtMax.html
rename to dom/media/webaudio/test/test_delayNodeAtMax.html
diff --git a/content/media/webaudio/test/test_delayNodeChannelChanges.html b/dom/media/webaudio/test/test_delayNodeChannelChanges.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeChannelChanges.html
rename to dom/media/webaudio/test/test_delayNodeChannelChanges.html
diff --git a/content/media/webaudio/test/test_delayNodeCycles.html b/dom/media/webaudio/test/test_delayNodeCycles.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeCycles.html
rename to dom/media/webaudio/test/test_delayNodeCycles.html
diff --git a/content/media/webaudio/test/test_delayNodePassThrough.html b/dom/media/webaudio/test/test_delayNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodePassThrough.html
rename to dom/media/webaudio/test/test_delayNodePassThrough.html
diff --git a/content/media/webaudio/test/test_delayNodeSmallMaxDelay.html b/dom/media/webaudio/test/test_delayNodeSmallMaxDelay.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeSmallMaxDelay.html
rename to dom/media/webaudio/test/test_delayNodeSmallMaxDelay.html
diff --git a/content/media/webaudio/test/test_delayNodeTailIncrease.html b/dom/media/webaudio/test/test_delayNodeTailIncrease.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeTailIncrease.html
rename to dom/media/webaudio/test/test_delayNodeTailIncrease.html
diff --git a/content/media/webaudio/test/test_delayNodeTailWithDisconnect.html b/dom/media/webaudio/test/test_delayNodeTailWithDisconnect.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeTailWithDisconnect.html
rename to dom/media/webaudio/test/test_delayNodeTailWithDisconnect.html
diff --git a/content/media/webaudio/test/test_delayNodeTailWithGain.html b/dom/media/webaudio/test/test_delayNodeTailWithGain.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeTailWithGain.html
rename to dom/media/webaudio/test/test_delayNodeTailWithGain.html
diff --git a/content/media/webaudio/test/test_delayNodeTailWithReconnect.html b/dom/media/webaudio/test/test_delayNodeTailWithReconnect.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeTailWithReconnect.html
rename to dom/media/webaudio/test/test_delayNodeTailWithReconnect.html
diff --git a/content/media/webaudio/test/test_delayNodeWithGain.html b/dom/media/webaudio/test/test_delayNodeWithGain.html
similarity index 100%
rename from content/media/webaudio/test/test_delayNodeWithGain.html
rename to dom/media/webaudio/test/test_delayNodeWithGain.html
diff --git a/content/media/webaudio/test/test_dynamicsCompressorNode.html b/dom/media/webaudio/test/test_dynamicsCompressorNode.html
similarity index 100%
rename from content/media/webaudio/test/test_dynamicsCompressorNode.html
rename to dom/media/webaudio/test/test_dynamicsCompressorNode.html
diff --git a/content/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html b/dom/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html
rename to dom/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html
diff --git a/content/media/webaudio/test/test_gainNode.html b/dom/media/webaudio/test/test_gainNode.html
similarity index 100%
rename from content/media/webaudio/test/test_gainNode.html
rename to dom/media/webaudio/test/test_gainNode.html
diff --git a/content/media/webaudio/test/test_gainNodeInLoop.html b/dom/media/webaudio/test/test_gainNodeInLoop.html
similarity index 100%
rename from content/media/webaudio/test/test_gainNodeInLoop.html
rename to dom/media/webaudio/test/test_gainNodeInLoop.html
diff --git a/content/media/webaudio/test/test_gainNodePassThrough.html b/dom/media/webaudio/test/test_gainNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_gainNodePassThrough.html
rename to dom/media/webaudio/test/test_gainNodePassThrough.html
diff --git a/content/media/webaudio/test/test_maxChannelCount.html b/dom/media/webaudio/test/test_maxChannelCount.html
similarity index 100%
rename from content/media/webaudio/test/test_maxChannelCount.html
rename to dom/media/webaudio/test/test_maxChannelCount.html
diff --git a/content/media/webaudio/test/test_mediaDecoding.html b/dom/media/webaudio/test/test_mediaDecoding.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaDecoding.html
rename to dom/media/webaudio/test/test_mediaDecoding.html
diff --git a/content/media/webaudio/test/test_mediaElementAudioSourceNode.html b/dom/media/webaudio/test/test_mediaElementAudioSourceNode.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaElementAudioSourceNode.html
rename to dom/media/webaudio/test/test_mediaElementAudioSourceNode.html
diff --git a/content/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html b/dom/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html
rename to dom/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html
diff --git a/content/media/webaudio/test/test_mediaStreamAudioDestinationNode.html b/dom/media/webaudio/test/test_mediaStreamAudioDestinationNode.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaStreamAudioDestinationNode.html
rename to dom/media/webaudio/test/test_mediaStreamAudioDestinationNode.html
diff --git a/content/media/webaudio/test/test_mediaStreamAudioSourceNode.html b/dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaStreamAudioSourceNode.html
rename to dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html
diff --git a/content/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html b/dom/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
similarity index 93%
rename from content/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
rename to dom/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
index 611d180f6ec..f3cc0334a2c 100644
--- a/content/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
+++ b/dom/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
@@ -11,7 +11,7 @@
 <script class="testbody" type="text/javascript">
 SimpleTest.waitForExplicitFinish();
 
-var audio = new Audio("http://example.org:80/tests/content/media/webaudio/test/small-shot.ogg");
+var audio = new Audio("http://example.org:80/tests/dom/media/webaudio/test/small-shot.ogg");
 var context = new AudioContext();
 var node = context.createMediaStreamSource(audio.mozCaptureStreamUntilEnded());
 var sp = context.createScriptProcessor(2048, 1);
diff --git a/content/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html b/dom/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html
rename to dom/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html
diff --git a/content/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html b/dom/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html
similarity index 100%
rename from content/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html
rename to dom/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html
diff --git a/content/media/webaudio/test/test_mixingRules.html b/dom/media/webaudio/test/test_mixingRules.html
similarity index 100%
rename from content/media/webaudio/test/test_mixingRules.html
rename to dom/media/webaudio/test/test_mixingRules.html
diff --git a/content/media/webaudio/test/test_mozaudiochannel.html b/dom/media/webaudio/test/test_mozaudiochannel.html
similarity index 100%
rename from content/media/webaudio/test/test_mozaudiochannel.html
rename to dom/media/webaudio/test/test_mozaudiochannel.html
diff --git a/content/media/webaudio/test/test_nodeToParamConnection.html b/dom/media/webaudio/test/test_nodeToParamConnection.html
similarity index 100%
rename from content/media/webaudio/test/test_nodeToParamConnection.html
rename to dom/media/webaudio/test/test_nodeToParamConnection.html
diff --git a/content/media/webaudio/test/test_offlineDestinationChannelCountLess.html b/dom/media/webaudio/test/test_offlineDestinationChannelCountLess.html
similarity index 100%
rename from content/media/webaudio/test/test_offlineDestinationChannelCountLess.html
rename to dom/media/webaudio/test/test_offlineDestinationChannelCountLess.html
diff --git a/content/media/webaudio/test/test_offlineDestinationChannelCountMore.html b/dom/media/webaudio/test/test_offlineDestinationChannelCountMore.html
similarity index 100%
rename from content/media/webaudio/test/test_offlineDestinationChannelCountMore.html
rename to dom/media/webaudio/test/test_offlineDestinationChannelCountMore.html
diff --git a/content/media/webaudio/test/test_oscillatorNode.html b/dom/media/webaudio/test/test_oscillatorNode.html
similarity index 100%
rename from content/media/webaudio/test/test_oscillatorNode.html
rename to dom/media/webaudio/test/test_oscillatorNode.html
diff --git a/content/media/webaudio/test/test_oscillatorNode2.html b/dom/media/webaudio/test/test_oscillatorNode2.html
similarity index 100%
rename from content/media/webaudio/test/test_oscillatorNode2.html
rename to dom/media/webaudio/test/test_oscillatorNode2.html
diff --git a/content/media/webaudio/test/test_oscillatorNodePassThrough.html b/dom/media/webaudio/test/test_oscillatorNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_oscillatorNodePassThrough.html
rename to dom/media/webaudio/test/test_oscillatorNodePassThrough.html
diff --git a/content/media/webaudio/test/test_oscillatorNodeStart.html b/dom/media/webaudio/test/test_oscillatorNodeStart.html
similarity index 100%
rename from content/media/webaudio/test/test_oscillatorNodeStart.html
rename to dom/media/webaudio/test/test_oscillatorNodeStart.html
diff --git a/content/media/webaudio/test/test_oscillatorTypeChange.html b/dom/media/webaudio/test/test_oscillatorTypeChange.html
similarity index 100%
rename from content/media/webaudio/test/test_oscillatorTypeChange.html
rename to dom/media/webaudio/test/test_oscillatorTypeChange.html
diff --git a/content/media/webaudio/test/test_pannerNode.html b/dom/media/webaudio/test/test_pannerNode.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNode.html
rename to dom/media/webaudio/test/test_pannerNode.html
diff --git a/content/media/webaudio/test/test_pannerNodeAbove.html b/dom/media/webaudio/test/test_pannerNodeAbove.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNodeAbove.html
rename to dom/media/webaudio/test/test_pannerNodeAbove.html
diff --git a/content/media/webaudio/test/test_pannerNodeChannelCount.html b/dom/media/webaudio/test/test_pannerNodeChannelCount.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNodeChannelCount.html
rename to dom/media/webaudio/test/test_pannerNodeChannelCount.html
diff --git a/content/media/webaudio/test/test_pannerNodeHRTFSymmetry.html b/dom/media/webaudio/test/test_pannerNodeHRTFSymmetry.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNodeHRTFSymmetry.html
rename to dom/media/webaudio/test/test_pannerNodeHRTFSymmetry.html
diff --git a/content/media/webaudio/test/test_pannerNodePassThrough.html b/dom/media/webaudio/test/test_pannerNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNodePassThrough.html
rename to dom/media/webaudio/test/test_pannerNodePassThrough.html
diff --git a/content/media/webaudio/test/test_pannerNodeTail.html b/dom/media/webaudio/test/test_pannerNodeTail.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNodeTail.html
rename to dom/media/webaudio/test/test_pannerNodeTail.html
diff --git a/content/media/webaudio/test/test_pannerNode_equalPower.html b/dom/media/webaudio/test/test_pannerNode_equalPower.html
similarity index 100%
rename from content/media/webaudio/test/test_pannerNode_equalPower.html
rename to dom/media/webaudio/test/test_pannerNode_equalPower.html
diff --git a/content/media/webaudio/test/test_periodicWave.html b/dom/media/webaudio/test/test_periodicWave.html
similarity index 100%
rename from content/media/webaudio/test/test_periodicWave.html
rename to dom/media/webaudio/test/test_periodicWave.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNode.html b/dom/media/webaudio/test/test_scriptProcessorNode.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNode.html
rename to dom/media/webaudio/test/test_scriptProcessorNode.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html b/dom/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
rename to dom/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNodeNotConnected.html b/dom/media/webaudio/test/test_scriptProcessorNodeNotConnected.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNodeNotConnected.html
rename to dom/media/webaudio/test/test_scriptProcessorNodeNotConnected.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNodePassThrough.html b/dom/media/webaudio/test/test_scriptProcessorNodePassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNodePassThrough.html
rename to dom/media/webaudio/test/test_scriptProcessorNodePassThrough.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html b/dom/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html
rename to dom/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html
diff --git a/content/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html b/dom/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html
similarity index 100%
rename from content/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html
rename to dom/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html
diff --git a/content/media/webaudio/test/test_singleSourceDest.html b/dom/media/webaudio/test/test_singleSourceDest.html
similarity index 100%
rename from content/media/webaudio/test/test_singleSourceDest.html
rename to dom/media/webaudio/test/test_singleSourceDest.html
diff --git a/content/media/webaudio/test/test_stereoPanningWithGain.html b/dom/media/webaudio/test/test_stereoPanningWithGain.html
similarity index 100%
rename from content/media/webaudio/test/test_stereoPanningWithGain.html
rename to dom/media/webaudio/test/test_stereoPanningWithGain.html
diff --git a/content/media/webaudio/test/test_waveDecoder.html b/dom/media/webaudio/test/test_waveDecoder.html
similarity index 100%
rename from content/media/webaudio/test/test_waveDecoder.html
rename to dom/media/webaudio/test/test_waveDecoder.html
diff --git a/content/media/webaudio/test/test_waveShaper.html b/dom/media/webaudio/test/test_waveShaper.html
similarity index 100%
rename from content/media/webaudio/test/test_waveShaper.html
rename to dom/media/webaudio/test/test_waveShaper.html
diff --git a/content/media/webaudio/test/test_waveShaperNoCurve.html b/dom/media/webaudio/test/test_waveShaperNoCurve.html
similarity index 100%
rename from content/media/webaudio/test/test_waveShaperNoCurve.html
rename to dom/media/webaudio/test/test_waveShaperNoCurve.html
diff --git a/content/media/webaudio/test/test_waveShaperPassThrough.html b/dom/media/webaudio/test/test_waveShaperPassThrough.html
similarity index 100%
rename from content/media/webaudio/test/test_waveShaperPassThrough.html
rename to dom/media/webaudio/test/test_waveShaperPassThrough.html
diff --git a/content/media/webaudio/test/test_waveShaperZeroLengthCurve.html b/dom/media/webaudio/test/test_waveShaperZeroLengthCurve.html
similarity index 100%
rename from content/media/webaudio/test/test_waveShaperZeroLengthCurve.html
rename to dom/media/webaudio/test/test_waveShaperZeroLengthCurve.html
diff --git a/content/media/webaudio/test/ting-44.1k-1ch.ogg b/dom/media/webaudio/test/ting-44.1k-1ch.ogg
similarity index 100%
rename from content/media/webaudio/test/ting-44.1k-1ch.ogg
rename to dom/media/webaudio/test/ting-44.1k-1ch.ogg
diff --git a/content/media/webaudio/test/ting-44.1k-1ch.wav b/dom/media/webaudio/test/ting-44.1k-1ch.wav
similarity index 100%
rename from content/media/webaudio/test/ting-44.1k-1ch.wav
rename to dom/media/webaudio/test/ting-44.1k-1ch.wav
diff --git a/content/media/webaudio/test/ting-44.1k-2ch.ogg b/dom/media/webaudio/test/ting-44.1k-2ch.ogg
similarity index 100%
rename from content/media/webaudio/test/ting-44.1k-2ch.ogg
rename to dom/media/webaudio/test/ting-44.1k-2ch.ogg
diff --git a/content/media/webaudio/test/ting-44.1k-2ch.wav b/dom/media/webaudio/test/ting-44.1k-2ch.wav
similarity index 100%
rename from content/media/webaudio/test/ting-44.1k-2ch.wav
rename to dom/media/webaudio/test/ting-44.1k-2ch.wav
diff --git a/content/media/webaudio/test/ting-48k-1ch.ogg b/dom/media/webaudio/test/ting-48k-1ch.ogg
similarity index 100%
rename from content/media/webaudio/test/ting-48k-1ch.ogg
rename to dom/media/webaudio/test/ting-48k-1ch.ogg
diff --git a/content/media/webaudio/test/ting-48k-1ch.wav b/dom/media/webaudio/test/ting-48k-1ch.wav
similarity index 100%
rename from content/media/webaudio/test/ting-48k-1ch.wav
rename to dom/media/webaudio/test/ting-48k-1ch.wav
diff --git a/content/media/webaudio/test/ting-48k-2ch.ogg b/dom/media/webaudio/test/ting-48k-2ch.ogg
similarity index 100%
rename from content/media/webaudio/test/ting-48k-2ch.ogg
rename to dom/media/webaudio/test/ting-48k-2ch.ogg
diff --git a/content/media/webaudio/test/ting-48k-2ch.wav b/dom/media/webaudio/test/ting-48k-2ch.wav
similarity index 100%
rename from content/media/webaudio/test/ting-48k-2ch.wav
rename to dom/media/webaudio/test/ting-48k-2ch.wav
diff --git a/content/media/webaudio/test/ting-dualchannel44.1.wav b/dom/media/webaudio/test/ting-dualchannel44.1.wav
similarity index 100%
rename from content/media/webaudio/test/ting-dualchannel44.1.wav
rename to dom/media/webaudio/test/ting-dualchannel44.1.wav
diff --git a/content/media/webaudio/test/ting-dualchannel48.wav b/dom/media/webaudio/test/ting-dualchannel48.wav
similarity index 100%
rename from content/media/webaudio/test/ting-dualchannel48.wav
rename to dom/media/webaudio/test/ting-dualchannel48.wav
diff --git a/content/media/webaudio/test/webaudio.js b/dom/media/webaudio/test/webaudio.js
similarity index 100%
rename from content/media/webaudio/test/webaudio.js
rename to dom/media/webaudio/test/webaudio.js
diff --git a/content/media/webm/EbmlComposer.cpp b/dom/media/webm/EbmlComposer.cpp
similarity index 100%
rename from content/media/webm/EbmlComposer.cpp
rename to dom/media/webm/EbmlComposer.cpp
diff --git a/content/media/webm/EbmlComposer.h b/dom/media/webm/EbmlComposer.h
similarity index 100%
rename from content/media/webm/EbmlComposer.h
rename to dom/media/webm/EbmlComposer.h
diff --git a/content/media/webm/WebMBufferedParser.cpp b/dom/media/webm/WebMBufferedParser.cpp
similarity index 100%
rename from content/media/webm/WebMBufferedParser.cpp
rename to dom/media/webm/WebMBufferedParser.cpp
diff --git a/content/media/webm/WebMBufferedParser.h b/dom/media/webm/WebMBufferedParser.h
similarity index 100%
rename from content/media/webm/WebMBufferedParser.h
rename to dom/media/webm/WebMBufferedParser.h
diff --git a/content/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp
similarity index 100%
rename from content/media/webm/WebMDecoder.cpp
rename to dom/media/webm/WebMDecoder.cpp
diff --git a/content/media/webm/WebMDecoder.h b/dom/media/webm/WebMDecoder.h
similarity index 100%
rename from content/media/webm/WebMDecoder.h
rename to dom/media/webm/WebMDecoder.h
diff --git a/content/media/webm/WebMReader.cpp b/dom/media/webm/WebMReader.cpp
similarity index 100%
rename from content/media/webm/WebMReader.cpp
rename to dom/media/webm/WebMReader.cpp
diff --git a/content/media/webm/WebMReader.h b/dom/media/webm/WebMReader.h
similarity index 100%
rename from content/media/webm/WebMReader.h
rename to dom/media/webm/WebMReader.h
diff --git a/content/media/webm/WebMWriter.cpp b/dom/media/webm/WebMWriter.cpp
similarity index 100%
rename from content/media/webm/WebMWriter.cpp
rename to dom/media/webm/WebMWriter.cpp
diff --git a/content/media/webm/WebMWriter.h b/dom/media/webm/WebMWriter.h
similarity index 100%
rename from content/media/webm/WebMWriter.h
rename to dom/media/webm/WebMWriter.h
diff --git a/content/media/webm/moz.build b/dom/media/webm/moz.build
similarity index 100%
rename from content/media/webm/moz.build
rename to dom/media/webm/moz.build
diff --git a/content/media/webrtc/AudioOutputObserver.h b/dom/media/webrtc/AudioOutputObserver.h
similarity index 100%
rename from content/media/webrtc/AudioOutputObserver.h
rename to dom/media/webrtc/AudioOutputObserver.h
diff --git a/content/media/webrtc/MediaEngine.h b/dom/media/webrtc/MediaEngine.h
similarity index 100%
rename from content/media/webrtc/MediaEngine.h
rename to dom/media/webrtc/MediaEngine.h
diff --git a/content/media/webrtc/MediaEngineCameraVideoSource.cpp b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineCameraVideoSource.cpp
rename to dom/media/webrtc/MediaEngineCameraVideoSource.cpp
diff --git a/content/media/webrtc/MediaEngineCameraVideoSource.h b/dom/media/webrtc/MediaEngineCameraVideoSource.h
similarity index 100%
rename from content/media/webrtc/MediaEngineCameraVideoSource.h
rename to dom/media/webrtc/MediaEngineCameraVideoSource.h
diff --git a/content/media/webrtc/MediaEngineDefault.cpp b/dom/media/webrtc/MediaEngineDefault.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineDefault.cpp
rename to dom/media/webrtc/MediaEngineDefault.cpp
diff --git a/content/media/webrtc/MediaEngineDefault.h b/dom/media/webrtc/MediaEngineDefault.h
similarity index 100%
rename from content/media/webrtc/MediaEngineDefault.h
rename to dom/media/webrtc/MediaEngineDefault.h
diff --git a/content/media/webrtc/MediaEngineGonkVideoSource.cpp b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineGonkVideoSource.cpp
rename to dom/media/webrtc/MediaEngineGonkVideoSource.cpp
diff --git a/content/media/webrtc/MediaEngineGonkVideoSource.h b/dom/media/webrtc/MediaEngineGonkVideoSource.h
similarity index 100%
rename from content/media/webrtc/MediaEngineGonkVideoSource.h
rename to dom/media/webrtc/MediaEngineGonkVideoSource.h
diff --git a/content/media/webrtc/MediaEngineTabVideoSource.cpp b/dom/media/webrtc/MediaEngineTabVideoSource.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineTabVideoSource.cpp
rename to dom/media/webrtc/MediaEngineTabVideoSource.cpp
diff --git a/content/media/webrtc/MediaEngineTabVideoSource.h b/dom/media/webrtc/MediaEngineTabVideoSource.h
similarity index 100%
rename from content/media/webrtc/MediaEngineTabVideoSource.h
rename to dom/media/webrtc/MediaEngineTabVideoSource.h
diff --git a/content/media/webrtc/MediaEngineWebRTC.cpp b/dom/media/webrtc/MediaEngineWebRTC.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineWebRTC.cpp
rename to dom/media/webrtc/MediaEngineWebRTC.cpp
diff --git a/content/media/webrtc/MediaEngineWebRTC.h b/dom/media/webrtc/MediaEngineWebRTC.h
similarity index 100%
rename from content/media/webrtc/MediaEngineWebRTC.h
rename to dom/media/webrtc/MediaEngineWebRTC.h
diff --git a/content/media/webrtc/MediaEngineWebRTCAudio.cpp b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineWebRTCAudio.cpp
rename to dom/media/webrtc/MediaEngineWebRTCAudio.cpp
diff --git a/content/media/webrtc/MediaEngineWebRTCVideo.cpp b/dom/media/webrtc/MediaEngineWebRTCVideo.cpp
similarity index 100%
rename from content/media/webrtc/MediaEngineWebRTCVideo.cpp
rename to dom/media/webrtc/MediaEngineWebRTCVideo.cpp
diff --git a/content/media/webrtc/MediaTrackConstraints.h b/dom/media/webrtc/MediaTrackConstraints.h
similarity index 100%
rename from content/media/webrtc/MediaTrackConstraints.h
rename to dom/media/webrtc/MediaTrackConstraints.h
diff --git a/content/media/webrtc/PeerIdentity.cpp b/dom/media/webrtc/PeerIdentity.cpp
similarity index 100%
rename from content/media/webrtc/PeerIdentity.cpp
rename to dom/media/webrtc/PeerIdentity.cpp
diff --git a/content/media/webrtc/PeerIdentity.h b/dom/media/webrtc/PeerIdentity.h
similarity index 100%
rename from content/media/webrtc/PeerIdentity.h
rename to dom/media/webrtc/PeerIdentity.h
diff --git a/content/media/webrtc/moz.build b/dom/media/webrtc/moz.build
similarity index 100%
rename from content/media/webrtc/moz.build
rename to dom/media/webrtc/moz.build
diff --git a/content/media/webrtc/nsITabSource.idl b/dom/media/webrtc/nsITabSource.idl
similarity index 100%
rename from content/media/webrtc/nsITabSource.idl
rename to dom/media/webrtc/nsITabSource.idl
diff --git a/content/media/webspeech/moz.build b/dom/media/webspeech/moz.build
similarity index 100%
rename from content/media/webspeech/moz.build
rename to dom/media/webspeech/moz.build
diff --git a/content/media/webspeech/recognition/SpeechGrammar.cpp b/dom/media/webspeech/recognition/SpeechGrammar.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechGrammar.cpp
rename to dom/media/webspeech/recognition/SpeechGrammar.cpp
diff --git a/content/media/webspeech/recognition/SpeechGrammar.h b/dom/media/webspeech/recognition/SpeechGrammar.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechGrammar.h
rename to dom/media/webspeech/recognition/SpeechGrammar.h
diff --git a/content/media/webspeech/recognition/SpeechGrammarList.cpp b/dom/media/webspeech/recognition/SpeechGrammarList.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechGrammarList.cpp
rename to dom/media/webspeech/recognition/SpeechGrammarList.cpp
diff --git a/content/media/webspeech/recognition/SpeechGrammarList.h b/dom/media/webspeech/recognition/SpeechGrammarList.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechGrammarList.h
rename to dom/media/webspeech/recognition/SpeechGrammarList.h
diff --git a/content/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognition.cpp
rename to dom/media/webspeech/recognition/SpeechRecognition.cpp
diff --git a/content/media/webspeech/recognition/SpeechRecognition.h b/dom/media/webspeech/recognition/SpeechRecognition.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognition.h
rename to dom/media/webspeech/recognition/SpeechRecognition.h
diff --git a/content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
rename to dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
diff --git a/content/media/webspeech/recognition/SpeechRecognitionAlternative.h b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionAlternative.h
rename to dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResult.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionResult.cpp
rename to dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResult.h b/dom/media/webspeech/recognition/SpeechRecognitionResult.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionResult.h
rename to dom/media/webspeech/recognition/SpeechRecognitionResult.h
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionResultList.cpp
rename to dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
diff --git a/content/media/webspeech/recognition/SpeechRecognitionResultList.h b/dom/media/webspeech/recognition/SpeechRecognitionResultList.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechRecognitionResultList.h
rename to dom/media/webspeech/recognition/SpeechRecognitionResultList.h
diff --git a/content/media/webspeech/recognition/SpeechStreamListener.cpp b/dom/media/webspeech/recognition/SpeechStreamListener.cpp
similarity index 100%
rename from content/media/webspeech/recognition/SpeechStreamListener.cpp
rename to dom/media/webspeech/recognition/SpeechStreamListener.cpp
diff --git a/content/media/webspeech/recognition/SpeechStreamListener.h b/dom/media/webspeech/recognition/SpeechStreamListener.h
similarity index 100%
rename from content/media/webspeech/recognition/SpeechStreamListener.h
rename to dom/media/webspeech/recognition/SpeechStreamListener.h
diff --git a/content/media/webspeech/recognition/endpointer.cc b/dom/media/webspeech/recognition/endpointer.cc
similarity index 100%
rename from content/media/webspeech/recognition/endpointer.cc
rename to dom/media/webspeech/recognition/endpointer.cc
diff --git a/content/media/webspeech/recognition/endpointer.h b/dom/media/webspeech/recognition/endpointer.h
similarity index 100%
rename from content/media/webspeech/recognition/endpointer.h
rename to dom/media/webspeech/recognition/endpointer.h
diff --git a/content/media/webspeech/recognition/energy_endpointer.cc b/dom/media/webspeech/recognition/energy_endpointer.cc
similarity index 100%
rename from content/media/webspeech/recognition/energy_endpointer.cc
rename to dom/media/webspeech/recognition/energy_endpointer.cc
diff --git a/content/media/webspeech/recognition/energy_endpointer.h b/dom/media/webspeech/recognition/energy_endpointer.h
similarity index 100%
rename from content/media/webspeech/recognition/energy_endpointer.h
rename to dom/media/webspeech/recognition/energy_endpointer.h
diff --git a/content/media/webspeech/recognition/energy_endpointer_params.cc b/dom/media/webspeech/recognition/energy_endpointer_params.cc
similarity index 100%
rename from content/media/webspeech/recognition/energy_endpointer_params.cc
rename to dom/media/webspeech/recognition/energy_endpointer_params.cc
diff --git a/content/media/webspeech/recognition/energy_endpointer_params.h b/dom/media/webspeech/recognition/energy_endpointer_params.h
similarity index 100%
rename from content/media/webspeech/recognition/energy_endpointer_params.h
rename to dom/media/webspeech/recognition/energy_endpointer_params.h
diff --git a/content/media/webspeech/recognition/moz.build b/dom/media/webspeech/recognition/moz.build
similarity index 100%
rename from content/media/webspeech/recognition/moz.build
rename to dom/media/webspeech/recognition/moz.build
diff --git a/content/media/webspeech/recognition/nsISpeechRecognitionService.idl b/dom/media/webspeech/recognition/nsISpeechRecognitionService.idl
similarity index 100%
rename from content/media/webspeech/recognition/nsISpeechRecognitionService.idl
rename to dom/media/webspeech/recognition/nsISpeechRecognitionService.idl
diff --git a/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp b/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
similarity index 100%
rename from content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
rename to dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
diff --git a/content/media/webspeech/recognition/test/FakeSpeechRecognitionService.h b/dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.h
similarity index 100%
rename from content/media/webspeech/recognition/test/FakeSpeechRecognitionService.h
rename to dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.h
diff --git a/content/media/webspeech/recognition/test/head.js b/dom/media/webspeech/recognition/test/head.js
similarity index 100%
rename from content/media/webspeech/recognition/test/head.js
rename to dom/media/webspeech/recognition/test/head.js
diff --git a/content/media/webspeech/recognition/test/hello.ogg b/dom/media/webspeech/recognition/test/hello.ogg
similarity index 100%
rename from content/media/webspeech/recognition/test/hello.ogg
rename to dom/media/webspeech/recognition/test/hello.ogg
diff --git a/content/media/webspeech/recognition/test/hello.ogg^headers^ b/dom/media/webspeech/recognition/test/hello.ogg^headers^
similarity index 100%
rename from content/media/webspeech/recognition/test/hello.ogg^headers^
rename to dom/media/webspeech/recognition/test/hello.ogg^headers^
diff --git a/content/media/webspeech/recognition/test/mochitest.ini b/dom/media/webspeech/recognition/test/mochitest.ini
similarity index 100%
rename from content/media/webspeech/recognition/test/mochitest.ini
rename to dom/media/webspeech/recognition/test/mochitest.ini
diff --git a/content/media/webspeech/recognition/test/silence.ogg b/dom/media/webspeech/recognition/test/silence.ogg
similarity index 100%
rename from content/media/webspeech/recognition/test/silence.ogg
rename to dom/media/webspeech/recognition/test/silence.ogg
diff --git a/content/media/webspeech/recognition/test/silence.ogg^headers^ b/dom/media/webspeech/recognition/test/silence.ogg^headers^
similarity index 100%
rename from content/media/webspeech/recognition/test/silence.ogg^headers^
rename to dom/media/webspeech/recognition/test/silence.ogg^headers^
diff --git a/content/media/webspeech/recognition/test/test_abort.html b/dom/media/webspeech/recognition/test/test_abort.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_abort.html
rename to dom/media/webspeech/recognition/test/test_abort.html
diff --git a/content/media/webspeech/recognition/test/test_audio_capture_error.html b/dom/media/webspeech/recognition/test/test_audio_capture_error.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_audio_capture_error.html
rename to dom/media/webspeech/recognition/test/test_audio_capture_error.html
diff --git a/content/media/webspeech/recognition/test/test_call_start_from_end_handler.html b/dom/media/webspeech/recognition/test/test_call_start_from_end_handler.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_call_start_from_end_handler.html
rename to dom/media/webspeech/recognition/test/test_call_start_from_end_handler.html
diff --git a/content/media/webspeech/recognition/test/test_nested_eventloop.html b/dom/media/webspeech/recognition/test/test_nested_eventloop.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_nested_eventloop.html
rename to dom/media/webspeech/recognition/test/test_nested_eventloop.html
diff --git a/content/media/webspeech/recognition/test/test_preference_enable.html b/dom/media/webspeech/recognition/test/test_preference_enable.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_preference_enable.html
rename to dom/media/webspeech/recognition/test/test_preference_enable.html
diff --git a/content/media/webspeech/recognition/test/test_recognition_service_error.html b/dom/media/webspeech/recognition/test/test_recognition_service_error.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_recognition_service_error.html
rename to dom/media/webspeech/recognition/test/test_recognition_service_error.html
diff --git a/content/media/webspeech/recognition/test/test_success_without_recognition_service.html b/dom/media/webspeech/recognition/test/test_success_without_recognition_service.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_success_without_recognition_service.html
rename to dom/media/webspeech/recognition/test/test_success_without_recognition_service.html
diff --git a/content/media/webspeech/recognition/test/test_timeout.html b/dom/media/webspeech/recognition/test/test_timeout.html
similarity index 100%
rename from content/media/webspeech/recognition/test/test_timeout.html
rename to dom/media/webspeech/recognition/test/test_timeout.html
diff --git a/content/media/webspeech/synth/SpeechSynthesis.cpp b/dom/media/webspeech/synth/SpeechSynthesis.cpp
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesis.cpp
rename to dom/media/webspeech/synth/SpeechSynthesis.cpp
diff --git a/content/media/webspeech/synth/SpeechSynthesis.h b/dom/media/webspeech/synth/SpeechSynthesis.h
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesis.h
rename to dom/media/webspeech/synth/SpeechSynthesis.h
diff --git a/content/media/webspeech/synth/SpeechSynthesisUtterance.cpp b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesisUtterance.cpp
rename to dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp
diff --git a/content/media/webspeech/synth/SpeechSynthesisUtterance.h b/dom/media/webspeech/synth/SpeechSynthesisUtterance.h
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesisUtterance.h
rename to dom/media/webspeech/synth/SpeechSynthesisUtterance.h
diff --git a/content/media/webspeech/synth/SpeechSynthesisVoice.cpp b/dom/media/webspeech/synth/SpeechSynthesisVoice.cpp
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesisVoice.cpp
rename to dom/media/webspeech/synth/SpeechSynthesisVoice.cpp
diff --git a/content/media/webspeech/synth/SpeechSynthesisVoice.h b/dom/media/webspeech/synth/SpeechSynthesisVoice.h
similarity index 100%
rename from content/media/webspeech/synth/SpeechSynthesisVoice.h
rename to dom/media/webspeech/synth/SpeechSynthesisVoice.h
diff --git a/content/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl b/dom/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl
similarity index 100%
rename from content/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl
rename to dom/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl
diff --git a/content/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl b/dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl
similarity index 100%
rename from content/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl
rename to dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl
diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp b/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
similarity index 100%
rename from content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
rename to dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h b/dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h
similarity index 100%
rename from content/media/webspeech/synth/ipc/SpeechSynthesisChild.h
rename to dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h
diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp b/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
similarity index 100%
rename from content/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
rename to dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisParent.h b/dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h
similarity index 100%
rename from content/media/webspeech/synth/ipc/SpeechSynthesisParent.h
rename to dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h
diff --git a/content/media/webspeech/synth/ipc/test/file_ipc.html b/dom/media/webspeech/synth/ipc/test/file_ipc.html
similarity index 100%
rename from content/media/webspeech/synth/ipc/test/file_ipc.html
rename to dom/media/webspeech/synth/ipc/test/file_ipc.html
diff --git a/content/media/webspeech/synth/ipc/test/mochitest.ini b/dom/media/webspeech/synth/ipc/test/mochitest.ini
similarity index 100%
rename from content/media/webspeech/synth/ipc/test/mochitest.ini
rename to dom/media/webspeech/synth/ipc/test/mochitest.ini
diff --git a/content/media/webspeech/synth/ipc/test/test_ipc.html b/dom/media/webspeech/synth/ipc/test/test_ipc.html
similarity index 100%
rename from content/media/webspeech/synth/ipc/test/test_ipc.html
rename to dom/media/webspeech/synth/ipc/test/test_ipc.html
diff --git a/content/media/webspeech/synth/moz.build b/dom/media/webspeech/synth/moz.build
similarity index 100%
rename from content/media/webspeech/synth/moz.build
rename to dom/media/webspeech/synth/moz.build
diff --git a/content/media/webspeech/synth/nsISpeechService.idl b/dom/media/webspeech/synth/nsISpeechService.idl
similarity index 100%
rename from content/media/webspeech/synth/nsISpeechService.idl
rename to dom/media/webspeech/synth/nsISpeechService.idl
diff --git a/content/media/webspeech/synth/nsISynthVoiceRegistry.idl b/dom/media/webspeech/synth/nsISynthVoiceRegistry.idl
similarity index 100%
rename from content/media/webspeech/synth/nsISynthVoiceRegistry.idl
rename to dom/media/webspeech/synth/nsISynthVoiceRegistry.idl
diff --git a/content/media/webspeech/synth/nsSpeechTask.cpp b/dom/media/webspeech/synth/nsSpeechTask.cpp
similarity index 100%
rename from content/media/webspeech/synth/nsSpeechTask.cpp
rename to dom/media/webspeech/synth/nsSpeechTask.cpp
diff --git a/content/media/webspeech/synth/nsSpeechTask.h b/dom/media/webspeech/synth/nsSpeechTask.h
similarity index 100%
rename from content/media/webspeech/synth/nsSpeechTask.h
rename to dom/media/webspeech/synth/nsSpeechTask.h
diff --git a/content/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
similarity index 100%
rename from content/media/webspeech/synth/nsSynthVoiceRegistry.cpp
rename to dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
diff --git a/content/media/webspeech/synth/nsSynthVoiceRegistry.h b/dom/media/webspeech/synth/nsSynthVoiceRegistry.h
similarity index 100%
rename from content/media/webspeech/synth/nsSynthVoiceRegistry.h
rename to dom/media/webspeech/synth/nsSynthVoiceRegistry.h
diff --git a/content/media/webspeech/synth/pico/PicoModule.cpp b/dom/media/webspeech/synth/pico/PicoModule.cpp
similarity index 100%
rename from content/media/webspeech/synth/pico/PicoModule.cpp
rename to dom/media/webspeech/synth/pico/PicoModule.cpp
diff --git a/content/media/webspeech/synth/pico/moz.build b/dom/media/webspeech/synth/pico/moz.build
similarity index 100%
rename from content/media/webspeech/synth/pico/moz.build
rename to dom/media/webspeech/synth/pico/moz.build
diff --git a/content/media/webspeech/synth/pico/nsPicoService.cpp b/dom/media/webspeech/synth/pico/nsPicoService.cpp
similarity index 100%
rename from content/media/webspeech/synth/pico/nsPicoService.cpp
rename to dom/media/webspeech/synth/pico/nsPicoService.cpp
diff --git a/content/media/webspeech/synth/pico/nsPicoService.h b/dom/media/webspeech/synth/pico/nsPicoService.h
similarity index 100%
rename from content/media/webspeech/synth/pico/nsPicoService.h
rename to dom/media/webspeech/synth/pico/nsPicoService.h
diff --git a/content/media/webspeech/synth/test/common.js b/dom/media/webspeech/synth/test/common.js
similarity index 100%
rename from content/media/webspeech/synth/test/common.js
rename to dom/media/webspeech/synth/test/common.js
diff --git a/content/media/webspeech/synth/test/file_setup.html b/dom/media/webspeech/synth/test/file_setup.html
similarity index 100%
rename from content/media/webspeech/synth/test/file_setup.html
rename to dom/media/webspeech/synth/test/file_setup.html
diff --git a/content/media/webspeech/synth/test/file_speech_queue.html b/dom/media/webspeech/synth/test/file_speech_queue.html
similarity index 100%
rename from content/media/webspeech/synth/test/file_speech_queue.html
rename to dom/media/webspeech/synth/test/file_speech_queue.html
diff --git a/content/media/webspeech/synth/test/file_speech_simple.html b/dom/media/webspeech/synth/test/file_speech_simple.html
similarity index 100%
rename from content/media/webspeech/synth/test/file_speech_simple.html
rename to dom/media/webspeech/synth/test/file_speech_simple.html
diff --git a/content/media/webspeech/synth/test/mochitest.ini b/dom/media/webspeech/synth/test/mochitest.ini
similarity index 100%
rename from content/media/webspeech/synth/test/mochitest.ini
rename to dom/media/webspeech/synth/test/mochitest.ini
diff --git a/content/media/webspeech/synth/test/test_setup.html b/dom/media/webspeech/synth/test/test_setup.html
similarity index 100%
rename from content/media/webspeech/synth/test/test_setup.html
rename to dom/media/webspeech/synth/test/test_setup.html
diff --git a/content/media/webspeech/synth/test/test_speech_queue.html b/dom/media/webspeech/synth/test/test_speech_queue.html
similarity index 100%
rename from content/media/webspeech/synth/test/test_speech_queue.html
rename to dom/media/webspeech/synth/test/test_speech_queue.html
diff --git a/content/media/webspeech/synth/test/test_speech_simple.html b/dom/media/webspeech/synth/test/test_speech_simple.html
similarity index 100%
rename from content/media/webspeech/synth/test/test_speech_simple.html
rename to dom/media/webspeech/synth/test/test_speech_simple.html
diff --git a/content/media/webvtt/WebVTT.manifest b/dom/media/webvtt/WebVTT.manifest
similarity index 100%
rename from content/media/webvtt/WebVTT.manifest
rename to dom/media/webvtt/WebVTT.manifest
diff --git a/content/media/webvtt/WebVTTParserWrapper.js b/dom/media/webvtt/WebVTTParserWrapper.js
similarity index 100%
rename from content/media/webvtt/WebVTTParserWrapper.js
rename to dom/media/webvtt/WebVTTParserWrapper.js
diff --git a/content/media/webvtt/moz.build b/dom/media/webvtt/moz.build
similarity index 100%
rename from content/media/webvtt/moz.build
rename to dom/media/webvtt/moz.build
diff --git a/content/media/webvtt/nsIWebVTTListener.idl b/dom/media/webvtt/nsIWebVTTListener.idl
similarity index 100%
rename from content/media/webvtt/nsIWebVTTListener.idl
rename to dom/media/webvtt/nsIWebVTTListener.idl
diff --git a/content/media/webvtt/nsIWebVTTParserWrapper.idl b/dom/media/webvtt/nsIWebVTTParserWrapper.idl
similarity index 100%
rename from content/media/webvtt/nsIWebVTTParserWrapper.idl
rename to dom/media/webvtt/nsIWebVTTParserWrapper.idl
diff --git a/content/media/webvtt/package.json b/dom/media/webvtt/package.json
similarity index 100%
rename from content/media/webvtt/package.json
rename to dom/media/webvtt/package.json
diff --git a/content/media/webvtt/update-webvtt.js b/dom/media/webvtt/update-webvtt.js
similarity index 100%
rename from content/media/webvtt/update-webvtt.js
rename to dom/media/webvtt/update-webvtt.js
diff --git a/content/media/webvtt/vtt.jsm b/dom/media/webvtt/vtt.jsm
similarity index 100%
rename from content/media/webvtt/vtt.jsm
rename to dom/media/webvtt/vtt.jsm
diff --git a/content/media/wmf/DXVA2Manager.cpp b/dom/media/wmf/DXVA2Manager.cpp
similarity index 100%
rename from content/media/wmf/DXVA2Manager.cpp
rename to dom/media/wmf/DXVA2Manager.cpp
diff --git a/content/media/wmf/DXVA2Manager.h b/dom/media/wmf/DXVA2Manager.h
similarity index 100%
rename from content/media/wmf/DXVA2Manager.h
rename to dom/media/wmf/DXVA2Manager.h
diff --git a/content/media/wmf/WMF.h b/dom/media/wmf/WMF.h
similarity index 100%
rename from content/media/wmf/WMF.h
rename to dom/media/wmf/WMF.h
diff --git a/content/media/wmf/WMFByteStream.cpp b/dom/media/wmf/WMFByteStream.cpp
similarity index 100%
rename from content/media/wmf/WMFByteStream.cpp
rename to dom/media/wmf/WMFByteStream.cpp
diff --git a/content/media/wmf/WMFByteStream.h b/dom/media/wmf/WMFByteStream.h
similarity index 100%
rename from content/media/wmf/WMFByteStream.h
rename to dom/media/wmf/WMFByteStream.h
diff --git a/content/media/wmf/WMFDecoder.cpp b/dom/media/wmf/WMFDecoder.cpp
similarity index 100%
rename from content/media/wmf/WMFDecoder.cpp
rename to dom/media/wmf/WMFDecoder.cpp
diff --git a/content/media/wmf/WMFDecoder.h b/dom/media/wmf/WMFDecoder.h
similarity index 100%
rename from content/media/wmf/WMFDecoder.h
rename to dom/media/wmf/WMFDecoder.h
diff --git a/content/media/wmf/WMFReader.cpp b/dom/media/wmf/WMFReader.cpp
similarity index 100%
rename from content/media/wmf/WMFReader.cpp
rename to dom/media/wmf/WMFReader.cpp
diff --git a/content/media/wmf/WMFReader.h b/dom/media/wmf/WMFReader.h
similarity index 100%
rename from content/media/wmf/WMFReader.h
rename to dom/media/wmf/WMFReader.h
diff --git a/content/media/wmf/WMFSourceReaderCallback.cpp b/dom/media/wmf/WMFSourceReaderCallback.cpp
similarity index 100%
rename from content/media/wmf/WMFSourceReaderCallback.cpp
rename to dom/media/wmf/WMFSourceReaderCallback.cpp
diff --git a/content/media/wmf/WMFSourceReaderCallback.h b/dom/media/wmf/WMFSourceReaderCallback.h
similarity index 100%
rename from content/media/wmf/WMFSourceReaderCallback.h
rename to dom/media/wmf/WMFSourceReaderCallback.h
diff --git a/content/media/wmf/WMFUtils.cpp b/dom/media/wmf/WMFUtils.cpp
similarity index 100%
rename from content/media/wmf/WMFUtils.cpp
rename to dom/media/wmf/WMFUtils.cpp
diff --git a/content/media/wmf/WMFUtils.h b/dom/media/wmf/WMFUtils.h
similarity index 100%
rename from content/media/wmf/WMFUtils.h
rename to dom/media/wmf/WMFUtils.h
diff --git a/content/media/wmf/moz.build b/dom/media/wmf/moz.build
similarity index 100%
rename from content/media/wmf/moz.build
rename to dom/media/wmf/moz.build
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 9b6c42a7888..8da484c9988 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -115,7 +115,7 @@ if CONFIG['MOZ_B2G_BT']:
 
 if CONFIG['MOZ_WEBSPEECH']:
     LOCAL_INCLUDES += [
-        '/content/media/webspeech/synth',
+        '/dom/media/webspeech/synth',
     ]
 
 if CONFIG['MOZ_GSTREAMER']:
diff --git a/layout/generic/test/file_IconTestServer.sjs b/layout/generic/test/file_IconTestServer.sjs
index cffa4bbbc10..4aea92333d0 100644
--- a/layout/generic/test/file_IconTestServer.sjs
+++ b/layout/generic/test/file_IconTestServer.sjs
@@ -65,7 +65,7 @@ function handleRequest(request, response) {
   // Get the output stream
   ctx.ostream = response.bodyOutputStream;
 
-  // Ugly hack, but effective - copied from content/media/test/contentDuration1.sjs
+  // Ugly hack, but effective - copied from dom/media/test/contentDuration1.sjs
   var pngFile = Components.classes["@mozilla.org/file/directory_service;1"].
                            getService(Components.interfaces.nsIProperties).
                            get("CurWorkD", Components.interfaces.nsILocalFile);
diff --git a/media/gmp-clearkey/0.1/moz.build b/media/gmp-clearkey/0.1/moz.build
index f240008be97..025e899ab3c 100644
--- a/media/gmp-clearkey/0.1/moz.build
+++ b/media/gmp-clearkey/0.1/moz.build
@@ -16,7 +16,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/content/media/gmp',
+    '/dom/media/gmp',
 ]
 
 USE_STATIC_LIBS = True
diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
index b1520f55daf..5dc448bcfd8 100644
--- a/media/webrtc/signaling/signaling.gyp
+++ b/media/webrtc/signaling/signaling.gyp
@@ -57,7 +57,7 @@
         './src/sipcc/core/sdp',
         '../../../xpcom/base',
         '../../../dom/base',
-        '../../../content/media',
+        '../../../dom/media',
         '../../../media/mtransport',
         '../trunk',
         '../trunk/webrtc',
@@ -220,7 +220,7 @@
           'include_dirs': [
             # hack on hack to re-add it after SrtpFlow removes it
             '../../webrtc/trunk/webrtc',
-            '../../../content/media/omx',
+            '../../../dom/media/omx',
             '../../../gfx/layers/client',
           ],
           'cflags_mozilla': [
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index cd6e2004a3d..71349e27dc2 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -8,7 +8,6 @@ include ../../accessible/tests/crashtests/crashtests.list
 include ../../content/base/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
-include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
@@ -19,6 +18,7 @@ include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/jsurl/crashtests/crashtests.list
 include ../../dom/mathml/crashtests/crashtests.list
+include ../../dom/media/test/crashtests/crashtests.list
 include ../../dom/offline/crashtests/crashtests.list
 include ../../dom/plugins/test/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index b061e743397..dc8fd1edaed 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -2,22 +2,22 @@
 "runtests": {},
 "excludetests": {
   "content/base/test/test_copypaste.xul": "bug 904183",
-  "content/media/test/test_seeked.html": "x86 only bug 914439",
-  "content/media/test/test_played.html": "bug 751539",
-  "content/media/test/test_play_twice.html": "x86 only bug 914439",
   "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
   "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
-  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
-  "dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
   "dom/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
+  "dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
   "dom/canvas/test/test_canvas.html": "x86 only bug 913662",
+  "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
   "dom/contacts/tests/test_contacts_getall.html": "x86 only",
   "dom/devicestorage": "bug 781789 & bug 782275",
-  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
   "dom/imptests/editing/conformancetest/test_runtest.html": "",
-  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
+  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
   "dom/imptests/html/webgl": "WebGL",
+  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
   "dom/inputmethod": "Not supported on Android",
+  "dom/media/test/test_play_twice.html": "x86 only bug 914439",
+  "dom/media/test/test_played.html": "bug 751539",
+  "dom/media/test/test_seeked.html": "x86 only bug 914439",
   "dom/tests/mochitest/geolocation/test_timeoutWatch.html": "TIMED_OUT",
   "editor/libeditor/tests/test_bug569988.html": "TIMED_OUT",
   "editor/libeditor/tests/test_texteditor_keyevent_handling.html": "",
diff --git a/testing/mochitest/manifests/emulator-jb.ini b/testing/mochitest/manifests/emulator-jb.ini
index 8ee63f9e8f2..236af51aeb4 100644
--- a/testing/mochitest/manifests/emulator-jb.ini
+++ b/testing/mochitest/manifests/emulator-jb.ini
@@ -1 +1 @@
-[include:../tests/content/media/test/mochitest.ini]
+[include:../tests/dom/media/test/mochitest.ini]
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 7875c269af9..29f8cbaf693 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1710,7 +1710,7 @@ licences.
 
     <h1><a id="apple"></a>Apple License</h1>
 
-    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, <span class="path">content/media/webaudio/blink</span>, and <span class="path">widget/cocoa</span>.</p>
+    <p>This license applies to certain files in the directories <span class="path">js/src/assembler/assembler/</span>, <span class="path">js/src/assembler/wtf/</span>, <span class="path">js/src/yarr</span>, <span class="path">dom/media/webaudio/blink</span>, and <span class="path">widget/cocoa</span>.</p>
 
 <pre>
 Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
@@ -1949,7 +1949,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       <span class="path">tools/profiler/sps/</span>,
       <span class="path">gfx/ots/</span>,
       <span class="path">gfx/ycbcr</span> and
-      <span class="path">content/media/webspeech/recognition/</span>.
+      <span class="path">dom/media/webspeech/recognition/</span>.
     </p>
 
 <pre>
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
index d7fa7fd00f5..a4e21382816 100644
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -68,7 +68,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/media/omx/mediaresourcemanager',
+    '/dom/media/omx/mediaresourcemanager',
     '/dom/system/android',
     '/gfx/skia/trunk/include/config',
     '/gfx/skia/trunk/include/core',