From 03fac7f849447c39c15731f786ecffdbcca47273 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 24 Oct 2014 15:06:55 -0700
Subject: [PATCH 01/37] Bug 1087799, part 1 - Loosen the invariant in
 nsCycleCollector::FinishAnyCurrentCollection(). r=smaug

If an Unlink() method ends up running JS, it can cause a GC, which will make us reenter the CC,
which will not do anything because we're already in a CC. Therefore, FinishAnyCurrentCollection()
won't finish the CC. This is safe because the CC only touches things it actually holds alive via
the Root() method.
---
 xpcom/base/nsCycleCollector.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 399b719758e..33ae5298e42 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -3673,7 +3673,10 @@ nsCycleCollector::FinishAnyCurrentCollection()
   PrintPhase("FinishAnyCurrentCollection");
   // Use SliceCC because we only want to finish the CC in progress.
   Collect(SliceCC, unlimitedBudget, nullptr);
-  MOZ_ASSERT(mIncrementalPhase == IdlePhase);
+
+  MOZ_ASSERT(mIncrementalPhase == IdlePhase ||
+             (mIncrementalPhase == ScanAndCollectWhitePhase && mActivelyCollecting),
+             "FinishAnyCurrentCollection should finish the collection, unless we've reentered the CC during unlinking");
 }
 
 // Don't merge too many times in a row, and do at least a minimum

From abde4a65b9e7c045dc345e85d1899de9986d4af0 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 24 Oct 2014 15:06:56 -0700
Subject: [PATCH 02/37] Bug 1087799, part 2 - Rename count to numWhiteNodes in
 nsCycleCollector::CollectWhite(). r=smaug

---
 xpcom/base/nsCycleCollector.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 33ae5298e42..feddbfb43a3 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -3263,10 +3263,10 @@ nsCycleCollector::CollectWhite()
     }
   }
 
-  uint32_t count = whiteNodes.Length();
-  MOZ_ASSERT(numWhiteGCed <= count,
+  uint32_t numWhiteNodes = whiteNodes.Length();
+  MOZ_ASSERT(numWhiteGCed <= numWhiteNodes,
              "More freed GCed nodes than total freed nodes.");
-  mResults.mFreedRefCounted += count - numWhiteGCed;
+  mResults.mFreedRefCounted += numWhiteNodes - numWhiteGCed;
   mResults.mFreedGCed += numWhiteGCed;
   mResults.mFreedJSZones += numWhiteJSZones;
 
@@ -3277,7 +3277,7 @@ nsCycleCollector::CollectWhite()
     timeLog.Checkpoint("CollectWhite::BeforeUnlinkCB");
   }
 
-  for (uint32_t i = 0; i < count; ++i) {
+  for (uint32_t i = 0; i < numWhiteNodes; ++i) {
     PtrInfo* pinfo = whiteNodes.ElementAt(i);
     MOZ_ASSERT(pinfo->mParticipant,
                "Unlink shouldn't see objects removed from graph.");
@@ -3290,7 +3290,7 @@ nsCycleCollector::CollectWhite()
   }
   timeLog.Checkpoint("CollectWhite::Unlink");
 
-  for (uint32_t i = 0; i < count; ++i) {
+  for (uint32_t i = 0; i < numWhiteNodes; ++i) {
     PtrInfo* pinfo = whiteNodes.ElementAt(i);
     MOZ_ASSERT(pinfo->mParticipant,
                "Unroot shouldn't see objects removed from graph.");
@@ -3303,7 +3303,7 @@ nsCycleCollector::CollectWhite()
 
   mIncrementalPhase = CleanupPhase;
 
-  return count > 0;
+  return numWhiteNodes > 0;
 }
 
 

From 3a77f28374e6ca92fc066c3ba6a29d95c427fcd6 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <continuation@gmail.com>
Date: Fri, 24 Oct 2014 15:06:56 -0700
Subject: [PATCH 03/37] Bug 1087799, part 3 - Do not include any JS things in
 the list of white nodes. r=smaug

Root() does not actually root JS things, so if some other class's Unlink() method ends
up calling the GC, whiteNodes will end up containing dead pointers. (This is safe right
now because the Unlink and Unroot methods do not do anything to JS things.) It is less
error prone to simply never store those pointers.

Also, add some asserts to enforce that we never call any of the white-object methods
for JS things.
---
 xpcom/base/CycleCollectedJSRuntime.h | 22 +++++++++++++++-------
 xpcom/base/nsCycleCollector.cpp      | 14 ++++++++------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/xpcom/base/CycleCollectedJSRuntime.h b/xpcom/base/CycleCollectedJSRuntime.h
index 4685bf5c742..3b2964aac14 100644
--- a/xpcom/base/CycleCollectedJSRuntime.h
+++ b/xpcom/base/CycleCollectedJSRuntime.h
@@ -28,20 +28,24 @@ namespace mozilla {
 class JSGCThingParticipant: public nsCycleCollectionParticipant
 {
 public:
-  NS_IMETHOD_(void) Root(void* aPtr)
+  NS_IMETHOD_(void) Root(void*)
   {
+    MOZ_ASSERT(false, "Don't call Root on GC things");
   }
 
-  NS_IMETHOD_(void) Unlink(void* aPtr)
+  NS_IMETHOD_(void) Unlink(void*)
   {
+    MOZ_ASSERT(false, "Don't call Unlink on GC things, as they may be dead");
   }
 
-  NS_IMETHOD_(void) Unroot(void* aPtr)
+  NS_IMETHOD_(void) Unroot(void*)
   {
+    MOZ_ASSERT(false, "Don't call Unroot on GC things, as they may be dead");
   }
 
   NS_IMETHOD_(void) DeleteCycleCollectable(void* aPtr)
   {
+    MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
   }
 
   NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb);
@@ -54,20 +58,24 @@ public:
   {
   }
 
-  NS_IMETHOD_(void) Root(void* aPtr)
+  NS_IMETHOD_(void) Root(void*)
   {
+    MOZ_ASSERT(false, "Don't call Root on GC things");
   }
 
-  NS_IMETHOD_(void) Unlink(void* aPtr)
+  NS_IMETHOD_(void) Unlink(void*)
   {
+    MOZ_ASSERT(false, "Don't call Unlink on GC things, as they may be dead");
   }
 
-  NS_IMETHOD_(void) Unroot(void* aPtr)
+  NS_IMETHOD_(void) Unroot(void*)
   {
+    MOZ_ASSERT(false, "Don't call Unroot on GC things, as they may be dead");
   }
 
-  NS_IMETHOD_(void) DeleteCycleCollectable(void* aPtr)
+  NS_IMETHOD_(void) DeleteCycleCollectable(void*)
   {
+    MOZ_ASSERT(false, "Can't directly delete a cycle collectable GC thing");
   }
 
   NS_IMETHOD Traverse(void* aPtr, nsCycleCollectionTraversalCallback& aCb);
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index feddbfb43a3..3373cbb1822 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -3252,21 +3252,20 @@ nsCycleCollector::CollectWhite()
   while (!etor.IsDone()) {
     PtrInfo* pinfo = etor.GetNext();
     if (pinfo->mColor == white && pinfo->mParticipant) {
-      whiteNodes.AppendElement(pinfo);
-      pinfo->mParticipant->Root(pinfo->mPointer);
       if (pinfo->IsGrayJS()) {
         ++numWhiteGCed;
         if (MOZ_UNLIKELY(pinfo->mParticipant == zoneParticipant)) {
           ++numWhiteJSZones;
         }
+      } else {
+        whiteNodes.AppendElement(pinfo);
+        pinfo->mParticipant->Root(pinfo->mPointer);
       }
     }
   }
 
   uint32_t numWhiteNodes = whiteNodes.Length();
-  MOZ_ASSERT(numWhiteGCed <= numWhiteNodes,
-             "More freed GCed nodes than total freed nodes.");
-  mResults.mFreedRefCounted += numWhiteNodes - numWhiteGCed;
+  mResults.mFreedRefCounted += numWhiteNodes;
   mResults.mFreedGCed += numWhiteGCed;
   mResults.mFreedJSZones += numWhiteJSZones;
 
@@ -3277,6 +3276,9 @@ nsCycleCollector::CollectWhite()
     timeLog.Checkpoint("CollectWhite::BeforeUnlinkCB");
   }
 
+  // Unlink() can trigger a GC, so do not touch any JS or anything
+  // else not in whiteNodes after here.
+
   for (uint32_t i = 0; i < numWhiteNodes; ++i) {
     PtrInfo* pinfo = whiteNodes.ElementAt(i);
     MOZ_ASSERT(pinfo->mParticipant,
@@ -3303,7 +3305,7 @@ nsCycleCollector::CollectWhite()
 
   mIncrementalPhase = CleanupPhase;
 
-  return numWhiteNodes > 0;
+  return numWhiteNodes > 0 || numWhiteGCed > 0 || numWhiteJSZones > 0;
 }
 
 

From 125d3cbc298a6046beff6b7c16ba67a2303a2f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Ferr=C3=A9?= <dev@remyferre.net>
Date: Fri, 24 Oct 2014 15:27:40 -0700
Subject: [PATCH 04/37] Bug 1058845 - Decode raw_input() as UTF-8; r=gps

DONTBUILD (NPOTB)

--HG--
extra : amend_source : cf4f5e29de43f714ae62f247227b17e65debc710
---
 tools/mercurial/hgsetup/wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mercurial/hgsetup/wizard.py b/tools/mercurial/hgsetup/wizard.py
index cbb0161c07a..63533ab3682 100644
--- a/tools/mercurial/hgsetup/wizard.py
+++ b/tools/mercurial/hgsetup/wizard.py
@@ -425,7 +425,7 @@ class MercurialSetupWizard(object):
         print(msg)
 
         while True:
-            response = raw_input()
+            response = raw_input().decode('utf-8')
 
             if response:
                 return response

From b743cda265b7261bc2abf731acedce5321899e6b Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Sat, 25 Oct 2014 00:34:34 +0200
Subject: [PATCH 05/37] Bug 1088969 - Upgrade Mozilla 36 to use NSS 3.18,
 landing beta 1, r=wtc

---
 security/nss/TAG-INFO                        |  2 +-
 security/nss/cmd/lib/secutil.c               |  3 +++
 security/nss/cmd/rsaperf/rsaperf.c           | 10 ++--------
 security/nss/cmd/ssltap/ssltap.c             |  1 +
 security/nss/cmd/tstclnt/tstclnt.c           | 16 ++++++++++++++--
 security/nss/coreconf/coreconf.dep           |  1 -
 security/nss/lib/crmf/respcli.c              | 12 +++++++-----
 security/nss/lib/freebl/cts.c                |  1 -
 security/nss/lib/nss/nss.def                 |  6 ++++++
 security/nss/lib/nss/nss.h                   |  8 ++++----
 security/nss/lib/pk11wrap/pk11cert.c         | 12 +++++++++++-
 security/nss/lib/pk11wrap/pk11pub.h          |  2 ++
 security/nss/lib/pk11wrap/pk11util.c         |  2 +-
 security/nss/lib/softoken/legacydb/pcertdb.c |  6 ++----
 security/nss/lib/softoken/softkver.h         |  8 ++++----
 security/nss/lib/ssl/ssl3con.c               |  1 -
 security/nss/lib/util/nssutil.h              |  8 ++++----
 17 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 5479ed9c66f..2b997095dc9 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_17_2_RTM
+NSS_3_18_BETA1
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 8a31cd0c100..9f69f7fb753 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -291,6 +291,9 @@ secu_InitSlotPassword(PK11SlotInfo *slot, PRBool retry, void *arg)
     output = fopen(consoleName, "w");
     if (output == NULL) {
 	PR_fprintf(PR_STDERR, "Error opening output terminal for write\n");
+#ifndef _WINDOWS
+	fclose(input);
+#endif
 	return NULL;
     }
 
diff --git a/security/nss/cmd/rsaperf/rsaperf.c b/security/nss/cmd/rsaperf/rsaperf.c
index c2f483c5978..55503768fea 100644
--- a/security/nss/cmd/rsaperf/rsaperf.c
+++ b/security/nss/cmd/rsaperf/rsaperf.c
@@ -401,8 +401,6 @@ main(int argc, char **argv)
         Usage(progName);
     }
 
-    if (!doPriv && !doPub) doPriv = PR_TRUE;
-
     if (doIters && doTime) Usage(progName);
 
     if (!doTime) {
@@ -430,9 +428,7 @@ main(int argc, char **argv)
 
     if (useTokenKey) {
         CK_OBJECT_HANDLE kh = CK_INVALID_HANDLE;
-        CERTCertDBHandle* certdb = NULL;
-	certdb = CERT_GetDefaultCertDB();
-        
+
         cert = PK11_FindCertFromNickname(nickname, &pwData);
         if (cert == NULL) {
             fprintf(stderr,
@@ -490,9 +486,7 @@ main(int argc, char **argv)
             exit(1);
         }
 
-        doKeyGen = PR_TRUE; /* Always do a keygen for session keys.
-                               Import of hardcoded key is not supported */
-        /* do a temporary keygen in selected slot */        
+        /* do a temporary keygen in selected slot */
         if (!keybits) {
             keybits = DEFAULT_KEY_BITS;
         }
diff --git a/security/nss/cmd/ssltap/ssltap.c b/security/nss/cmd/ssltap/ssltap.c
index 9614f05fe19..170420a6f89 100644
--- a/security/nss/cmd/ssltap/ssltap.c
+++ b/security/nss/cmd/ssltap/ssltap.c
@@ -403,6 +403,7 @@ const char * V2CipherString(int cs_int)
   case 0x00009E:    cs_str = "TLS/DHE-RSA/AES128-GCM/SHA256";	break;     
 
   case 0x0000FF:    cs_str = "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"; break;
+  case 0x005600:    cs_str = "TLS_FALLBACK_SCSV"; break;
 
   case 0x00C001:    cs_str = "TLS/ECDH-ECDSA/NULL/SHA";         break;
   case 0x00C002:    cs_str = "TLS/ECDH-ECDSA/RC4-128/SHA";      break;
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index b92dcb1a198..664c54f7f72 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -180,7 +180,7 @@ static void PrintUsageHeader(const char *progName)
     fprintf(stderr, 
 "Usage:  %s -h host [-a 1st_hs_name ] [-a 2nd_hs_name ] [-p port]\n"
                     "[-d certdir] [-n nickname] [-Bafosvx] [-c ciphers] [-Y]\n"
-                    "[-V [min-version]:[max-version]] [-T]\n"
+                    "[-V [min-version]:[max-version]] [-K] [-T]\n"
                     "[-r N] [-w passwd] [-W pwfile] [-q [-t seconds]]\n", 
             progName);
 }
@@ -206,6 +206,7 @@ static void PrintParameterUsage(void)
             "%-20s Possible values for min/max: ssl2 ssl3 tls1.0 tls1.1 tls1.2\n"
             "%-20s Example: \"-V ssl3:\" enables SSL 3 and newer.\n",
             "-V [min]:[max]", "", "", "");
+    fprintf(stderr, "%-20s Send TLS_FALLBACK_SCSV\n", "-K");
     fprintf(stderr, "%-20s Prints only payload data. Skips HTTP header.\n", "-S");
     fprintf(stderr, "%-20s Client speaks first. \n", "-f");
     fprintf(stderr, "%-20s Use synchronous certificate validation "
@@ -807,6 +808,7 @@ int main(int argc, char **argv)
     int                enableCompression = 0;
     int                enableFalseStart = 0;
     int                enableCertStatus = 0;
+    int                forceFallbackSCSV = 0;
     PRSocketOptionData opt;
     PRNetAddr          addr;
     PRPollDesc         pollset[2];
@@ -852,7 +854,7 @@ int main(int argc, char **argv)
     SSL_VersionRangeGetSupported(ssl_variant_stream, &enabledVersions);
 
     optstate = PL_CreateOptState(argc, argv,
-                                 "46BFM:OSTV:W:Ya:c:d:fgh:m:n:op:qr:st:uvw:xz");
+                                 "46BFKM:OSTV:W:Ya:c:d:fgh:m:n:op:qr:st:uvw:xz");
     while ((optstatus = PL_GetNextOpt(optstate)) == PL_OPT_OK) {
 	switch (optstate->option) {
 	  case '?':
@@ -874,6 +876,8 @@ int main(int argc, char **argv)
 
           case 'O': serverCertAuth.shouldPause = PR_FALSE; break;
 
+          case 'K': forceFallbackSCSV = PR_TRUE; break;
+
           case 'M': switch (atoi(optstate->value)) {
                       case 1:
                           serverCertAuth.allowOCSPSideChannelData = PR_TRUE;
@@ -1218,6 +1222,14 @@ int main(int argc, char **argv)
 	return 1;
     }
 
+    if (forceFallbackSCSV) {
+        rv = SSL_OptionSet(s, SSL_ENABLE_FALLBACK_SCSV, PR_TRUE);
+        if (rv != SECSuccess) {
+            SECU_PrintError(progName, "error forcing fallback scsv");
+            return 1;
+        }
+    }
+
     /* enable cert status (OCSP stapling). */
     rv = SSL_OptionSet(s, SSL_ENABLE_OCSP_STAPLING, enableCertStatus);
     if (rv != SECSuccess) {
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 590d1bfaeee..5182f75552c 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/lib/crmf/respcli.c b/security/nss/lib/crmf/respcli.c
index 653bd8a61c4..5525aaf262c 100644
--- a/security/nss/lib/crmf/respcli.c
+++ b/security/nss/lib/crmf/respcli.c
@@ -92,11 +92,13 @@ CMMF_CertRepContentGetResponseAtIndex(CMMFCertRepContent *inCertRepContent,
         return NULL;
     }
     certResponse = PORT_ZNew(CMMFCertResponse);
-    rv = cmmf_CopyCertResponse(NULL, certResponse, 
-			       inCertRepContent->response[inIndex]);
-    if (rv != SECSuccess) {
-        CMMF_DestroyCertResponse(certResponse);
-	certResponse = NULL;
+    if (certResponse){
+	rv = cmmf_CopyCertResponse(NULL, certResponse, 
+				   inCertRepContent->response[inIndex]);
+	if (rv != SECSuccess) {
+	    CMMF_DestroyCertResponse(certResponse);
+	    certResponse = NULL;
+	}
     }
     return certResponse;
 }
diff --git a/security/nss/lib/freebl/cts.c b/security/nss/lib/freebl/cts.c
index 74cdc0beaf0..5d4ed18bc3e 100644
--- a/security/nss/lib/freebl/cts.c
+++ b/security/nss/lib/freebl/cts.c
@@ -239,7 +239,6 @@ CTS_DecryptUpdate(CTSContext *cts, unsigned char *outbuf,
 	return SECSuccess;
     }
     outbuf += fullblocks;
-    maxout -= fullblocks;
 
     /* recover the stolen text */
     PORT_Memset(lastBlock, 0, blocksize);
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 6f6b6708117..48bb2f22c6b 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -1062,3 +1062,9 @@ PK11_PrivDecrypt;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.18 { 	# NSS 3.18 release
+;+    global:
+PK11_SetCertificateNickname;
+;+    local:
+;+       *;
+;+};
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index d56d55e9d16..c5fd3252598 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -33,12 +33,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.17.2" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.18" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
-#define NSS_VMINOR   17
-#define NSS_VPATCH   2
+#define NSS_VMINOR   18
+#define NSS_VPATCH   0
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c
index 5b074bf58fc..c4250c64d01 100644
--- a/security/nss/lib/pk11wrap/pk11cert.c
+++ b/security/nss/lib/pk11wrap/pk11cert.c
@@ -2153,7 +2153,6 @@ PK11_FindCertFromDERCertItem(PK11SlotInfo *slot, const SECItem *inDerCert,
 {
     NSSDER derCert;
     NSSToken *tok;
-    NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
     nssCryptokiObject *co = NULL;
     SECStatus rv;
 
@@ -2687,3 +2686,14 @@ PK11_GetAllSlotsForCert(CERTCertificate *cert, void *arg)
     nssCryptokiObjectArray_Destroy(instances);
     return slotList;
 }
+
+SECStatus
+PK11_SetCertificateNickname(CERTCertificate *cert, const char *nickname)
+{
+    /* Can't set nickname of temp cert. */
+    if (!cert->slot || cert->pkcs11ID == CK_INVALID_HANDLE) {
+        return SEC_ERROR_INVALID_ARGS;
+    }
+    return PK11_SetObjectNickname(cert->slot, cert->pkcs11ID, nickname);
+}
+
diff --git a/security/nss/lib/pk11wrap/pk11pub.h b/security/nss/lib/pk11wrap/pk11pub.h
index f0bf2c882ad..709ce21e2bd 100644
--- a/security/nss/lib/pk11wrap/pk11pub.h
+++ b/security/nss/lib/pk11wrap/pk11pub.h
@@ -458,6 +458,8 @@ SECStatus PK11_SetPrivateKeyNickname(SECKEYPrivateKey *privKey,
 							const char *nickname);
 SECStatus PK11_SetPublicKeyNickname(SECKEYPublicKey *pubKey, 
 							const char *nickname);
+SECStatus PK11_SetCertificateNickname(CERTCertificate *cert,
+                                      const char *nickname);
 
 /* size to hold key in bytes */
 unsigned int PK11_GetKeyLength(PK11SymKey *key);
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index 58ff5da9677..4a384ad5bc2 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -1185,7 +1185,7 @@ end_wait:
 SECStatus
 SECMOD_CancelWait(SECMODModule *mod)
 {
-    unsigned long controlMask = mod->evControlMask;
+    unsigned long controlMask;
     SECStatus rv = SECSuccess;
     CK_RV crv;
 
diff --git a/security/nss/lib/softoken/legacydb/pcertdb.c b/security/nss/lib/softoken/legacydb/pcertdb.c
index 58fe27af9c1..5f7670062ce 100644
--- a/security/nss/lib/softoken/legacydb/pcertdb.c
+++ b/security/nss/lib/softoken/legacydb/pcertdb.c
@@ -4733,7 +4733,6 @@ nsslowcert_FindCertByIssuerAndSN(NSSLOWCERTCertDBHandle *handle, NSSLOWCERTIssue
     SECItem *sn = &issuerAndSN->serialNumber;
     SECItem *issuer = &issuerAndSN->derIssuer;
     NSSLOWCERTCertificate *cert;
-    int data_left = sn->len-1;
     int data_len = sn->len;
     int index = 0;
 
@@ -4743,7 +4742,7 @@ nsslowcert_FindCertByIssuerAndSN(NSSLOWCERTCertDBHandle *handle, NSSLOWCERTIssue
     if ((sn->len >= 3) && (sn->data[0] == 0x2)) {
 	/* remove the der encoding of the serial number before generating the
 	 * key.. */
-	data_left = sn->len-2;
+	int data_left = sn->len-2;
 	data_len = sn->data[1];
 	index = 2;
 
@@ -4818,7 +4817,6 @@ nsslowcert_FindTrustByIssuerAndSN(NSSLOWCERTCertDBHandle *handle,
     SECItem *issuer = &issuerAndSN->derIssuer;
     NSSLOWCERTTrust *trust;
     unsigned char keyBuf[512];
-    int data_left = sn->len-1;
     int data_len = sn->len;
     int index = 0;
     int len;
@@ -4829,7 +4827,7 @@ nsslowcert_FindTrustByIssuerAndSN(NSSLOWCERTCertDBHandle *handle,
     if ((sn->len >= 3) && (sn->data[0] == 0x2)) {
 	/* remove the der encoding of the serial number before generating the
 	 * key.. */
-	data_left = sn->len-2;
+	int data_left = sn->len-2;
 	data_len = sn->data[1];
 	index = 2;
 
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 1a0db7808dd..c3f1a03920e 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -25,11 +25,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.17.2" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.18" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
-#define SOFTOKEN_VMINOR   17
-#define SOFTOKEN_VPATCH   2
+#define SOFTOKEN_VMINOR   18
+#define SOFTOKEN_VPATCH   0
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 826bb11b673..c6d1e0e5f67 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -5116,7 +5116,6 @@ ssl3_SendClientHello(sslSocket *ss, PRBool resending)
 	    if (sid->u.ssl3.lock) { PR_RWLock_Unlock(sid->u.ssl3.lock); }
 	    return SECFailure;
 	}
-	maxBytes        -= extLen;
 	total_exten_len += extLen;
 
 	if (total_exten_len > 0)
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index f606a235c90..03bd6da9026 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.17.2"
+#define NSSUTIL_VERSION  "3.18 Beta"
 #define NSSUTIL_VMAJOR   3
-#define NSSUTIL_VMINOR   17
-#define NSSUTIL_VPATCH   2
+#define NSSUTIL_VMINOR   18
+#define NSSUTIL_VPATCH   0
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 SEC_BEGIN_PROTOS
 

From 05f31efcce0e53cee94e3aab9ecab0227efeafa2 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Fri, 24 Oct 2014 18:24:33 -0400
Subject: [PATCH 06/37] Bug 1087104 - Implement partial mar generation in make
 for 'mach build'; r=glandium

---
 build/gen_mach_buildprops.py       | 17 ++++++++++++-----
 build/moz-automation.mk            |  2 +-
 tools/update-packaging/Makefile.in | 28 +++++++++++++++++++++++++---
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/build/gen_mach_buildprops.py b/build/gen_mach_buildprops.py
index 0402cf11558..7ea2e8c8efb 100644
--- a/build/gen_mach_buildprops.py
+++ b/build/gen_mach_buildprops.py
@@ -29,14 +29,15 @@ def getFileHashAndSize(filename):
 
     return (sha512Hash, size)
 
-def getMarProperties(filename):
+def getMarProperties(filename, partial=False):
     if not os.path.exists(filename):
         return {}
-    (complete_mar_hash, complete_mar_size) = getFileHashAndSize(filename)
+    (mar_hash, mar_size) = getFileHashAndSize(filename)
+    martype = 'partial' if partial else 'complete'
     return {
-        'completeMarFilename': os.path.basename(filename),
-        'completeMarSize': complete_mar_size,
-        'completeMarHash': complete_mar_hash,
+        '%sMarFilename' % martype: os.path.basename(filename),
+        '%sMarSize' % martype: mar_size,
+        '%sMarHash' % martype: mar_hash,
     }
 
 def getUrlProperties(filename):
@@ -52,6 +53,7 @@ def getUrlProperties(filename):
         ('robocopApkUrl', lambda m: m.endswith('apk') and 'robocop' in m),
         ('jsshellUrl', lambda m: 'jsshell-' in m and m.endswith('.zip')),
         ('completeMarUrl', lambda m: m.endswith('.complete.mar')),
+        ('partialMarUrl', lambda m: m.endswith('.mar') and '.partial.' in m),
         # packageUrl must be last!
         ('packageUrl', lambda m: True),
     ]
@@ -79,12 +81,17 @@ if __name__ == '__main__':
     parser.add_argument("--complete-mar-file", required=True,
                         action="store", dest="complete_mar_file",
                         help="Path to the complete MAR file, relative to the objdir.")
+    parser.add_argument("--partial-mar-file", required=False,
+                        action="store", dest="partial_mar_file",
+                        help="Path to the partial MAR file, relative to the objdir.")
     parser.add_argument("--upload-output", required=True,
                         action="store", dest="upload_output",
                         help="Path to the text output of 'make upload'")
     args = parser.parse_args()
 
     json_data = getMarProperties(args.complete_mar_file)
+    if args.partial_mar_file:
+        json_data.update(getMarProperties(args.partial_mar_file, partial=True))
     json_data.update(getUrlProperties(args.upload_output))
 
     with open('mach_build_properties.json', 'w') as outfile:
diff --git a/build/moz-automation.mk b/build/moz-automation.mk
index 9b044e2738e..d031effcb0d 100644
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -86,7 +86,7 @@ automation/l10n-check: automation/pretty-l10n-check
 automation/update-packaging: automation/pretty-update-packaging
 
 automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
-	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) --upload-output $(AUTOMATION_UPLOAD_OUTPUT)
+	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-output $(AUTOMATION_UPLOAD_OUTPUT)
 
 # We need the log from make upload to grep it for urls in order to set
 # properties.
diff --git a/tools/update-packaging/Makefile.in b/tools/update-packaging/Makefile.in
index 69dda373750..0013a48e66e 100644
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -31,7 +31,7 @@ MAR_BIN	= $(LIBXUL_DIST)/host/bin/mar$(HOST_BIN_SUFFIX)
 MBSDIFF_BIN	= $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX)
 
 OVERRIDE_DEFAULT_GOAL := full-update
-full-update:: complete-patch
+full-update:: complete-patch $(if $(MOZ_AUTOMATION_UPDATE_PACKAGING),automation-partial-patch)
 
 ifeq ($(OS_TARGET), WINNT)
 MOZ_PKG_FORMAT	:= SFX7Z
@@ -61,10 +61,10 @@ ifeq ($(OS_TARGET), WINNT)
 endif
 	MAR=$(MAR_BIN) \
 	  $(srcdir)/make_full_update.sh \
-	  '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar' \
+	  '$(DIST)/$(COMPLETE_MAR)' \
 	  '$(PACKAGE_DIR)'
 ifdef MOZ_SIGN_CMD
-	$(MOZ_SIGN_CMD) -f mar '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).complete.mar'
+	$(MOZ_SIGN_CMD) -f mar '$(DIST)/$(COMPLETE_MAR)'
 endif
 
 partial-patch:: $(dir-stage)
@@ -77,3 +77,25 @@ partial-patch:: $(dir-stage)
 ifdef MOZ_SIGN_CMD
 	$(MOZ_SIGN_CMD) -f mar '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar'
 endif
+
+automation-partial-patch: complete-patch
+	rm -rf current current.work previous
+	mkdir current previous
+	latestmar=$$(ssh -l $(UPLOAD_USER) -i $(UPLOAD_SSH_KEY) $(UPLOAD_HOST) 'ls -1t $(LATEST_MAR_DIR) | grep $(MOZ_PKG_PLATFORM).complete.mar$$ | head -n 1'); \
+	  if test -n "$$latestmar"; then \
+	    wget -O $(STAGE_DIR)/previous.mar http://$(UPLOAD_HOST)/$(LATEST_MAR_DIR)/$$latestmar && \
+	    (cd previous; \
+	      MAR=$(MAR_BIN) perl $(topsrcdir)/tools/update-packaging/unwrap_full_update.pl '../$(STAGE_DIR)/previous.mar') && \
+	    (cd current; \
+	      MAR=$(MAR_BIN) perl $(topsrcdir)/tools/update-packaging/unwrap_full_update.pl '../$(DIST)/$(COMPLETE_MAR)') && \
+	    find current -name \*.pgc -print -delete && \
+	    find previous -name \*.pgc -print -delete && \
+	    rm -f $(STAGE_DIR)/*.partial.*.mar && \
+	    SRC_BUILD_ID=$$(python $(topsrcdir)/config/printconfigsetting.py $$(find previous -maxdepth 4 -type f -name application.ini) App BuildID) \
+	    DST_BUILD_ID=$$(cat $(DEPTH)/config/buildid) \
+	    SRC_BUILD=previous DST_BUILD=current \
+	      $(MAKE) partial-patch && \
+	    rm -f $(STAGE_DIR)/previous.mar; \
+	  else \
+	    echo "No previous MAR found; not creating a partial MAR"; \
+	  fi

From 109a20e4e7434b871c9939c76c12c1ad93afe0c3 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Tue, 21 Oct 2014 14:35:41 -0400
Subject: [PATCH 07/37] bug 1024730 - nsIHttpPushListener r=hurley

co-author: ben brittain <ben@brittain.org>
---
 netwerk/base/public/moz.build                 |  1 +
 netwerk/base/public/nsIHttpPushListener.idl   | 36 +++++++
 netwerk/build/nsNetCID.h                      | 12 +++
 netwerk/protocol/http/ASpdySession.cpp        | 15 ++-
 netwerk/protocol/http/Http2Push.cpp           | 99 ++++++++++++++++++-
 netwerk/protocol/http/Http2Push.h             | 27 ++++-
 netwerk/protocol/http/Http2Session.cpp        | 75 ++++++++------
 netwerk/protocol/http/Http2Stream.cpp         | 55 +++++++++--
 netwerk/protocol/http/Http2Stream.h           | 10 +-
 netwerk/protocol/http/nsHttp.h                |  3 +
 netwerk/protocol/http/nsHttpChannel.cpp       | 95 ++++++++++++++++++
 netwerk/protocol/http/nsHttpChannel.h         | 18 ++++
 netwerk/protocol/http/nsHttpConnectionMgr.cpp | 11 ++-
 netwerk/protocol/http/nsHttpHeaderArray.cpp   | 19 ++++
 netwerk/protocol/http/nsHttpHeaderArray.h     |  2 +
 netwerk/protocol/http/nsHttpRequestHead.h     |  1 +
 netwerk/protocol/http/nsHttpTransaction.cpp   |  9 +-
 netwerk/protocol/http/nsHttpTransaction.h     | 15 ++-
 netwerk/test/unit/test_http2.js               | 83 ++++++++++++++++
 testing/xpcshell/moz-http2/moz-http2.js       | 50 +++++++++-
 20 files changed, 579 insertions(+), 57 deletions(-)
 create mode 100644 netwerk/base/public/nsIHttpPushListener.idl

diff --git a/netwerk/base/public/moz.build b/netwerk/base/public/moz.build
index 632c2f16035..6f37f583b10 100644
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -43,6 +43,7 @@ XPIDL_SOURCES += [
     'nsIFileStreams.idl',
     'nsIFileURL.idl',
     'nsIForcePendingChannel.idl',
+    'nsIHttpPushListener.idl',
     'nsIIncrementalDownload.idl',
     'nsIInputStreamChannel.idl',
     'nsIInputStreamPump.idl',
diff --git a/netwerk/base/public/nsIHttpPushListener.idl b/netwerk/base/public/nsIHttpPushListener.idl
new file mode 100644
index 00000000000..f44605c0006
--- /dev/null
+++ b/netwerk/base/public/nsIHttpPushListener.idl
@@ -0,0 +1,36 @@
+/* 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/. */
+
+#include "nsISupports.idl"
+interface nsIHttpChannel;
+
+/**
+ * nsIHttpPushListener
+ *
+ * Used for triggering when a HTTP/2 push is received.
+ *
+ */
+[scriptable, uuid(0d6ce59c-ad5d-4520-b4d3-09664868f279)]
+interface nsIHttpPushListener : nsISupports
+{
+  /**
+   * When provided as a notificationCallback to an httpChannel, this.onPush()
+   * will be invoked when there is a >= Http2 push to that
+   * channel. The push may be in progress.
+   *
+   * The consumer must start the new channel in the usual way by calling
+   * pushChannel.AsyncOpen with a nsIStreamListener object that
+   * will receive the normal sequence of OnStartRequest(),
+   * 0 to N OnDataAvailable(), and onStopRequest().
+   *
+   * The new channel can be canceled after the AsyncOpen if it is not wanted.
+   *
+   * @param associatedChannel
+   *        the monitor channel that was recieved on
+   * @param pushChannel
+   *        a channel to the resource which is being pushed
+   */
+  void onPush(in nsIHttpChannel associatedChannel,
+              in nsIHttpChannel pushChannel);
+};
diff --git a/netwerk/build/nsNetCID.h b/netwerk/build/nsNetCID.h
index 4117a99a356..ac39fb8e816 100644
--- a/netwerk/build/nsNetCID.h
+++ b/netwerk/build/nsNetCID.h
@@ -579,6 +579,18 @@
     {0xb5, 0x27, 0x8a, 0x64, 0x30, 0x56, 0xab, 0xbd} \
 }
 
+// component implementing nsIHttpPushListener.
+#define NS_HTTPPUSHLISTENER_CONTRACTID \
+    "@mozilla.org/network/push-listener;1"
+#define NS_HTTPPUSHLISTENER_CID                      \
+{                                                    \
+    0x73cf4430,                                      \
+    0x5877,                                          \
+    0x4c6b,                                          \
+    {0xb8, 0x78, 0x3e, 0xde, 0x5b, 0xc8, 0xef, 0xf1} \
+}
+
+
 #define NS_HTTPACTIVITYDISTRIBUTOR_CONTRACTID \
     "@mozilla.org/network/http-activity-distributor;1"
 #define NS_HTTPACTIVITYDISTRIBUTOR_CID \
diff --git a/netwerk/protocol/http/ASpdySession.cpp b/netwerk/protocol/http/ASpdySession.cpp
index e6d3cf9e7d8..9997c5eb210 100644
--- a/netwerk/protocol/http/ASpdySession.cpp
+++ b/netwerk/protocol/http/ASpdySession.cpp
@@ -147,8 +147,11 @@ SpdyPushCache::RegisterPushedStreamSpdy3(nsCString key,
 {
   LOG3(("SpdyPushCache::RegisterPushedStreamSpdy3 %s 0x%X\n",
         key.get(), stream->StreamID()));
-  if(mHashSpdy3.Get(key))
+  if(mHashSpdy3.Get(key)) {
+    LOG3(("SpdyPushCache::RegisterPushedStreamSpdy3 %s 0x%X duplicate key\n",
+          key.get(), stream->StreamID()));
     return false;
+  }
   mHashSpdy3.Put(key, stream);
   return true;
 }
@@ -170,8 +173,11 @@ SpdyPushCache::RegisterPushedStreamSpdy31(nsCString key,
 {
   LOG3(("SpdyPushCache::RegisterPushedStreamSpdy31 %s 0x%X\n",
         key.get(), stream->StreamID()));
-  if(mHashSpdy31.Get(key))
+  if(mHashSpdy31.Get(key)) {
+    LOG3(("SpdyPushCache::RegisterPushedStreamSpdy31 %s 0x%X duplicate key\n",
+          key.get(), stream->StreamID()));
     return false;
+  }
   mHashSpdy31.Put(key, stream);
   return true;
 }
@@ -193,8 +199,11 @@ SpdyPushCache::RegisterPushedStreamHttp2(nsCString key,
 {
   LOG3(("SpdyPushCache::RegisterPushedStreamHttp2 %s 0x%X\n",
         key.get(), stream->StreamID()));
-  if(mHashHttp2.Get(key))
+  if(mHashHttp2.Get(key)) {
+    LOG3(("SpdyPushCache::RegisterPushedStreamHttp2 %s 0x%X duplicate key\n",
+          key.get(), stream->StreamID()));
     return false;
+  }
   mHashHttp2.Put(key, stream);
   return true;
 }
diff --git a/netwerk/protocol/http/Http2Push.cpp b/netwerk/protocol/http/Http2Push.cpp
index 71100e7057c..864e89d165b 100644
--- a/netwerk/protocol/http/Http2Push.cpp
+++ b/netwerk/protocol/http/Http2Push.cpp
@@ -16,12 +16,45 @@
 #include <algorithm>
 
 #include "Http2Push.h"
-
-#include "nsDependentString.h"
+#include "nsHttpChannel.h"
+#include "nsIHttpPushListener.h"
+#include "nsString.h"
 
 namespace mozilla {
 namespace net {
 
+class CallChannelOnPush MOZ_FINAL : public nsRunnable {
+  public:
+  CallChannelOnPush(nsIHttpChannelInternal *associatedChannel,
+                    const nsACString &pushedURI,
+                    Http2PushedStream *pushStream)
+    : mAssociatedChannel(associatedChannel)
+    , mPushedURI(pushedURI)
+    , mPushedStream(pushStream)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    nsRefPtr<nsHttpChannel> channel;
+    CallQueryInterface(mAssociatedChannel, channel.StartAssignment());
+    MOZ_ASSERT(channel);
+    if (channel && NS_SUCCEEDED(channel->OnPush(mPushedURI, mPushedStream))) {
+      return NS_OK;
+    }
+
+    LOG3(("Http2PushedStream Orphan %p failed OnPush\n", this));
+    mPushedStream->OnPushFailed();
+    return NS_OK;
+  }
+
+private:
+  nsCOMPtr<nsIHttpChannelInternal> mAssociatedChannel;
+  const nsCString mPushedURI;
+  Http2PushedStream *mPushedStream;
+};
+
 //////////////////////////////////////////
 // Http2PushedStream
 //////////////////////////////////////////
@@ -32,10 +65,13 @@ Http2PushedStream::Http2PushedStream(Http2PushTransactionBuffer *aTransaction,
                                      uint32_t aID)
   :Http2Stream(aTransaction, aSession, 0)
   , mConsumerStream(nullptr)
+  , mAssociatedTransaction(aAssociatedStream->Transaction())
   , mBufferedPush(aTransaction)
   , mStatus(NS_OK)
   , mPushCompleted(false)
   , mDeferCleanupOnSuccess(true)
+  , mDeferCleanupOnPush(false)
+  , mOnPushFailed(false)
 {
   LOG3(("Http2PushedStream ctor this=%p 0x%X\n", this, aID));
   mStreamID = aID;
@@ -70,6 +106,51 @@ Http2PushedStream::WriteSegments(nsAHttpSegmentWriter *writer,
   return rv;
 }
 
+bool
+Http2PushedStream::DeferCleanup(nsresult status)
+{
+  LOG3(("Http2PushedStream::DeferCleanup Query %p %x\n", this, status));
+
+  if (NS_SUCCEEDED(status) && mDeferCleanupOnSuccess) {
+    LOG3(("Http2PushedStream::DeferCleanup %p %x defer on success\n", this, status));
+    return true;
+  }
+  if (mDeferCleanupOnPush) {
+    LOG3(("Http2PushedStream::DeferCleanup %p %x defer onPush ref\n", this, status));
+    return true;
+  }
+  if (mConsumerStream) {
+    LOG3(("Http2PushedStream::DeferCleanup %p %x defer active consumer\n", this, status));
+    return true;
+  }
+  LOG3(("Http2PushedStream::DeferCleanup Query %p %x not deferred\n", this, status));
+  return false;
+}
+
+// return true if channel implements nsIHttpPushListener
+bool
+Http2PushedStream::TryOnPush()
+{
+  nsHttpTransaction *trans = mAssociatedTransaction->QueryHttpTransaction();
+  if (!trans) {
+    return false;
+  }
+
+  nsCOMPtr<nsIHttpChannelInternal> associatedChannel = do_QueryInterface(trans->HttpChannel());
+  if (!associatedChannel) {
+    return false;
+  }
+
+  if (!(trans->Caps() & NS_HTTP_ONPUSH_LISTENER)) {
+    return false;
+  }
+
+  mDeferCleanupOnPush = true;
+  nsCString uri = Origin() + Path();
+  NS_DispatchToMainThread(new CallChannelOnPush(associatedChannel, uri, this));
+  return true;
+}
+
 nsresult
 Http2PushedStream::ReadSegments(nsAHttpSegmentReader *,
                                 uint32_t, uint32_t *count)
@@ -91,6 +172,13 @@ Http2PushedStream::ReadSegments(nsAHttpSegmentReader *,
   return NS_OK;
 }
 
+void
+Http2PushedStream::SetConsumerStream(Http2Stream *consumer)
+{
+  mConsumerStream = consumer;
+  mDeferCleanupOnPush = false;
+}
+
 bool
 Http2PushedStream::GetHashKey(nsCString &key)
 {
@@ -115,8 +203,13 @@ Http2PushedStream::IsOrphaned(TimeStamp now)
   // if session is not transmitting, and is also not connected to a consumer
   // stream, and its been like that for too long then it is oprhaned
 
-  if (mConsumerStream)
+  if (mConsumerStream || mDeferCleanupOnPush) {
     return false;
+  }
+
+  if (mOnPushFailed) {
+    return true;
+  }
 
   bool rv = ((now - mLastRead).ToSeconds() > 30.0);
   if (rv) {
diff --git a/netwerk/protocol/http/Http2Push.h b/netwerk/protocol/http/Http2Push.h
index 787f8d1ee6c..42ddab72f43 100644
--- a/netwerk/protocol/http/Http2Push.h
+++ b/netwerk/protocol/http/Http2Push.h
@@ -31,8 +31,11 @@ public:
   virtual ~Http2PushedStream() {}
 
   bool GetPushComplete();
-  Http2Stream *GetConsumerStream() { return mConsumerStream; };
-  void SetConsumerStream(Http2Stream *aStream) { mConsumerStream = aStream; }
+
+  // The consumer stream is the synthetic pull stream hooked up to this push
+  virtual Http2Stream *GetConsumerStream() MOZ_OVERRIDE { return mConsumerStream; };
+
+  void SetConsumerStream(Http2Stream *aStream);
   bool GetHashKey(nsCString &key);
 
   // override of Http2Stream
@@ -42,16 +45,21 @@ public:
   nsILoadGroupConnectionInfo *LoadGroupConnectionInfo() { return mLoadGroupCI; };
   void ConnectPushedStream(Http2Stream *consumer);
 
-  bool DeferCleanupOnSuccess() { return mDeferCleanupOnSuccess; }
+  bool TryOnPush();
+
+  virtual bool DeferCleanup(nsresult status) MOZ_OVERRIDE;
   void SetDeferCleanupOnSuccess(bool val) { mDeferCleanupOnSuccess = val; }
 
   bool IsOrphaned(TimeStamp now);
+  void OnPushFailed() { mDeferCleanupOnPush = false; mOnPushFailed = true; }
 
   nsresult GetBufferedData(char *buf, uint32_t count, uint32_t *countWritten);
 
   // overload of Http2Stream
   virtual bool HasSink() { return !!mConsumerStream; }
 
+  nsCString &GetRequestString() { return mRequestString; }
+
 private:
 
   Http2Stream *mConsumerStream; // paired request stream that consumes from
@@ -59,6 +67,8 @@ private:
 
   nsCOMPtr<nsILoadGroupConnectionInfo> mLoadGroupCI;
 
+  nsAHttpTransaction *mAssociatedTransaction;
+
   Http2PushTransactionBuffer *mBufferedPush;
   mozilla::TimeStamp mLastRead;
 
@@ -66,6 +76,17 @@ private:
   nsresult mStatus;
   bool mPushCompleted; // server push FIN received
   bool mDeferCleanupOnSuccess;
+
+  // mDeferCleanupOnPush prevents Http2Session::CleanupStream() from
+  // destroying the push stream on an error code during the period between
+  // when we need to do OnPush() on another thread and the time it takes
+  // for that event to create a synthetic pull stream attached to this
+  // object. That synthetic pull will become mConsuemerStream.
+  // Ths is essentially a delete protecting reference.
+  bool mDeferCleanupOnPush;
+  bool mOnPushFailed;
+  nsCString mRequestString;
+
 };
 
 class Http2PushTransactionBuffer MOZ_FINAL : public nsAHttpTransaction
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
index 1f9f60e595b..dbba57b12ce 100644
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -833,7 +833,7 @@ Http2Session::SendHello()
   }
 
   // Advertise the Push RWIN for the session, and on each new pull stream
-  // send a window update with END_FLOW_CONTROL
+  // send a window update
   CopyAsNetwork16(packet + kFrameHeaderBytes + (6 * numberOfEntries), SETTINGS_TYPE_INITIAL_WINDOW);
   CopyAsNetwork32(packet + kFrameHeaderBytes + (6 * numberOfEntries) + 2, mPushAllowance);
   numberOfEntries++;
@@ -942,9 +942,7 @@ Http2Session::CleanupStream(Http2Stream *aStream, nsresult aResult,
     return;
   }
 
-  Http2PushedStream *pushSource = nullptr;
-
-  if (NS_SUCCEEDED(aResult) && aStream->DeferCleanupOnSuccess()) {
+  if (aStream->DeferCleanup(aResult)) {
     LOG3(("Http2Session::CleanupStream 0x%X deferred\n", aStream->StreamID()));
     return;
   }
@@ -954,11 +952,17 @@ Http2Session::CleanupStream(Http2Stream *aStream, nsresult aResult,
     return;
   }
 
-  pushSource = aStream->PushSource();
+  Http2PushedStream *pushSource = aStream->PushSource();
+  if (pushSource) {
+    // aStream is a synthetic  attached to an even push
+    MOZ_ASSERT(pushSource->GetConsumerStream() == aStream);
+    MOZ_ASSERT(!aStream->StreamID());
+    MOZ_ASSERT(!(pushSource->StreamID() & 0x1));
+    pushSource->SetConsumerStream(nullptr);
+  }
 
   if (!aStream->RecvdFin() && !aStream->RecvdReset() && aStream->StreamID()) {
-    LOG3(("Stream had not processed recv FIN, sending RST code %X\n",
-          aResetCode));
+    LOG3(("Stream had not processed recv FIN, sending RST code %X\n", aResetCode));
     GenerateRstStream(aResetCode, aStream->StreamID());
   }
 
@@ -1577,8 +1581,24 @@ Http2Session::RecvPushPromise(Http2Session *self)
     new Http2PushTransactionBuffer();
   transactionBuffer->SetConnection(self);
   Http2PushedStream *pushedStream =
-    new Http2PushedStream(transactionBuffer, self,
-                                 associatedStream, promisedID);
+    new Http2PushedStream(transactionBuffer, self, associatedStream, promisedID);
+
+  self->mDecompressBuffer.Append(self->mInputFrameBuffer + kFrameHeaderBytes + paddingControlBytes + promiseLen,
+                                 self->mInputFrameDataSize - paddingControlBytes - promiseLen - paddingLength);
+
+  rv = pushedStream->ConvertPushHeaders(&self->mDecompressor,
+                                        self->mDecompressBuffer,
+                                        pushedStream->GetRequestString());
+
+  if (rv == NS_ERROR_NOT_IMPLEMENTED) {
+    LOG3(("Http2Session::PushPromise Semantics not Implemented\n"));
+    self->GenerateRstStream(REFUSED_STREAM_ERROR, promisedID);
+    delete pushedStream;
+    return NS_OK;
+  }
+
+  if (NS_FAILED(rv))
+    return rv;
 
   // Ownership of the pushed stream is by the transaction hash, just as it
   // is for a client initiated stream. Errors that aren't fatal to the
@@ -1587,22 +1607,6 @@ Http2Session::RecvPushPromise(Http2Session *self)
   self->mStreamTransactionHash.Put(transactionBuffer, pushedStream);
   self->mPushedStreams.AppendElement(pushedStream);
 
-  self->mDecompressBuffer.Append(self->mInputFrameBuffer + kFrameHeaderBytes + paddingControlBytes + promiseLen,
-                                 self->mInputFrameDataSize - paddingControlBytes - promiseLen - paddingLength);
-
-  nsAutoCString requestHeaders;
-  rv = pushedStream->ConvertPushHeaders(&self->mDecompressor,
-                                        self->mDecompressBuffer, requestHeaders);
-
-  if (rv == NS_ERROR_NOT_IMPLEMENTED) {
-    LOG3(("Http2Session::PushPromise Semantics not Implemented\n"));
-    self->GenerateRstStream(REFUSED_STREAM_ERROR, promisedID);
-    return NS_OK;
-  }
-
-  if (NS_FAILED(rv))
-    return rv;
-
   if (self->RegisterStreamID(pushedStream, promisedID) == kDeadStreamID) {
     LOG3(("Http2Session::RecvPushPromise registerstreamid failed\n"));
     self->mGoAwayReason = INTERNAL_ERROR;
@@ -1626,19 +1630,28 @@ Http2Session::RecvPushPromise(Http2Session *self)
   }
 
   if (!associatedStream->Origin().Equals(pushedStream->Origin())) {
-    LOG3(("Http2Session::RecvPushPromise pushed stream mismatched origin\n"));
+    LOG3(("Http2Session::RecvPushPromise %p pushed stream mismatched origin "
+          "associated origin %s .. pushed origin %s\n", self,
+          associatedStream->Origin().get(), pushedStream->Origin().get()));
     self->CleanupStream(pushedStream, NS_ERROR_FAILURE, REFUSED_STREAM_ERROR);
     self->ResetDownstreamState();
     return NS_OK;
   }
 
-  if (!cache->RegisterPushedStreamHttp2(key, pushedStream)) {
-    LOG3(("Http2Session::RecvPushPromise registerPushedStream Failed\n"));
-    self->CleanupStream(pushedStream, NS_ERROR_FAILURE, INTERNAL_ERROR);
-    self->ResetDownstreamState();
-    return NS_OK;
+  if (pushedStream->TryOnPush()) {
+    LOG3(("Http2Session::RecvPushPromise %p channel implements nsIHttpPushListener "
+          "stream %p will not be placed into session cache.\n", self, pushedStream));
+  } else {
+    LOG3(("Http2Session::RecvPushPromise %p place stream into session cache\n", self));
+    if (!cache->RegisterPushedStreamHttp2(key, pushedStream)) {
+      LOG3(("Http2Session::RecvPushPromise registerPushedStream Failed\n"));
+      self->CleanupStream(pushedStream, NS_ERROR_FAILURE, INTERNAL_ERROR);
+      self->ResetDownstreamState();
+      return NS_OK;
+    }
   }
 
+  pushedStream->SetHTTPState(Http2Stream::RESERVED_BY_REMOTE);
   static_assert(Http2Stream::kWorstPriority >= 0,
                 "kWorstPriority out of range");
   uint8_t priorityWeight = (nsISupportsPriority::PRIORITY_LOWEST + 1) -
diff --git a/netwerk/protocol/http/Http2Stream.cpp b/netwerk/protocol/http/Http2Stream.cpp
index 76b1ccd3945..da846238952 100644
--- a/netwerk/protocol/http/Http2Stream.cpp
+++ b/netwerk/protocol/http/Http2Stream.cpp
@@ -312,15 +312,32 @@ Http2Stream::ParseHttpRequestHeaders(const char *buf,
     // from :scheme, :authority, :path
     nsILoadGroupConnectionInfo *loadGroupCI = mTransaction->LoadGroupConnectionInfo();
     SpdyPushCache *cache = nullptr;
-    if (loadGroupCI)
+    if (loadGroupCI) {
       loadGroupCI->GetSpdyPushCache(&cache);
+    }
 
     Http2PushedStream *pushedStream = nullptr;
+
+    // If a push stream is attached to the transaction via onPush, match only with that
+    // one. This occurs when a push was made with in conjunction with a nsIHttpPushListener
+    nsHttpTransaction *trans = mTransaction->QueryHttpTransaction();
+    if (trans && (pushedStream = trans->TakePushedStream())) {
+      if (pushedStream->mSession == mSession) {
+        LOG3(("Pushed Stream match based on OnPush correlation %p", pushedStream));
+      } else {
+        LOG3(("Pushed Stream match failed due to stream mismatch %p %d %d\n", pushedStream,
+              pushedStream->mSession->Serial(), mSession->Serial()));
+        pushedStream->OnPushFailed();
+        pushedStream = nullptr;
+      }
+    }
+
     // we remove the pushedstream from the push cache so that
     // it will not be used for another GET. This does not destroy the
     // stream itself - that is done when the transactionhash is done with it.
-    if (cache)
-      pushedStream = cache->RemovePushedStreamHttp2(hashkey);
+    if (cache && !pushedStream){
+        pushedStream = cache->RemovePushedStreamHttp2(hashkey);
+    }
 
     LOG3(("Pushed Stream Lookup "
           "session=%p key=%s loadgroupci=%p cache=%p hit=%p\n",
@@ -569,6 +586,17 @@ Http2Stream::AdjustInitialWindow()
       return;
   }
 
+  if (stream->mState == RESERVED_BY_REMOTE) {
+    // h2-14 prevents sending a window update in this state
+    return;
+  }
+
+  MOZ_ASSERT(mClientReceiveWindow <= ASpdySession::kInitialRwin);
+  uint32_t bump = ASpdySession::kInitialRwin - mClientReceiveWindow;
+  if (!bump) { // nothing to do
+    return;
+  }
+
   uint8_t *packet = mTxInlineFrame.get() + mTxInlineFrameUsed;
   EnsureBuffer(mTxInlineFrame, mTxInlineFrameUsed + Http2Session::kFrameHeaderBytes + 4,
                mTxInlineFrameUsed, mTxInlineFrameSize);
@@ -578,8 +606,6 @@ Http2Stream::AdjustInitialWindow()
                               Http2Session::FRAME_TYPE_WINDOW_UPDATE,
                               0, stream->mStreamID);
 
-  MOZ_ASSERT(mClientReceiveWindow <= ASpdySession::kInitialRwin);
-  uint32_t bump = ASpdySession::kInitialRwin - mClientReceiveWindow;
   mClientReceiveWindow += bump;
   bump = PR_htonl(bump);
   memcpy(packet + Http2Session::kFrameHeaderBytes, &bump, 4);
@@ -835,7 +861,7 @@ Http2Stream::GenerateDataFrameHeader(uint32_t dataLength, bool lastFrame)
   mTxStreamFrameSize = dataLength;
 }
 
-// ConvertHeaders is used to convert the response headers
+// ConvertResponseHeaders is used to convert the response headers
 // into HTTP/1 format and report some telemetry
 nsresult
 Http2Stream::ConvertResponseHeaders(Http2Decompressor *decompressor,
@@ -851,14 +877,14 @@ Http2Stream::ConvertResponseHeaders(Http2Decompressor *decompressor,
                                     aHeadersIn.Length(),
                                     aHeadersOut, false);
   if (NS_FAILED(rv)) {
-    LOG3(("Http2Stream::ConvertHeaders %p decode Error\n", this));
+    LOG3(("Http2Stream::ConvertResponseHeaders %p decode Error\n", this));
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
   nsAutoCString statusString;
   decompressor->GetStatus(statusString);
   if (statusString.IsEmpty()) {
-    LOG3(("Http2Stream::ConvertHeaders %p Error - no status\n", this));
+    LOG3(("Http2Stream::ConvertResponseHeaders %p Error - no status\n", this));
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
@@ -873,7 +899,7 @@ Http2Stream::ConvertResponseHeaders(Http2Decompressor *decompressor,
 
   if (httpResponseCode == 101) {
     // 8.1.1 of h2 disallows 101.. throw PROTOCOL_ERROR on stream
-    LOG3(("Http2Stream::ConvertHeaders %p Error - status == 101\n", this));
+    LOG3(("Http2Stream::ConvertResponseHeaders %p Error - status == 101\n", this));
     return NS_ERROR_ILLEGAL_VALUE;
   }
 
@@ -901,7 +927,7 @@ Http2Stream::ConvertResponseHeaders(Http2Decompressor *decompressor,
   return NS_OK;
 }
 
-// ConvertHeaders is used to convert the response headers
+// ConvertPushHeaders is used to convert the pushed request headers
 // into HTTP/1 format and report some telemetry
 nsresult
 Http2Stream::ConvertPushHeaders(Http2Decompressor *decompressor,
@@ -909,6 +935,7 @@ Http2Stream::ConvertPushHeaders(Http2Decompressor *decompressor,
                                 nsACString &aHeadersOut)
 {
   aHeadersOut.Truncate();
+  aHeadersOut.SetCapacity(aHeadersIn.Length() + 512);
   nsresult rv =
     decompressor->DecodeHeaderBlock(reinterpret_cast<const uint8_t *>(aHeadersIn.BeginReading()),
                                     aHeadersIn.Length(),
@@ -955,6 +982,14 @@ Http2Stream::SetAllHeadersReceived()
     return;
   }
 
+  if (mState == RESERVED_BY_REMOTE) {
+    // pushed streams needs to wait until headers have
+    // arrived to open up their window
+    LOG3(("Http2Stream::SetAllHeadersReceived %p state OPEN from reserved\n", this));
+    mState = OPEN;
+    AdjustInitialWindow();
+  }
+
   mAllHeadersReceived = 1;
   if (mIsTunnel) {
     MapStreamToHttpConnection();
diff --git a/netwerk/protocol/http/Http2Stream.h b/netwerk/protocol/http/Http2Stream.h
index 6e393075a20..f13ecb35b8d 100644
--- a/netwerk/protocol/http/Http2Stream.h
+++ b/netwerk/protocol/http/Http2Stream.h
@@ -47,9 +47,15 @@ public:
 
   virtual nsresult ReadSegments(nsAHttpSegmentReader *,  uint32_t, uint32_t *);
   virtual nsresult WriteSegments(nsAHttpSegmentWriter *, uint32_t, uint32_t *);
-  virtual bool DeferCleanupOnSuccess() { return false; }
+  virtual bool DeferCleanup(nsresult status) { return false; }
+
+  // The consumer stream is the synthetic pull stream hooked up to this stream
+  // http2PushedStream overrides it
+  virtual Http2Stream *GetConsumerStream() { return nullptr; };
 
   const nsAFlatCString &Origin() const { return mOrigin; }
+  const nsAFlatCString &Host() const { return mHeaderHost; }
+  const nsAFlatCString &Path() const { return mHeaderPath; }
 
   bool RequestBlockedOnRead()
   {
@@ -125,6 +131,8 @@ public:
 
   virtual ~Http2Stream();
 
+  Http2Session *Session() { return mSession; }
+
 protected:
   static void CreatePushHashKey(const nsCString &scheme,
                                 const nsCString &hostHeader,
diff --git a/netwerk/protocol/http/nsHttp.h b/netwerk/protocol/http/nsHttp.h
index c05c4a1c92d..352ab9df225 100644
--- a/netwerk/protocol/http/nsHttp.h
+++ b/netwerk/protocol/http/nsHttp.h
@@ -86,6 +86,9 @@ typedef uint8_t nsHttpVersion;
 // weaker security profiles based on past history
 #define NS_HTTP_ALLOW_RSA_FALSESTART (1<<9)
 
+// This flag indicates the transaction should accept associated pushes
+#define NS_HTTP_ONPUSH_LISTENER      (1<<10)
+
 //-----------------------------------------------------------------------------
 // some default values
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 608e7062785..27e15ed8f2d 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -54,6 +54,7 @@
 #include "nsICacheEntryDescriptor.h"
 #include "nsICancelable.h"
 #include "nsIHttpChannelAuthProvider.h"
+#include "nsIHttpChannelInternal.h"
 #include "nsIHttpEventSink.h"
 #include "nsIPrompt.h"
 #include "nsInputStreamPump.h"
@@ -67,6 +68,7 @@
 #include "mozilla/Telemetry.h"
 #include "AlternateServices.h"
 #include "InterceptedChannel.h"
+#include "nsIHttpPushListener.h"
 
 namespace mozilla { namespace net {
 
@@ -232,6 +234,7 @@ nsHttpChannel::nsHttpChannel()
     , mConcurentCacheAccess(0)
     , mIsPartialRequest(0)
     , mHasAutoRedirectVetoNotifier(0)
+    , mPushedStream(nullptr)
     , mDidReval(false)
 {
     LOG(("Creating nsHttpChannel [this=%p]\n", this));
@@ -813,6 +816,20 @@ nsHttpChannel::SetupTransaction()
         mCaps |=  NS_HTTP_DISALLOW_SPDY;
     }
 
+    if (mPushedStream) {
+        mTransaction->SetPushedStream(mPushedStream);
+        mPushedStream = nullptr;
+    }
+
+    nsCOMPtr<nsIHttpPushListener> pushListener;
+    NS_QueryNotificationCallbacks(mCallbacks,
+                                  mLoadGroup,
+                                  NS_GET_IID(nsIHttpPushListener),
+                                  getter_AddRefs(pushListener));
+    if (pushListener) {
+        mCaps |= NS_HTTP_ONPUSH_LISTENER;
+    }
+
     nsCOMPtr<nsIAsyncInputStream> responseStream;
     rv = mTransaction->Init(mCaps, mConnectionInfo, &mRequestHead,
                             mUploadStream, mUploadStreamHasHeaders,
@@ -4593,6 +4610,12 @@ NS_INTERFACE_MAP_BEGIN(nsHttpChannel)
     NS_INTERFACE_MAP_ENTRY(nsIThreadRetargetableStreamListener)
     NS_INTERFACE_MAP_ENTRY(nsIDNSListener)
     NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
+    // we have no macro that covers this case.
+    if (aIID.Equals(NS_GET_IID(nsHttpChannel)) ) {
+        AddRef();
+        *aInstancePtr = this;
+        return NS_OK;
+    } else
 NS_INTERFACE_MAP_END_INHERITING(HttpBaseChannel)
 
 //-----------------------------------------------------------------------------
@@ -6484,4 +6507,76 @@ nsHttpChannel::AwaitingCacheCallbacks()
     return mCacheEntriesToWaitFor != 0;
 }
 
+void
+nsHttpChannel::SetPushedStream(Http2PushedStream *stream)
+{
+    MOZ_ASSERT(stream);
+    MOZ_ASSERT(!mPushedStream);
+    mPushedStream = stream;
+}
+
+nsresult
+nsHttpChannel::OnPush(const nsACString &url, Http2PushedStream *pushedStream)
+{
+    MOZ_ASSERT(NS_IsMainThread());
+    LOG(("nsHttpChannel::OnPush [this=%p]\n", this));
+
+    MOZ_ASSERT(mCaps & NS_HTTP_ONPUSH_LISTENER);
+    nsCOMPtr<nsIHttpPushListener> pushListener;
+    NS_QueryNotificationCallbacks(mCallbacks,
+                                  mLoadGroup,
+                                  NS_GET_IID(nsIHttpPushListener),
+                                  getter_AddRefs(pushListener));
+
+    MOZ_ASSERT(pushListener);
+    if (!pushListener) {
+        LOG(("nsHttpChannel::OnPush [this=%p] notification callbacks do not "
+             "implement nsIHttpPushListener\n", this));
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    nsCOMPtr<nsIURI> pushResource;
+    nsresult rv;
+
+    // Create a Channel for the Push Resource
+    rv = NS_NewURI(getter_AddRefs(pushResource), url);
+    if (NS_FAILED(rv)) {
+        return NS_ERROR_FAILURE;
+    }
+
+    nsCOMPtr<nsIIOService> ioService;
+    rv = gHttpHandler->GetIOService(getter_AddRefs(ioService));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIChannel> pushChannel;
+    rv = ioService->NewChannelFromURI(pushResource, getter_AddRefs(pushChannel));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIHttpChannel> pushHttpChannel = do_QueryInterface(pushChannel);
+    MOZ_ASSERT(pushHttpChannel);
+    if (!pushHttpChannel) {
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    nsRefPtr<nsHttpChannel> channel;
+    CallQueryInterface(pushHttpChannel, channel.StartAssignment());
+    MOZ_ASSERT(channel);
+    if (!channel) {
+        return NS_ERROR_UNEXPECTED;
+    }
+
+    // new channel needs mrqeuesthead and headers from pushedStream
+    channel->mRequestHead.ParseHeaderSet(
+        pushedStream->GetRequestString().BeginWriting());
+
+    channel->mLoadGroup = mLoadGroup;
+    channel->mLoadInfo = mLoadInfo;
+    channel->mCallbacks = mCallbacks;
+
+    // Link the pushed stream with the new channel and call listener
+    channel->SetPushedStream(pushedStream);
+    rv = pushListener->OnPush(this, pushHttpChannel);
+    return rv;
+}
+
 } } // namespace mozilla::net
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 33f915c35f2..6b8220eb53d 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -32,10 +32,20 @@ class nsISSLStatus;
 
 namespace mozilla { namespace net {
 
+class Http2PushedStream;
 //-----------------------------------------------------------------------------
 // nsHttpChannel
 //-----------------------------------------------------------------------------
 
+// Use to support QI nsIChannel to nsHttpChannel
+#define NS_HTTPCHANNEL_IID                         \
+{                                                  \
+  0x301bf95b,                                      \
+  0x7bb3,                                          \
+  0x4ae1,                                          \
+  {0xa9, 0x71, 0x40, 0xbc, 0xfa, 0x81, 0xde, 0x12} \
+}
+
 class nsHttpChannel MOZ_FINAL : public HttpBaseChannel
                               , public HttpAsyncAborter<nsHttpChannel>
                               , public nsIStreamListener
@@ -67,6 +77,7 @@ public:
     NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
     NS_DECL_NSITHREADRETARGETABLEREQUEST
     NS_DECL_NSIDNSLISTENER
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_HTTPCHANNEL_IID)
 
     // nsIHttpAuthenticableChannel. We can't use
     // NS_DECL_NSIHTTPAUTHENTICABLECHANNEL because it duplicates cancel() and
@@ -95,6 +106,8 @@ public:
                           uint32_t aProxyResolveFlags,
                           nsIURI *aProxyURI);
 
+    nsresult OnPush(const nsACString &uri, Http2PushedStream *pushedStream);
+
     // Methods HttpBaseChannel didn't implement for us or that we override.
     //
     // nsIRequest
@@ -345,6 +358,8 @@ private:
     nsresult OpenCacheInputStream(nsICacheEntry* cacheEntry, bool startBuffering,
                                   bool checkingAppCacheEntry);
 
+    void SetPushedStream(Http2PushedStream *stream);
+
 private:
     nsCOMPtr<nsISupports>             mSecurityInfo;
     nsCOMPtr<nsICancelable>           mProxyRequest;
@@ -438,6 +453,8 @@ private:
     // Needed for accurate DNS timing
     nsRefPtr<nsDNSPrefetch>           mDNSPrefetch;
 
+    Http2PushedStream                 *mPushedStream;
+
     nsresult WaitForRedirectCallback();
     void PushRedirectAsyncFunc(nsContinueRedirectionFunc func);
     void PopRedirectAsyncFunc(nsContinueRedirectionFunc func);
@@ -451,6 +468,7 @@ private: // cache telemetry
     bool mDidReval;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsHttpChannel, NS_HTTPCHANNEL_IID)
 } } // namespace mozilla::net
 
 #endif // nsHttpChannel_h__
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index 97c7cf18cac..df668af851d 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -1882,8 +1882,8 @@ nsHttpConnectionMgr::DispatchTransaction(nsConnectionEntry *ent,
     nsresult rv;
 
     LOG(("nsHttpConnectionMgr::DispatchTransaction "
-         "[ent-ci=%s trans=%p caps=%x conn=%p priority=%d]\n",
-         ent->mConnInfo->HashKey().get(), trans, caps, conn, priority));
+         "[ent-ci=%s %p trans=%p caps=%x conn=%p priority=%d]\n",
+         ent->mConnInfo->HashKey().get(), ent, trans, caps, conn, priority));
 
     // It is possible for a rate-paced transaction to be dispatched independent
     // of the token bucket when the amount of parallelization has changed or
@@ -2046,6 +2046,13 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans)
 
     trans->SetPendingTime();
 
+    Http2PushedStream *pushedStream = trans->GetPushedStream();
+    if (pushedStream) {
+        return pushedStream->Session()->
+            AddStream(trans, trans->Priority(), false, nullptr) ?
+            NS_OK : NS_ERROR_UNEXPECTED;
+    }
+
     nsresult rv = NS_OK;
     nsHttpConnectionInfo *ci = trans->ConnectionInfo();
     MOZ_ASSERT(ci);
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.cpp b/netwerk/protocol/http/nsHttpHeaderArray.cpp
index f29d1ed920d..f51fc14b903 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.cpp
+++ b/netwerk/protocol/http/nsHttpHeaderArray.cpp
@@ -184,6 +184,25 @@ nsHttpHeaderArray::ParseHeaderLine(const char *line,
     return SetHeaderFromNet(atom, nsDependentCString(p, p2 - p));
 }
 
+void
+nsHttpHeaderArray::ParseHeaderSet(char *buffer)
+{
+    nsHttpAtom hdr;
+    char *val;
+    while (buffer) {
+        char *eof = strchr(buffer, '\r');
+        if (!eof) {
+            break;
+        }
+        *eof = '\0';
+        ParseHeaderLine(buffer, &hdr, &val);
+        buffer = eof + 1;
+        if (*buffer == '\n') {
+            buffer++;
+        }
+    }
+}
+
 void
 nsHttpHeaderArray::Flatten(nsACString &buf, bool pruneProxyHeaders)
 {
diff --git a/netwerk/protocol/http/nsHttpHeaderArray.h b/netwerk/protocol/http/nsHttpHeaderArray.h
index 8b3ae29b3d9..0aefb8bb420 100644
--- a/netwerk/protocol/http/nsHttpHeaderArray.h
+++ b/netwerk/protocol/http/nsHttpHeaderArray.h
@@ -54,6 +54,8 @@ public:
 
     void Flatten(nsACString &, bool pruneProxyHeaders=false);
 
+    void ParseHeaderSet(char *buffer);
+
     uint32_t Count() const { return mHeaders.Length(); }
 
     const char *PeekHeaderAt(uint32_t i, nsHttpAtom &header) const;
diff --git a/netwerk/protocol/http/nsHttpRequestHead.h b/netwerk/protocol/http/nsHttpRequestHead.h
index 5d9c0ce60ee..5be6f626cf9 100644
--- a/netwerk/protocol/http/nsHttpRequestHead.h
+++ b/netwerk/protocol/http/nsHttpRequestHead.h
@@ -93,6 +93,7 @@ public:
     bool IsHead() const { return EqualsMethod(kMethod_Head); }
     bool IsPut() const { return EqualsMethod(kMethod_Put); }
     bool IsTrace() const { return EqualsMethod(kMethod_Trace); }
+    void ParseHeaderSet(char *buffer) { mHeaders.ParseHeaderSet(buffer); }
 
 private:
     // All members must be copy-constructable and assignable
diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
index 6065b8f1560..98ee72584e5 100644
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -96,6 +96,7 @@ nsHttpTransaction::nsHttpTransaction()
     , mContentLength(-1)
     , mContentRead(0)
     , mInvalidResponseBytesRead(0)
+    , mPushedStream(nullptr)
     , mChunkedDecoder(nullptr)
     , mStatus(NS_OK)
     , mPriority(0)
@@ -143,6 +144,11 @@ nsHttpTransaction::~nsHttpTransaction()
 {
     LOG(("Destroying nsHttpTransaction @%p\n", this));
 
+    if (mPushedStream) {
+        mPushedStream->OnPushFailed();
+        mPushedStream = nullptr;
+    }
+
     if (mTokenBucketCancel) {
         mTokenBucketCancel->Cancel(NS_ERROR_ABORT);
         mTokenBucketCancel = nullptr;
@@ -225,7 +231,6 @@ nsHttpTransaction::Init(uint32_t caps,
     if (NS_SUCCEEDED(rv) && activityDistributorActive) {
         // there are some observers registered at activity distributor, gather
         // nsISupports for the channel that called Init()
-        mChannel = do_QueryInterface(eventsink);
         LOG(("nsHttpTransaction::Init() " \
              "mActivityDistributor is active " \
              "this=%p", this));
@@ -234,7 +239,7 @@ nsHttpTransaction::Init(uint32_t caps,
         activityDistributorActive = false;
         mActivityDistributor = nullptr;
     }
-
+    mChannel = do_QueryInterface(eventsink);
     nsCOMPtr<nsIChannel> channel = do_QueryInterface(eventsink);
     if (channel) {
         bool isInBrowser;
diff --git a/netwerk/protocol/http/nsHttpTransaction.h b/netwerk/protocol/http/nsHttpTransaction.h
index 6cae916d4b3..83b0f5b38a6 100644
--- a/netwerk/protocol/http/nsHttpTransaction.h
+++ b/netwerk/protocol/http/nsHttpTransaction.h
@@ -15,6 +15,7 @@
 #include "nsILoadGroup.h"
 #include "nsIInterfaceRequestor.h"
 #include "TimingStruct.h"
+#include "Http2Push.h"
 
 #ifdef MOZ_WIDGET_GONK
 #include "nsINetworkManager.h"
@@ -89,6 +90,7 @@ public:
     nsISupports           *SecurityInfo()   { return mSecurityInfo; }
 
     nsIEventTarget        *ConsumerTarget() { return mConsumerTarget; }
+    nsISupports           *HttpChannel()    { return mChannel; }
 
     void SetSecurityCallbacks(nsIInterfaceRequestor* aCallbacks);
 
@@ -137,6 +139,15 @@ public:
 
     nsHttpTransaction *QueryHttpTransaction() MOZ_OVERRIDE { return this; }
 
+    Http2PushedStream *GetPushedStream() { return mPushedStream; }
+    Http2PushedStream *TakePushedStream()
+    {
+        Http2PushedStream *r = mPushedStream;
+        mPushedStream = nullptr;
+        return r;
+    }
+    void SetPushedStream(Http2PushedStream *push) { mPushedStream = push; }
+
 private:
     friend class DeleteHttpTransaction;
     virtual ~nsHttpTransaction();
@@ -222,7 +233,9 @@ private:
     // so far been skipped.
     uint32_t                        mInvalidResponseBytesRead;
 
-    nsHttpChunkedDecoder           *mChunkedDecoder;
+    Http2PushedStream               *mPushedStream;
+
+    nsHttpChunkedDecoder            *mChunkedDecoder;
 
     TimingStruct                    mTimings;
 
diff --git a/netwerk/test/unit/test_http2.js b/netwerk/test/unit/test_http2.js
index a7e1a154a30..5cdca6155f7 100644
--- a/netwerk/test/unit/test_http2.js
+++ b/netwerk/test/unit/test_http2.js
@@ -393,6 +393,86 @@ function test_http2_altsvc() {
   chan.asyncOpen(altsvcClientListener, null);
 }
 
+var Http2PushApiListener = function() {};
+
+Http2PushApiListener.prototype = {
+  checksPending: 9, // 4 onDataAvailable and 5 onStop
+
+  getInterface: function(aIID) {
+    return this.QueryInterface(aIID);
+  },
+
+  QueryInterface: function(aIID) {
+    if (aIID.equals(Ci.nsIHttpPushListener) ||
+        aIID.equals(Ci.nsIStreamListener))
+      return this;
+    throw Components.results.NS_ERROR_NO_INTERFACE;
+  },
+
+  // nsIHttpPushListener
+  onPush: function onPush(associatedChannel, pushChannel) {
+    do_check_eq(associatedChannel.originalURI.spec, "https://localhost:6944/pushapi1");
+    do_check_eq (pushChannel.getRequestHeader("x-pushed-request"), "true");
+
+    pushChannel.asyncOpen(this, pushChannel);
+    if (pushChannel.originalURI.spec == "https://localhost:6944/pushapi1/2") {
+	pushChannel.cancel(Components.results.NS_ERROR_ABORT);
+    }
+  },
+
+ // normal Channel listeners
+  onStartRequest: function pushAPIOnStart(request, ctx) {
+  },
+
+  onDataAvailable: function pushAPIOnDataAvailable(request, ctx, stream, offset, cnt) {
+    do_check_neq(ctx.originalURI.spec, "https://localhost:6944/pushapi1/2");
+
+    var data = read_stream(stream, cnt);
+
+    if (ctx.originalURI.spec == "https://localhost:6944/pushapi1") {
+	do_check_eq(data[0], '0');
+	--this.checksPending;
+    } else if (ctx.originalURI.spec == "https://localhost:6944/pushapi1/1") {
+	do_check_eq(data[0], '1');
+	--this.checksPending; // twice
+    } else if (ctx.originalURI.spec == "https://localhost:6944/pushapi1/3") {
+	do_check_eq(data[0], '3');
+	--this.checksPending;
+    } else {
+	do_check_eq(true, false);
+    }
+  },
+
+  onStopRequest: function test_onStopR(request, ctx, status) {
+    if (ctx.originalURI.spec == "https://localhost:6944/pushapi1/2") {
+	do_check_eq(request.status, Components.results.NS_ERROR_ABORT);
+    } else {
+	do_check_eq(request.status, Components.results.NS_OK);
+    }
+
+    --this.checksPending; // 5 times - one for each push plus the pull
+    if (!this.checksPending) {
+	run_next_test();
+        do_test_finished();
+    }
+  }
+};
+
+// pushAPI testcase 1 expects
+// 1 to pull /pushapi1 with 0
+// 2 to see /pushapi1/1 with 1
+// 3 to see /pushapi1/1 with 1 (again)
+// 4 to see /pushapi1/2 that it will cancel
+// 5 to see /pushapi1/3 with 3
+
+function test_http2_pushapi_1() {
+  var chan = makeChan("https://localhost:6944/pushapi1");
+  chan.loadGroup = loadGroup;
+  var listener = new Http2PushApiListener();
+  chan.notificationCallbacks = listener;
+  chan.asyncOpen(listener, chan);
+}
+
 // hack - the header test resets the multiplex object on the server,
 // so make sure header is always run before the multiplex test.
 //
@@ -413,6 +493,7 @@ var tests = [ test_http2_post_big
             , test_http2_multiplex
             , test_http2_big
             , test_http2_post
+            , test_http2_pushapi_1
             ];
 var current_test = 0;
 
@@ -483,6 +564,8 @@ var spdy3pref;
 var spdypush;
 var http2pref;
 var tlspref;
+var altsvcpref1;
+var altsvcpref2;
 
 var loadGroup;
 
diff --git a/testing/xpcshell/moz-http2/moz-http2.js b/testing/xpcshell/moz-http2/moz-http2.js
index c817d2f220b..875d12d2e57 100644
--- a/testing/xpcshell/moz-http2/moz-http2.js
+++ b/testing/xpcshell/moz-http2/moz-http2.js
@@ -75,7 +75,7 @@ var m = {
 function handleRequest(req, res) {
   var u = url.parse(req.url);
   var content = getHttpContent(u.pathname);
-  var push;
+  var push, push1, push1a, push2, push3;
 
   if (req.httpVersionMajor === 2) {
     res.setHeader('X-Connection-Http2', 'yes');
@@ -151,6 +151,54 @@ function handleRequest(req, res) {
     content = '<head> <script src="push2.js"/></head>body text';
   }
 
+  else if (u.pathname === "/pushapi1") {
+    push1 = res.push(
+	{ hostname: 'localhost:6944', port: 6944, path : '/pushapi1/1', method : 'GET',
+	  headers: {'x-pushed-request': 'true', 'x-foo' : 'bar'}});
+    push1.writeHead(200, {
+      'pushed' : 'yes',
+      'content-length' : 1,
+      'subresource' : '1',
+      'X-Connection-Http2': 'yes'
+      });
+    push1.end('1');
+
+    push1a = res.push(
+	{ hostname: 'localhost:6944', port: 6944, path : '/pushapi1/1', method : 'GET',
+	  headers: {'x-foo' : 'bar', 'x-pushed-request': 'true'}});
+    push1a.writeHead(200, {
+      'pushed' : 'yes',
+      'content-length' : 1,
+      'subresource' : '1a',
+      'X-Connection-Http2': 'yes'
+      });
+    push1a.end('1');
+
+    push2 = res.push(
+	{ hostname: 'localhost:6944', port: 6944, path : '/pushapi1/2', method : 'GET',
+	  headers: {'x-pushed-request': 'true'}});
+    push2.writeHead(200, {
+	  'pushed' : 'yes',
+	  'subresource' : '2',
+	  'content-length' : 1,
+	  'X-Connection-Http2': 'yes'
+      });
+    push2.end('2');
+
+    push3 = res.push(
+	{ hostname: 'localhost:6944', port: 6944, path : '/pushapi1/3', method : 'GET',
+	  headers: {'x-pushed-request': 'true'}});
+    push3.writeHead(200, {
+	  'pushed' : 'yes',
+	  'content-length' : 1,
+	  'subresource' : '3',
+	  'X-Connection-Http2': 'yes'
+      });
+     push3.end('3');
+
+    content = '0';
+  }
+
   else if (u.pathname === "/big") {
     content = generateContent(128 * 1024);
     var hash = crypto.createHash('md5');

From d00ea5b9895401a6393d110a97df3c87d0a552e0 Mon Sep 17 00:00:00 2001
From: Brian Marshall <bmarsd@gmail.com>
Date: Thu, 16 Oct 2014 15:45:17 -0700
Subject: [PATCH 08/37] Bug 1074557 - Remove the lock in nsWindowMediator.
 r=Neil

---
 xpfe/appshell/nsWindowMediator.cpp | 52 ++++++++++++------------------
 xpfe/appshell/nsWindowMediator.h   |  3 --
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/xpfe/appshell/nsWindowMediator.cpp b/xpfe/appshell/nsWindowMediator.cpp
index 2d8f0baddc0..58cb387acec 100644
--- a/xpfe/appshell/nsWindowMediator.cpp
+++ b/xpfe/appshell/nsWindowMediator.cpp
@@ -53,8 +53,7 @@ nsWindowMediator::GetDOMWindow(nsIXULWindow* inWindow,
 
 nsWindowMediator::nsWindowMediator() :
   mEnumeratorList(), mOldestWindow(nullptr), mTopmostWindow(nullptr),
-  mTimeStamp(0), mSortingZOrder(false), mReady(false),
-  mListLock("nsWindowMediator.mListLock")
+  mTimeStamp(0), mSortingZOrder(false), mReady(false)
 {
 }
 
@@ -79,6 +78,7 @@ nsresult nsWindowMediator::Init()
 
 NS_IMETHODIMP nsWindowMediator::RegisterWindow(nsIXULWindow* inWindow)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_STATE(mReady);
 
   if (GetInfoFor(inWindow)) {
@@ -96,7 +96,6 @@ NS_IMETHODIMP nsWindowMediator::RegisterWindow(nsIXULWindow* inWindow)
   WindowTitleData winData = { inWindow, nullptr };
   mListeners.EnumerateForwards(notifyOpenWindow, &winData);
   
-  MutexAutoLock lock(mListLock);
   if (mOldestWindow)
     windowInfo->InsertAfter(mOldestWindow->mOlder, nullptr);
   else
@@ -108,8 +107,8 @@ NS_IMETHODIMP nsWindowMediator::RegisterWindow(nsIXULWindow* inWindow)
 NS_IMETHODIMP
 nsWindowMediator::UnregisterWindow(nsIXULWindow* inWindow)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
   nsWindowInfo *info = GetInfoFor(inWindow);
   if (info)
     return UnregisterWindow(info);
@@ -192,9 +191,10 @@ nsWindowMediator::GetInfoFor(nsIWidget *aWindow)
 NS_IMETHODIMP
 nsWindowMediator::GetEnumerator(const char16_t* inType, nsISimpleEnumerator** outEnumerator)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(outEnumerator);
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
+
   nsAppShellWindowEnumerator *enumerator = new nsASDOMWindowEarlyToLateEnumerator(inType, *this);
   if (enumerator)
     return enumerator->QueryInterface(NS_GET_IID(nsISimpleEnumerator) , (void**)outEnumerator);
@@ -205,9 +205,10 @@ nsWindowMediator::GetEnumerator(const char16_t* inType, nsISimpleEnumerator** ou
 NS_IMETHODIMP
 nsWindowMediator::GetXULWindowEnumerator(const char16_t* inType, nsISimpleEnumerator** outEnumerator)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(outEnumerator);
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
+
   nsAppShellWindowEnumerator *enumerator = new nsASXULWindowEarlyToLateEnumerator(inType, *this);
   if (enumerator)
     return enumerator->QueryInterface(NS_GET_IID(nsISimpleEnumerator) , (void**)outEnumerator);
@@ -220,9 +221,10 @@ nsWindowMediator::GetZOrderDOMWindowEnumerator(
             const char16_t *aWindowType, bool aFrontToBack,
             nsISimpleEnumerator **_retval)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(_retval);
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
+
   nsAppShellWindowEnumerator *enumerator;
   if (aFrontToBack)
     enumerator = new nsASDOMWindowFrontToBackEnumerator(aWindowType, *this);
@@ -239,9 +241,10 @@ nsWindowMediator::GetZOrderXULWindowEnumerator(
             const char16_t *aWindowType, bool aFrontToBack,
             nsISimpleEnumerator **_retval)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(_retval);
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
+
   nsAppShellWindowEnumerator *enumerator;
   if (aFrontToBack)
     enumerator = new nsASXULWindowFrontToBackEnumerator(aWindowType, *this);
@@ -270,6 +273,7 @@ nsWindowMediator::RemoveEnumerator(nsAppShellWindowEnumerator * inEnumerator)
 NS_IMETHODIMP
 nsWindowMediator::GetMostRecentWindow(const char16_t* inType, nsIDOMWindow** outWindow)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(outWindow);
   *outWindow = nullptr;
   if (!mReady)
@@ -277,10 +281,7 @@ nsWindowMediator::GetMostRecentWindow(const char16_t* inType, nsIDOMWindow** out
 
   // Find the most window with the highest time stamp that matches
   // the requested type
-
-  MutexAutoLock lock(mListLock);
   nsWindowInfo *info = MostRecentWindowInfo(inType);
-
   if (info && info->mWindow) {
     nsCOMPtr<nsIDOMWindow> DOMWindow;
     if (NS_SUCCEEDED(GetDOMWindow(info->mWindow, DOMWindow))) {  
@@ -356,8 +357,8 @@ nsWindowMediator::GetCurrentInnerWindowWithId(uint64_t aWindowID,
 NS_IMETHODIMP
 nsWindowMediator::UpdateWindowTimeStamp(nsIXULWindow* inWindow)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
   nsWindowInfo *info = GetInfoFor(inWindow);
   if (info) {
     // increment the window's time stamp
@@ -371,8 +372,8 @@ NS_IMETHODIMP
 nsWindowMediator::UpdateWindowTitle(nsIXULWindow* inWindow,
                                     const char16_t* inTitle)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
   if (GetInfoFor(inWindow)) {
     WindowTitleData winData = { inWindow, inTitle };
     mListeners.EnumerateForwards(notifyWindowTitleChange, &winData);
@@ -396,6 +397,7 @@ nsWindowMediator::CalculateZPosition(
                 nsIWidget     **outBelow,
                 bool           *outAltered)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_ARG_POINTER(outBelow);
   NS_ENSURE_STATE(mReady);
 
@@ -426,8 +428,6 @@ nsWindowMediator::CalculateZPosition(
   uint32_t inZ;
   GetZLevel(inWindow, &inZ);
 
-  MutexAutoLock lock(mListLock);
-
   if (inPosition == nsIWindowMediator::zLevelBelow) {
     // locate inBelow. use topmost if it can't be found or isn't in the
     // z-order list
@@ -526,6 +526,7 @@ nsWindowMediator::SetZPosition(
                 uint32_t      inPosition,
                 nsIXULWindow *inBelow)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   nsWindowInfo *inInfo,
                *belowInfo;
 
@@ -540,7 +541,6 @@ nsWindowMediator::SetZPosition(
     return NS_OK;
 
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
 
   /* Locate inWindow and unlink it from the z-order list.
      It's important we look for it in the age list, not the z-order list.
@@ -597,8 +597,8 @@ nsWindowMediator::GetZLevel(nsIXULWindow *aWindow, uint32_t *_retval)
 NS_IMETHODIMP
 nsWindowMediator::SetZLevel(nsIXULWindow *aWindow, uint32_t aZLevel)
 {
+  MOZ_RELEASE_ASSERT(NS_IsMainThread());
   NS_ENSURE_STATE(mReady);
-  MutexAutoLock lock(mListLock);
 
   nsWindowInfo *info = GetInfoFor(aWindow);
   NS_ASSERTION(info, "setting z level of unregistered window");
@@ -622,7 +622,7 @@ nsWindowMediator::SetZLevel(nsIXULWindow *aWindow, uint32_t aZLevel)
    has been changed, so one window is potentially out of place. Such a sort
    is most efficiently done in a particular direction. Use this one
    if a window's z level has just been reduced, so the sort is most efficiently
-   done front to back. Assumes caller has locked mListLock.
+   done front to back.
      Note it's hardly worth going to all the trouble to write two versions
    of this method except that if we choose the inefficient sorting direction,
    on slow systems windows could visibly bubble around the window that
@@ -777,19 +777,9 @@ nsWindowMediator::Observe(nsISupports* aSubject,
                           const char16_t* aData)
 {
   if (!strcmp(aTopic, "xpcom-shutdown") && mReady) {
-    // Unregistering a window may cause its destructor to run, causing it to
-    // call into the window mediator, try to acquire mListLock, and deadlock.
-    // Our solution is to hold strong refs to all windows until we release
-    // mListLock.
-    nsTArray<nsCOMPtr<nsIXULWindow> > windows;
-
-    {
-      MutexAutoLock lock(mListLock);
-      while (mOldestWindow) {
-        windows.AppendElement(mOldestWindow->mWindow);
-        UnregisterWindow(mOldestWindow);
-      }
-    }
+    MOZ_RELEASE_ASSERT(NS_IsMainThread());
+    while (mOldestWindow)
+      UnregisterWindow(mOldestWindow);
     mReady = false;
   }
   return NS_OK;
diff --git a/xpfe/appshell/nsWindowMediator.h b/xpfe/appshell/nsWindowMediator.h
index 35e4f809ae9..88f90a00ab4 100644
--- a/xpfe/appshell/nsWindowMediator.h
+++ b/xpfe/appshell/nsWindowMediator.h
@@ -6,7 +6,6 @@
 #ifndef nsWindowMediator_h_
 #define nsWindowMediator_h_
 
-#include "mozilla/Mutex.h"
 #include "nsCOMPtr.h"
 #include "nsIWindowMediator.h"
 #include "nsIObserver.h"
@@ -24,7 +23,6 @@ class nsASDOMWindowBackToFrontEnumerator;
 class nsASXULWindowBackToFrontEnumerator;
 class nsIWindowMediatorListener;
 struct nsWindowInfo;
-struct PRLock;
 
 class nsWindowMediator :
   public nsIWindowMediator,
@@ -71,7 +69,6 @@ private:
   int32_t       mTimeStamp;
   bool          mSortingZOrder;
   bool          mReady;
-  mozilla::Mutex mListLock;
 
   nsCOMArray<nsIWindowMediatorListener> mListeners;
 };

From c27ac198818bf965001269b716d2c968eebd9016 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Thu, 30 Jan 2014 03:56:36 -0500
Subject: [PATCH 09/37] bug 865314 - ssl parallelism to new host should not be
 1 r=hurley

---
 netwerk/base/public/nsISpeculativeConnect.idl |  9 +-
 netwerk/base/src/Predictor.cpp                |  7 --
 netwerk/protocol/http/AlternateServices.cpp   |  7 --
 .../protocol/http/ConnectionDiagnostics.cpp   |  4 +-
 netwerk/protocol/http/nsHttpConnection.cpp    |  2 +-
 netwerk/protocol/http/nsHttpConnectionMgr.cpp | 84 +++++++++++++------
 netwerk/protocol/http/nsHttpConnectionMgr.h   |  8 +-
 7 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/netwerk/base/public/nsISpeculativeConnect.idl b/netwerk/base/public/nsISpeculativeConnect.idl
index 4ef559d6337..7bf6ceb5d5d 100644
--- a/netwerk/base/public/nsISpeculativeConnect.idl
+++ b/netwerk/base/public/nsISpeculativeConnect.idl
@@ -35,7 +35,7 @@ interface nsISpeculativeConnect : nsISupports
  * inline) to determine whether or not to actually make a speculative
  * connection.
  */
-[builtinclass, uuid(f6a0d1e5-369f-4abc-81ae-d370d36e4006)]
+[builtinclass, uuid(1040ebe3-6ed1-45a6-8587-995e082518d7)]
 interface nsISpeculativeConnectionOverrider : nsISupports
 {
     /**
@@ -44,13 +44,6 @@ interface nsISpeculativeConnectionOverrider : nsISupports
      */
     [infallible] readonly attribute unsigned long parallelSpeculativeConnectLimit;
 
-    /**
-     * Used to loosen the restrictions nsHttpConnectionMgr::RestrictConnections
-     * to allow more speculative connections when we're unsure if a host will
-     * connect via SPDY or not.
-     */
-    [infallible] readonly attribute boolean ignorePossibleSpdyConnections;
-
     /**
      * Used to determine if we will ignore the existence of any currently idle
      * connections when we decide whether or not to make a speculative
diff --git a/netwerk/base/src/Predictor.cpp b/netwerk/base/src/Predictor.cpp
index e827bd5e875..4a4d277a390 100644
--- a/netwerk/base/src/Predictor.cpp
+++ b/netwerk/base/src/Predictor.cpp
@@ -373,13 +373,6 @@ Predictor::GetIgnoreIdle(bool *ignoreIdle)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-Predictor::GetIgnorePossibleSpdyConnections(bool *ignorePossibleSpdyConnections)
-{
-  *ignorePossibleSpdyConnections = true;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 Predictor::GetParallelSpeculativeConnectLimit(
     uint32_t *parallelSpeculativeConnectLimit)
diff --git a/netwerk/protocol/http/AlternateServices.cpp b/netwerk/protocol/http/AlternateServices.cpp
index 542568e9145..700cfb840d4 100644
--- a/netwerk/protocol/http/AlternateServices.cpp
+++ b/netwerk/protocol/http/AlternateServices.cpp
@@ -414,13 +414,6 @@ AltSvcOverride::GetIgnoreIdle(bool *ignoreIdle)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-AltSvcOverride::GetIgnorePossibleSpdyConnections(bool *ignorePossibleSpdyConnections)
-{
-  *ignorePossibleSpdyConnections = true;
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 AltSvcOverride::GetParallelSpeculativeConnectLimit(
   uint32_t *parallelSpeculativeConnectLimit)
diff --git a/netwerk/protocol/http/ConnectionDiagnostics.cpp b/netwerk/protocol/http/ConnectionDiagnostics.cpp
index 0c387e99cf5..3195a8dfbd3 100644
--- a/netwerk/protocol/http/ConnectionDiagnostics.cpp
+++ b/netwerk/protocol/http/ConnectionDiagnostics.cpp
@@ -73,8 +73,8 @@ nsHttpConnectionMgr::PrintDiagnosticsCB(const nsACString &key,
                               ent->mHalfOpens.Length());
   self->mLogData.AppendPrintf("   Coalescing Key = %s\n",
                               ent->mCoalescingKey.get());
-  self->mLogData.AppendPrintf("   Spdy using = %d, tested = %d, preferred = %d\n",
-                              ent->mUsingSpdy, ent->mTestedSpdy, ent->mSpdyPreferred);
+  self->mLogData.AppendPrintf("   Spdy using = %d, preferred = %d\n",
+                              ent->mUsingSpdy, ent->mSpdyPreferred);
   self->mLogData.AppendPrintf("   pipelinestate = %d penalty = %d\n",
                               ent->mPipelineState, ent->mPipeliningPenalty);
   for (i = 0; i < nsAHttpTransaction::CLASS_MAX; ++i) {
diff --git a/netwerk/protocol/http/nsHttpConnection.cpp b/netwerk/protocol/http/nsHttpConnection.cpp
index 1774df40d95..e40183be3e4 100644
--- a/netwerk/protocol/http/nsHttpConnection.cpp
+++ b/netwerk/protocol/http/nsHttpConnection.cpp
@@ -159,6 +159,7 @@ nsHttpConnection::StartSpdy(uint8_t spdyVersion)
 
     mUsingSpdyVersion = spdyVersion;
     mEverUsedSpdy = true;
+    mSpdySession = ASpdySession::NewSpdySession(spdyVersion, mSocketTransport);
 
     if (!mReportedSpdy) {
         mReportedSpdy = true;
@@ -209,7 +210,6 @@ nsHttpConnection::StartSpdy(uint8_t spdyVersion)
         mProxyConnectInProgress = false;
     }
 
-    mSpdySession = ASpdySession::NewSpdySession(spdyVersion, mSocketTransport);
     bool spdyProxy = mConnInfo->UsingHttpsProxy() && !mTLSFilter;
     if (spdyProxy) {
         nsRefPtr<nsHttpConnectionInfo> wildCardProxyCi;
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index df668af851d..08d9e12b0b5 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -380,7 +380,6 @@ public: // intentional!
     bool mOverridesOK;
     uint32_t mParallelSpeculativeConnectLimit;
     bool mIgnoreIdle;
-    bool mIgnorePossibleSpdyConnections;
     bool mIsFromPredictor;
     bool mAllow1918;
 
@@ -437,8 +436,6 @@ nsHttpConnectionMgr::SpeculativeConnect(nsHttpConnectionInfo *ci,
         overrider->GetParallelSpeculativeConnectLimit(
             &args->mParallelSpeculativeConnectLimit);
         overrider->GetIgnoreIdle(&args->mIgnoreIdle);
-        overrider->GetIgnorePossibleSpdyConnections(
-            &args->mIgnorePossibleSpdyConnections);
         overrider->GetIsFromPredictor(&args->mIsFromPredictor);
         overrider->GetAllow1918(&args->mAllow1918);
     }
@@ -655,8 +652,6 @@ nsHttpConnectionMgr::ReportSpdyConnection(nsHttpConnection *conn,
     if (!ent)
         return;
 
-    ent->mTestedSpdy = true;
-
     if (!usingSpdy)
         return;
 
@@ -677,11 +672,11 @@ nsHttpConnectionMgr::ReportSpdyConnection(nsHttpConnection *conn,
     nsConnectionEntry *preferred =
         mSpdyPreferredHash.Get(ent->mCoalescingKey);
 
-    LOG(("ReportSpdyConnection %s %s ent=%p preferred=%p\n",
-         ent->mConnInfo->Host(), ent->mCoalescingKey.get(),
-         ent, preferred));
+    LOG(("ReportSpdyConnection conn=%p %s %s ent=%p preferred=%p\n",conn,
+         ent->mConnInfo->Host(), ent->mCoalescingKey.get(), ent, preferred));
 
     if (!preferred) {
+        preferred = ent;
         if (!ent->mCoalescingKey.IsEmpty()) {
             mSpdyPreferredHash.Put(ent->mCoalescingKey, ent);
             ent->mSpdyPreferred = true;
@@ -696,8 +691,7 @@ nsHttpConnectionMgr::ReportSpdyConnection(nsHttpConnection *conn,
         // new transactions migrate over.
 
         LOG(("ReportSpdyConnection graceful close of conn=%p ent=%p to "
-                 "migrate to preferred\n", conn, ent));
-
+                 "migrate to preferred (desharding)\n", conn, ent));
         conn->DontReuse();
     } else if (preferred != ent) {
         LOG (("ReportSpdyConnection preferred host may be in false start or "
@@ -705,6 +699,52 @@ nsHttpConnectionMgr::ReportSpdyConnection(nsHttpConnection *conn,
               "abandon this connection yet."));
     }
 
+    if (preferred == ent) {
+        // this is a new spdy connection to the preferred entry
+        for (int32_t index = ent->mHalfOpens.Length() - 1;
+             (index >= 0) &&  conn->CanDirectlyActivate(); --index) {
+
+            // Abandon all other half-open sockets belonging to the given transaction.
+            // While activating their transactions on the new conn
+
+            nsHalfOpenSocket *half = ent->mHalfOpens[index];
+            nsAHttpTransaction *abstractTrans = half->Transaction();
+            nsRefPtr<nsHttpTransaction> concreteTrans = abstractTrans->QueryHttpTransaction();
+
+            if (!concreteTrans) {
+                continue;
+            }
+
+            LOG(("ReportSpdyConnection conn %p taking transaction %p from a "
+                 "half open that it will cancel\n", conn, concreteTrans.get()));
+
+            // concreteTrans is holding a ref to the transaction in half - so it
+            // is ok to destroy half
+            ent->RemoveHalfOpen(half);
+            half->Abandon();
+
+            DebugOnly<nsresult> rv = DispatchTransaction(ent, concreteTrans, conn);
+            MOZ_ASSERT(NS_SUCCEEDED(rv)); // this cannot fail
+        }
+
+        if (conn->CanDirectlyActivate() && ent->mActiveConns.Length() > 1) {
+            // this is a new connection to an established preferred spdy host.
+            // if there is more than 1 live and established spdy connection (e.g.
+            // some could still be handshaking, shutting down, etc..) then close
+            // this one down after any transactions that are on it are complete.
+            // This probably happened due to the parallel connection algorithm
+            // that is used only before the host is known to speak spdy.
+            for (uint32_t index = 0; index < ent->mActiveConns.Length(); ++index) {
+                nsHttpConnection *otherConn = ent->mActiveConns[index];
+                if (otherConn != conn) {
+                    LOG(("ReportSpdyConnection shutting down connection (%p) because new "
+                         "spdy connection (%p) takes precedence\n", otherConn, conn));
+                    otherConn->DontReuse();
+                }
+            }
+        }
+    }
+
     ProcessPendingQ(ent->mConnInfo);
     PostEvent(&nsHttpConnectionMgr::OnMsgProcessAllSpdyPendingQ);
 }
@@ -1027,9 +1067,7 @@ nsHttpConnectionMgr::PruneDeadConnectionsCB(const nsACString &key,
         ent->mActiveConns.Length() == 0 &&
         ent->mHalfOpens.Length()   == 0 &&
         ent->mPendingQ.Length()    == 0 &&
-        ((!ent->mTestedSpdy && !ent->mUsingSpdy) ||
-         !gHttpHandler->IsSpdyEnabled() ||
-         self->mCT.Count() > 300)) {
+        (!ent->mUsingSpdy || self->mCT.Count() > 300)) {
         LOG(("    removing empty connection entry\n"));
         return PL_DHASH_REMOVE;
     }
@@ -1409,8 +1447,7 @@ nsHttpConnectionMgr::ClosePersistentConnectionsCB(const nsACString &key,
 }
 
 bool
-nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent,
-                                         bool ignorePossibleSpdyConnections)
+nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent)
 {
     MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
 
@@ -1420,8 +1457,7 @@ nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent,
 
     bool doRestrict = ent->mConnInfo->FirstHopSSL() &&
         gHttpHandler->IsSpdyEnabled() &&
-        ((!ent->mTestedSpdy && !ignorePossibleSpdyConnections) ||
-         ent->mUsingSpdy) &&
+        ent->mUsingSpdy &&
         (ent->mHalfOpens.Length() || ent->mActiveConns.Length());
 
     // If there are no restrictions, we are done
@@ -1430,8 +1466,9 @@ nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent,
 
     // If the restriction is based on a tcp handshake in progress
     // let that connect and then see if it was SPDY or not
-    if (ent->UnconnectedHalfOpens() && !ignorePossibleSpdyConnections)
+    if (ent->UnconnectedHalfOpens()) {
         return true;
+    }
 
     // There is a concern that a host is using a mix of HTTP/1 and SPDY.
     // In that case we don't want to restrict connections just because
@@ -2952,14 +2989,12 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param)
 
     uint32_t parallelSpeculativeConnectLimit =
         gHttpHandler->ParallelSpeculativeConnectLimit();
-    bool ignorePossibleSpdyConnections = false;
     bool ignoreIdle = false;
     bool isFromPredictor = false;
     bool allow1918 = false;
 
     if (args->mOverridesOK) {
         parallelSpeculativeConnectLimit = args->mParallelSpeculativeConnectLimit;
-        ignorePossibleSpdyConnections = args->mIgnorePossibleSpdyConnections;
         ignoreIdle = args->mIgnoreIdle;
         isFromPredictor = args->mIsFromPredictor;
         allow1918 = args->mAllow1918;
@@ -2969,7 +3004,7 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param)
     if (mNumHalfOpenConns < parallelSpeculativeConnectLimit &&
         ((ignoreIdle && (ent->mIdleConns.Length() < parallelSpeculativeConnectLimit)) ||
          !ent->mIdleConns.Length()) &&
-        !(keepAlive && RestrictConnections(ent, ignorePossibleSpdyConnections)) &&
+        !(keepAlive && RestrictConnections(ent)) &&
         !AtActiveConnectionLimit(ent, args->mTrans->Caps())) {
         CreateTransport(ent, args->mTrans, args->mTrans->Caps(), true, isFromPredictor, allow1918);
     }
@@ -3333,8 +3368,9 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
         mStreamOut = nullptr;
         mStreamIn = nullptr;
         mSocketTransport = nullptr;
-    }
-    else {
+    } else {
+        MOZ_ASSERT(!mTransaction->IsNullTransaction(),
+                   "null transactions dont have backup timers");
         TimeDuration rtt = TimeStamp::Now() - mBackupSynStarted;
         rv = conn->Init(mEnt->mConnInfo,
                         gHttpHandler->ConnMgr()->mMaxRequestDelay,
@@ -3564,7 +3600,6 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci)
     , mPipeliningPenalty(0)
     , mSpdyCWND(0)
     , mUsingSpdy(false)
-    , mTestedSpdy(false)
     , mSpdyPreferred(false)
     , mPreferIPv4(false)
     , mPreferIPv6(false)
@@ -3962,7 +3997,6 @@ nsHttpConnectionMgr::MoveToWildCardConnEntry(nsHttpConnectionInfo *specificCI,
         return;
     }
     wcEnt->mUsingSpdy = true;
-    wcEnt->mTestedSpdy = true;
 
     LOG(("nsHttpConnectionMgr::MakeConnEntryWildCard ent %p "
          "idle=%d active=%d half=%d pending=%d\n", ent,
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h
index 1fd8bff14e2..bc5ad0aab65 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.h
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.h
@@ -376,12 +376,6 @@ private:
         // connection is currently using spdy.
         bool mUsingSpdy;
 
-        // mTestedSpdy is set after NPN negotiation has occurred and we know
-        // with confidence whether a host speaks spdy or not (which is reflected
-        // in mUsingSpdy). Before mTestedSpdy is set, handshake parallelism is
-        // minimized so that we can multiplex on a single spdy connection.
-        bool mTestedSpdy;
-
         bool mSpdyPreferred;
 
         // Flags to remember our happy-eyeballs decision.
@@ -565,7 +559,7 @@ private:
     nsresult BuildPipeline(nsConnectionEntry *,
                            nsAHttpTransaction *,
                            nsHttpPipeline **);
-    bool     RestrictConnections(nsConnectionEntry *, bool = false);
+    bool     RestrictConnections(nsConnectionEntry *);
     nsresult ProcessNewTransaction(nsHttpTransaction *);
     nsresult EnsureSocketThreadTarget();
     void     ClosePersistentConnections(nsConnectionEntry *ent);

From 7b0ee8c76e164b2a799891aa9e1e935668b700f0 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 00:50:28 -0400
Subject: [PATCH 10/37] Bug 1084150.  Don't generate a getter or setter
 baseline IC stub if we know up front it won't match the sort of object we
 just did a get or set on.  r=efaust

---
 js/src/jit/BaselineIC.cpp | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index 328e2d2739b..0dc84433a70 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -3533,7 +3533,7 @@ IsCacheableSetPropAddSlot(JSContext *cx, HandleObject obj, HandleShape oldShape,
 }
 
 static bool
-IsCacheableSetPropCall(JSContext *cx, JSObject *obj, JSObject *holder, Shape *shape, bool *isScripted)
+IsCacheableSetPropCall(JSContext *cx, JSObject *obj, JSObject *holder, Shape *shape, Shape* oldShape, bool *isScripted)
 {
     MOZ_ASSERT(isScripted);
 
@@ -3541,6 +3541,13 @@ IsCacheableSetPropCall(JSContext *cx, JSObject *obj, JSObject *holder, Shape *sh
     if (obj == holder)
         return false;
 
+    if (obj->lastProperty() != oldShape) {
+        // During the property set, the shape of the object changed.  Not much
+        // point caching this based on the post-set shape, since the object
+        // wouldn't have matched such an IC stub anyway.
+        return false;
+    }
+
     if (!shape || !IsCacheableProtoChain(obj, holder))
         return false;
 
@@ -6281,7 +6288,8 @@ StripPreliminaryObjectStubs(JSContext *cx, ICFallbackStub *stub)
 static bool
 TryAttachNativeGetPropStub(JSContext *cx, HandleScript script, jsbytecode *pc,
                            ICGetProp_Fallback *stub, HandlePropertyName name,
-                           HandleValue val, HandleValue res, bool *attached)
+                           HandleValue val, HandleShape oldShape,
+                           HandleValue res, bool *attached)
 {
     MOZ_ASSERT(!*attached);
 
@@ -6290,6 +6298,11 @@ TryAttachNativeGetPropStub(JSContext *cx, HandleScript script, jsbytecode *pc,
 
     RootedObject obj(cx, &val.toObject());
 
+    if (oldShape != obj->lastProperty()) {
+        // No point attaching anything, since we know the shape guard will fail
+        return true;
+    }
+
     bool isDOMProxy;
     bool domProxyHasGeneration;
     DOMProxyShadowsResult domProxyShadowsResult;
@@ -6593,6 +6606,11 @@ DoGetPropFallback(JSContext *cx, BaselineFrame *frame, ICGetProp_Fallback *stub_
 
     MOZ_ASSERT(op == JSOP_GETPROP || op == JSOP_CALLPROP || op == JSOP_LENGTH || op == JSOP_GETXPROP);
 
+    // Grab our old shape before it goes away.
+    RootedShape oldShape(cx);
+    if (val.isObject())
+        oldShape = val.toObject().lastProperty();
+
     // After the  Genericstub was added, we should never reach the Fallbackstub again.
     MOZ_ASSERT(!stub->hasStub(ICStub::GetProp_Generic));
 
@@ -6638,7 +6656,8 @@ DoGetPropFallback(JSContext *cx, BaselineFrame *frame, ICGetProp_Fallback *stub_
 
     RootedScript script(cx, frame->script());
 
-    if (!TryAttachNativeGetPropStub(cx, script, pc, stub, name, val, res, &attached))
+    if (!TryAttachNativeGetPropStub(cx, script, pc, stub, name, val, oldShape,
+                                    res, &attached))
         return false;
     if (attached)
         return true;
@@ -7616,6 +7635,8 @@ TryAttachSetPropStub(JSContext *cx, HandleScript script, jsbytecode *pc, ICSetPr
         GetFixedOrDynamicSlotOffset(&obj->as<NativeObject>(), shape->slot(), &isFixedSlot, &offset);
 
         JitSpew(JitSpew_BaselineIC, "  Generating SetProp(NativeObject.PROP) stub");
+        MOZ_ASSERT(obj->lastProperty() == oldShape,
+                   "Should this really be a SetPropWriteSlot?");
         ICSetProp_Native::Compiler compiler(cx, obj, isFixedSlot, offset);
         ICSetProp_Native *newStub = compiler.getStub(compiler.getStubSpace(script));
         if (!newStub)
@@ -7634,7 +7655,7 @@ TryAttachSetPropStub(JSContext *cx, HandleScript script, jsbytecode *pc, ICSetPr
     }
 
     bool isScripted = false;
-    bool cacheableCall = IsCacheableSetPropCall(cx, obj, holder, shape, &isScripted);
+    bool cacheableCall = IsCacheableSetPropCall(cx, obj, holder, shape, oldShape, &isScripted);
 
     // Try handling scripted setters.
     if (cacheableCall && isScripted) {

From acf7fcf2b28e878cbc202dffd181c266fd13ab63 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 00:50:28 -0400
Subject: [PATCH 11/37] Bug 1084001.  Set the .name of DOM interface objects to
 the name of the interface.  r=peterv

---
 dom/bindings/BindingUtils.cpp             | 14 +++++++++++-
 dom/bindings/test/mochitest.ini           |  1 +
 dom/bindings/test/test_interfaceName.html | 28 +++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 dom/bindings/test/test_interfaceName.html

diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 66209417760..1f457117138 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -459,7 +459,19 @@ CreateInterfaceObject(JSContext* cx, JS::Handle<JSObject*> global,
     }
 
     if (!JS_DefineProperty(cx, constructor, "length", ctorNargs,
-                           JSPROP_READONLY | JSPROP_PERMANENT)) {
+                           JSPROP_READONLY)) {
+      return nullptr;
+    }
+
+    // Might as well intern, since we're going to need an atomized
+    // version of name anyway when we stick our constructor on the
+    // global.
+    JS::Rooted<JSString*> nameStr(cx, JS_InternString(cx, name));
+    if (!nameStr) {
+      return nullptr;
+    }
+
+    if (!JS_DefineProperty(cx, constructor, "name", nameStr, JSPROP_READONLY)) {
       return nullptr;
     }
   }
diff --git a/dom/bindings/test/mochitest.ini b/dom/bindings/test/mochitest.ini
index 3df211461e0..b79b14af993 100644
--- a/dom/bindings/test/mochitest.ini
+++ b/dom/bindings/test/mochitest.ini
@@ -32,6 +32,7 @@ skip-if = debug == false
 [test_exception_messages.html]
 [test_forOf.html]
 [test_integers.html]
+[test_interfaceName.html]
 [test_interfaceToString.html]
 [test_exceptions_from_jsimplemented.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure; bug 926547
diff --git a/dom/bindings/test/test_interfaceName.html b/dom/bindings/test/test_interfaceName.html
new file mode 100644
index 00000000000..59828a2cf20
--- /dev/null
+++ b/dom/bindings/test/test_interfaceName.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1084001
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1084001</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">
+
+  /** Test for Bug 1084001 **/
+  is(Image.name, "Image", "Image name");
+  is(Promise.name, "Promise", "Promise name");
+
+  </script>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1084001">Mozilla Bug 1084001</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>

From e3e460b245df622c2ff5f983eec50db5b3762a64 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 00:50:28 -0400
Subject: [PATCH 12/37] Bug 1083648 part 1.  Add a way to pass an enclosing
 static scope to CompileFunction.  r=shu

---
 js/src/asmjs/AsmJSLink.cpp           |  3 ++-
 js/src/frontend/BytecodeCompiler.cpp | 12 +++++++-----
 js/src/frontend/BytecodeCompiler.h   |  7 ++++++-
 js/src/jsapi.cpp                     | 12 ++++++++----
 js/src/jsapi.h                       | 11 +++++++++--
 js/src/jsfun.cpp                     |  3 ++-
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/js/src/asmjs/AsmJSLink.cpp b/js/src/asmjs/AsmJSLink.cpp
index f7dec84460e..85bb4e73632 100644
--- a/js/src/asmjs/AsmJSLink.cpp
+++ b/js/src/asmjs/AsmJSLink.cpp
@@ -821,7 +821,8 @@ HandleDynamicLinkFailure(JSContext *cx, CallArgs args, AsmJSModule &module, Hand
                                               ? SourceBufferHolder::GiveOwnership
                                               : SourceBufferHolder::NoOwnership;
     SourceBufferHolder srcBuf(chars, end - begin, ownership);
-    if (!frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf))
+    if (!frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf,
+                                       /* enclosingScope = */ NullPtr()))
         return false;
 
     // Call the function we just recompiled.
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 4810c1ae38e..4b4e464220f 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -515,7 +515,7 @@ frontend::CompileLazyFunction(JSContext *cx, Handle<LazyScript*> lazy, const cha
 static bool
 CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyCompileOptions &options,
                     const AutoNameVector &formals, SourceBufferHolder &srcBuf,
-                    GeneratorKind generatorKind)
+                    HandleObject enclosingScope, GeneratorKind generatorKind)
 {
     js::TraceLogger *logger = js::TraceLoggerForMainThread(cx->runtime());
     uint32_t logId = js::TraceLogCreateTextId(logger, options);
@@ -611,7 +611,7 @@ CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyComp
     if (fn->pn_funbox->function()->isInterpreted()) {
         MOZ_ASSERT(fun == fn->pn_funbox->function());
 
-        Rooted<JSScript*> script(cx, JSScript::Create(cx, js::NullPtr(), false, options,
+        Rooted<JSScript*> script(cx, JSScript::Create(cx, enclosingScope, false, options,
                                                       /* staticLevel = */ 0, sourceObject,
                                                       /* sourceStart = */ 0, srcBuf.length()));
         if (!script)
@@ -650,9 +650,11 @@ CompileFunctionBody(JSContext *cx, MutableHandleFunction fun, const ReadOnlyComp
 bool
 frontend::CompileFunctionBody(JSContext *cx, MutableHandleFunction fun,
                               const ReadOnlyCompileOptions &options,
-                              const AutoNameVector &formals, JS::SourceBufferHolder &srcBuf)
+                              const AutoNameVector &formals, JS::SourceBufferHolder &srcBuf,
+                              HandleObject enclosingStaticScope)
 {
-    return CompileFunctionBody(cx, fun, options, formals, srcBuf, NotGenerator);
+    return CompileFunctionBody(cx, fun, options, formals, srcBuf,
+                               enclosingStaticScope, NotGenerator);
 }
 
 bool
@@ -660,5 +662,5 @@ frontend::CompileStarGeneratorBody(JSContext *cx, MutableHandleFunction fun,
                                    const ReadOnlyCompileOptions &options, const AutoNameVector &formals,
                                    JS::SourceBufferHolder &srcBuf)
 {
-    return CompileFunctionBody(cx, fun, options, formals, srcBuf, StarGenerator);
+    return CompileFunctionBody(cx, fun, options, formals, srcBuf, NullPtr(), StarGenerator);
 }
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 82f923de870..a300d413d97 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -31,10 +31,15 @@ CompileScript(ExclusiveContext *cx, LifoAlloc *alloc,
 bool
 CompileLazyFunction(JSContext *cx, Handle<LazyScript*> lazy, const char16_t *chars, size_t length);
 
+/*
+ * enclosingStaticScope is a static enclosing scope (e.g. a StaticWithObject).
+ * Must be null if the enclosing scope is a global.
+ */
 bool
 CompileFunctionBody(JSContext *cx, MutableHandleFunction fun,
                     const ReadOnlyCompileOptions &options,
-                    const AutoNameVector &formals, JS::SourceBufferHolder &srcBuf);
+                    const AutoNameVector &formals, JS::SourceBufferHolder &srcBuf,
+                    HandleObject enclosingStaticScope);
 bool
 CompileStarGeneratorBody(JSContext *cx, MutableHandleFunction fun,
                          const ReadOnlyCompileOptions &options,
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9bcc0b18702..32db21af42b 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -4537,7 +4537,8 @@ JS_GetFunctionScript(JSContext *cx, HandleFunction fun)
 JS_PUBLIC_API(bool)
 JS::CompileFunction(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
                     const char *name, unsigned nargs, const char *const *argnames,
-                    SourceBufferHolder &srcBuf, MutableHandleFunction fun)
+                    SourceBufferHolder &srcBuf, MutableHandleFunction fun,
+                    HandleObject enclosingStaticScope)
 {
     MOZ_ASSERT(!cx->runtime()->isAtomsCompartment(cx->compartment()));
     AssertHeapIsIdle(cx);
@@ -4564,7 +4565,8 @@ JS::CompileFunction(JSContext *cx, HandleObject obj, const ReadOnlyCompileOption
     if (!fun)
         return false;
 
-    if (!frontend::CompileFunctionBody(cx, fun, options, formals, srcBuf))
+    if (!frontend::CompileFunctionBody(cx, fun, options, formals, srcBuf,
+                                       enclosingStaticScope))
         return false;
 
     if (obj && funAtom && options.defineOnScope) {
@@ -4580,10 +4582,12 @@ JS::CompileFunction(JSContext *cx, HandleObject obj, const ReadOnlyCompileOption
 JS_PUBLIC_API(bool)
 JS::CompileFunction(JSContext *cx, HandleObject obj, const ReadOnlyCompileOptions &options,
                     const char *name, unsigned nargs, const char *const *argnames,
-                    const char16_t *chars, size_t length, MutableHandleFunction fun)
+                    const char16_t *chars, size_t length, MutableHandleFunction fun,
+                    HandleObject enclosingStaticScope)
 {
     SourceBufferHolder srcBuf(chars, length, SourceBufferHolder::NoOwnership);
-    return JS::CompileFunction(cx, obj, options, name, nargs, argnames, srcBuf, fun);
+    return JS::CompileFunction(cx, obj, options, name, nargs, argnames, srcBuf,
+                               fun, enclosingStaticScope);
 }
 
 JS_PUBLIC_API(bool)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 8b615c2260f..b2320a8e06b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3931,10 +3931,16 @@ CompileOffThread(JSContext *cx, const ReadOnlyCompileOptions &options,
 extern JS_PUBLIC_API(JSScript *)
 FinishOffThreadScript(JSContext *maybecx, JSRuntime *rt, void *token);
 
+/*
+ * enclosingStaticScope is a static enclosing scope, if any (e.g. a
+ * StaticWithObject).  If the enclosing scope is the global scope, this must be
+ * null.
+ */
 extern JS_PUBLIC_API(bool)
 CompileFunction(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
                 const char *name, unsigned nargs, const char *const *argnames,
-                SourceBufferHolder &srcBuf, JS::MutableHandleFunction fun);
+                SourceBufferHolder &srcBuf, JS::MutableHandleFunction fun,
+                HandleObject enclosingStaticScope = NullPtr());
 
 extern JS_PUBLIC_API(bool)
 CompileFunction(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
@@ -3944,7 +3950,8 @@ CompileFunction(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOption
 extern JS_PUBLIC_API(bool)
 CompileFunction(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOptions &options,
                 const char *name, unsigned nargs, const char *const *argnames,
-                const char16_t *chars, size_t length, JS::MutableHandleFunction fun);
+                const char16_t *chars, size_t length, JS::MutableHandleFunction fun,
+                HandleObject enclosingStaticScope = NullPtr());
 
 } /* namespace JS */
 
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index f695bca6e80..acbc542b8d3 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1908,7 +1908,8 @@ FunctionConstructor(JSContext *cx, unsigned argc, Value *vp, GeneratorKind gener
     if (isStarGenerator)
         ok = frontend::CompileStarGeneratorBody(cx, &fun, options, formals, srcBuf);
     else
-        ok = frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf);
+        ok = frontend::CompileFunctionBody(cx, &fun, options, formals, srcBuf,
+                                           /* enclosingScope = */ NullPtr());
     args.rval().setObject(*fun);
     return ok;
 }

From e5c5edfce2a45ace874170273e538992f4f70f6b Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 00:50:28 -0400
Subject: [PATCH 13/37] Bug 1083648 part 2.  Add JSAPI for compiling a function
 with a given scope chain (represented as a vector of JSObjects).  r=shu

---
 js/src/jsapi.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 js/src/jsapi.h   | 13 ++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 32db21af42b..7686f0141eb 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -77,6 +77,7 @@
 #include "vm/RegExpStatics.h"
 #include "vm/Runtime.h"
 #include "vm/SavedStacks.h"
+#include "vm/ScopeObject.h"
 #include "vm/Shape.h"
 #include "vm/StopIterationObject.h"
 #include "vm/StringBuffer.h"
@@ -3833,6 +3834,43 @@ JS::GetSelfHostedFunction(JSContext *cx, const char *selfHostedName, HandleId id
     return &funVal.toObject().as<JSFunction>();
 }
 
+static bool
+CreateScopeObjectsForScopeChain(JSContext *cx, AutoObjectVector &scopeChain,
+                                MutableHandleObject dynamicScopeObj,
+                                MutableHandleObject staticScopeObj)
+{
+#ifdef DEBUG
+    for (size_t i = 0; i < scopeChain.length(); ++i) {
+        assertSameCompartment(cx, scopeChain[i]);
+        MOZ_ASSERT(!scopeChain[i]->is<GlobalObject>());
+    }
+#endif
+
+    // Construct With object wrappers for the things on this scope
+    // chain and use the result as the thing to scope the function to.
+    Rooted<StaticWithObject*> staticWith(cx);
+    RootedObject staticEnclosingScope(cx);
+    Rooted<DynamicWithObject*> dynamicWith(cx);
+    RootedObject dynamicEnclosingScope(cx, cx->global());
+    for (size_t i = scopeChain.length(); i > 0; ) {
+        staticWith = StaticWithObject::create(cx);
+        if (!staticWith)
+            return false;
+        staticWith->initEnclosingNestedScope(staticEnclosingScope);
+        staticEnclosingScope = staticWith;
+
+        dynamicWith = DynamicWithObject::create(cx, scopeChain[--i],
+                                                dynamicEnclosingScope, staticWith);
+        if (!dynamicWith)
+            return false;
+        dynamicEnclosingScope = dynamicWith;
+    }
+
+    dynamicScopeObj.set(dynamicEnclosingScope);
+    staticScopeObj.set(staticEnclosingScope);
+    return true;
+}
+
 JS_PUBLIC_API(JSObject *)
 JS_CloneFunctionObject(JSContext *cx, HandleObject funobj, HandleObject parentArg)
 {
@@ -4606,6 +4644,21 @@ JS::CompileFunction(JSContext *cx, HandleObject obj, const ReadOnlyCompileOption
     return CompileFunction(cx, obj, options, name, nargs, argnames, chars.get(), length, fun);
 }
 
+JS_PUBLIC_API(bool)
+JS::CompileFunction(JSContext *cx, AutoObjectVector &scopeChain,
+                    const ReadOnlyCompileOptions &options,
+                    const char *name, unsigned nargs, const char *const *argnames,
+                    const char16_t *chars, size_t length, MutableHandleFunction fun)
+{
+    RootedObject dynamicScopeObj(cx);
+    RootedObject staticScopeObj(cx);
+    if (!CreateScopeObjectsForScopeChain(cx, scopeChain, &dynamicScopeObj, &staticScopeObj))
+        return false;
+
+    return JS::CompileFunction(cx, dynamicScopeObj, options, name, nargs,
+                               argnames, chars, length, fun, staticScopeObj);
+}
+
 JS_PUBLIC_API(bool)
 JS_CompileUCFunction(JSContext *cx, JS::HandleObject obj, const char *name,
                      unsigned nargs, const char *const *argnames,
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index b2320a8e06b..6009f81880c 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -3953,6 +3953,19 @@ CompileFunction(JSContext *cx, JS::HandleObject obj, const ReadOnlyCompileOption
                 const char16_t *chars, size_t length, JS::MutableHandleFunction fun,
                 HandleObject enclosingStaticScope = NullPtr());
 
+/**
+ * Compile a function with scopeChain plus the global as its scope chain.
+ * scopeChain must contain objects in the current compartment of cx.  The actual
+ * scope chain used for the function will consist of With wrappers for those
+ * objects, followed by the current global of the compartment cx is in.  This
+ * global must not be explicitly included in the scope chain.
+ */
+extern JS_PUBLIC_API(bool)
+CompileFunction(JSContext *cx, AutoObjectVector &scopeChain,
+                const ReadOnlyCompileOptions &options,
+                const char *name, unsigned nargs, const char *const *argnames,
+                const char16_t *chars, size_t length, JS::MutableHandleFunction fun);
+
 } /* namespace JS */
 
 extern JS_PUBLIC_API(JSString *)

From ac67e4fb9f748d9c751c9db03ee3edd54f96852f Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 00:50:29 -0400
Subject: [PATCH 14/37] Bug 1083648 part 3.  Change nsJSUtils::CompileFunction
 to take an explicit scope chain vector, not just a single scope object, and
 pass in the right objects in CompileEventHandlerInternal.  r=bholley

---
 dom/base/nsJSUtils.cpp              | 11 ++++++-----
 dom/base/nsJSUtils.h                |  2 +-
 dom/events/EventListenerManager.cpp | 23 ++++++++++++++++++++++-
 dom/xbl/nsXBLProtoImplMethod.cpp    |  3 ++-
 dom/xbl/nsXBLProtoImplProperty.cpp  |  6 ++++--
 dom/xbl/nsXBLPrototypeHandler.cpp   |  3 ++-
 6 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index ad28704a5bd..0132b4fc94c 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -124,7 +124,7 @@ nsJSUtils::ReportPendingException(JSContext *aContext)
 
 nsresult
 nsJSUtils::CompileFunction(AutoJSAPI& jsapi,
-                           JS::Handle<JSObject*> aTarget,
+                           JS::AutoObjectVector& aScopeChain,
                            JS::CompileOptions& aOptions,
                            const nsACString& aName,
                            uint32_t aArgCount,
@@ -135,19 +135,20 @@ nsJSUtils::CompileFunction(AutoJSAPI& jsapi,
   MOZ_ASSERT(jsapi.OwnsErrorReporting());
   JSContext* cx = jsapi.cx();
   MOZ_ASSERT(js::GetEnterCompartmentDepth(cx) > 0);
-  MOZ_ASSERT_IF(aTarget, js::IsObjectInContextCompartment(aTarget, cx));
+  MOZ_ASSERT_IF(aScopeChain.length() != 0,
+                js::IsObjectInContextCompartment(aScopeChain[0], cx));
   MOZ_ASSERT_IF(aOptions.versionSet, aOptions.version != JSVERSION_UNKNOWN);
   mozilla::DebugOnly<nsIScriptContext*> ctx = GetScriptContextFromJSContext(cx);
   MOZ_ASSERT_IF(ctx, ctx->IsContextInitialized());
 
   // Do the junk Gecko is supposed to do before calling into JSAPI.
-  if (aTarget) {
-    JS::ExposeObjectToActiveJS(aTarget);
+  for (size_t i = 0; i < aScopeChain.length(); ++i) {
+    JS::ExposeObjectToActiveJS(aScopeChain[i]);
   }
 
   // Compile.
   JS::Rooted<JSFunction*> fun(cx);
-  if (!JS::CompileFunction(cx, aTarget, aOptions,
+  if (!JS::CompileFunction(cx, aScopeChain, aOptions,
                            PromiseFlatCString(aName).get(),
                            aArgCount, aArgArray,
                            PromiseFlatString(aBody).get(),
diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h
index 61cf9e0ea55..d46a5a5b09d 100644
--- a/dom/base/nsJSUtils.h
+++ b/dom/base/nsJSUtils.h
@@ -56,7 +56,7 @@ public:
   static void ReportPendingException(JSContext *aContext);
 
   static nsresult CompileFunction(mozilla::dom::AutoJSAPI& jsapi,
-                                  JS::Handle<JSObject*> aTarget,
+                                  JS::AutoObjectVector& aScopeChain,
                                   JS::CompileOptions& aOptions,
                                   const nsACString& aName,
                                   uint32_t aArgCount,
diff --git a/dom/events/EventListenerManager.cpp b/dom/events/EventListenerManager.cpp
index 82a55045d63..e2fea246dae 100644
--- a/dom/events/EventListenerManager.cpp
+++ b/dom/events/EventListenerManager.cpp
@@ -860,6 +860,19 @@ EventListenerManager::CompileEventHandlerInternal(Listener* aListener,
       return rv;
     }
   }
+
+  JS::AutoObjectVector scopeChain(cx);
+  { // scope for curScope
+    // We append all the non-globals on our desired scope chain.
+    JS::Rooted<JSObject*> curScope(cx, &v.toObject());
+    while (curScope && !JS_IsGlobalObject(curScope)) {
+      if (!scopeChain.append(curScope)) {
+        return NS_ERROR_OUT_OF_MEMORY;
+      }
+      curScope = JS_GetParent(curScope);
+    }
+  }
+
   if (addonId) {
     JS::Rooted<JSObject*> vObj(cx, &v.toObject());
     JS::Rooted<JSObject*> addonScope(cx, xpc::GetAddonScope(cx, vObj, addonId));
@@ -867,6 +880,14 @@ EventListenerManager::CompileEventHandlerInternal(Listener* aListener,
       return NS_ERROR_FAILURE;
     }
     JSAutoCompartment ac(cx, addonScope);
+    for (size_t i = 0; i < scopeChain.length(); ++i) {
+      if (!JS_WrapObject(cx, scopeChain[i])) {
+        return NS_ERROR_FAILURE;
+      }
+    }
+
+    // And wrap v as well, since scopeChain might be empty so we can't
+    // reliably use it to enter a compartment.
     if (!JS_WrapValue(cx, &v)) {
       return NS_ERROR_FAILURE;
     }
@@ -896,7 +917,7 @@ EventListenerManager::CompileEventHandlerInternal(Listener* aListener,
          .setDefineOnScope(false);
 
   JS::Rooted<JSObject*> handler(cx);
-  result = nsJSUtils::CompileFunction(jsapi, target, options,
+  result = nsJSUtils::CompileFunction(jsapi, scopeChain, options,
                                       nsAtomCString(typeAtom),
                                       argCount, argNames, *body, handler.address());
   NS_ENSURE_SUCCESS(result, result);
diff --git a/dom/xbl/nsXBLProtoImplMethod.cpp b/dom/xbl/nsXBLProtoImplMethod.cpp
index fa745184bbc..08e980d4b06 100644
--- a/dom/xbl/nsXBLProtoImplMethod.cpp
+++ b/dom/xbl/nsXBLProtoImplMethod.cpp
@@ -196,7 +196,8 @@ nsXBLProtoImplMethod::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassStr
                          uncompiledMethod->mBodyText.GetLineNumber())
          .setVersion(JSVERSION_LATEST);
   JS::Rooted<JSObject*> methodObject(cx);
-  nsresult rv = nsJSUtils::CompileFunction(jsapi, JS::NullPtr(), options, cname,
+  JS::AutoObjectVector emptyVector(cx);
+  nsresult rv = nsJSUtils::CompileFunction(jsapi, emptyVector, options, cname,
                                            paramCount,
                                            const_cast<const char**>(args),
                                            body, methodObject.address());
diff --git a/dom/xbl/nsXBLProtoImplProperty.cpp b/dom/xbl/nsXBLProtoImplProperty.cpp
index 64a895c75fe..cc3d18ba9cc 100644
--- a/dom/xbl/nsXBLProtoImplProperty.cpp
+++ b/dom/xbl/nsXBLProtoImplProperty.cpp
@@ -195,7 +195,8 @@ nsXBLProtoImplProperty::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassS
              .setVersion(JSVERSION_LATEST);
       nsCString name = NS_LITERAL_CSTRING("get_") + NS_ConvertUTF16toUTF8(mName);
       JS::Rooted<JSObject*> getterObject(cx);
-      rv = nsJSUtils::CompileFunction(jsapi, JS::NullPtr(), options, name, 0,
+      JS::AutoObjectVector emptyVector(cx);
+      rv = nsJSUtils::CompileFunction(jsapi, emptyVector, options, name, 0,
                                       nullptr, getter, getterObject.address());
 
       delete getterText;
@@ -240,7 +241,8 @@ nsXBLProtoImplProperty::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassS
              .setVersion(JSVERSION_LATEST);
       nsCString name = NS_LITERAL_CSTRING("set_") + NS_ConvertUTF16toUTF8(mName);
       JS::Rooted<JSObject*> setterObject(cx);
-      rv = nsJSUtils::CompileFunction(jsapi, JS::NullPtr(), options, name, 1,
+      JS::AutoObjectVector emptyVector(cx);
+      rv = nsJSUtils::CompileFunction(jsapi, emptyVector, options, name, 1,
                                       gPropertyArgs, setter,
                                       setterObject.address());
 
diff --git a/dom/xbl/nsXBLPrototypeHandler.cpp b/dom/xbl/nsXBLPrototypeHandler.cpp
index f3980d69e06..65716fcf8f8 100644
--- a/dom/xbl/nsXBLPrototypeHandler.cpp
+++ b/dom/xbl/nsXBLPrototypeHandler.cpp
@@ -373,7 +373,8 @@ nsXBLPrototypeHandler::EnsureEventHandler(AutoJSAPI& jsapi, nsIAtom* aName,
          .setVersion(JSVERSION_LATEST);
 
   JS::Rooted<JSObject*> handlerFun(cx);
-  nsresult rv = nsJSUtils::CompileFunction(jsapi, JS::NullPtr(), options,
+  JS::AutoObjectVector emptyVector(cx);
+  nsresult rv = nsJSUtils::CompileFunction(jsapi, emptyVector, options,
                                            nsAtomCString(aName), argCount,
                                            argNames, handlerText,
                                            handlerFun.address());

From c475ee5be979ddd8f3be7d59abaaa323ac67eedd Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 01:58:59 -0400
Subject: [PATCH 15/37] Back out part of bug 1084001 because the tests are
 being silly.

---
 dom/bindings/BindingUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp
index 1f457117138..2026575094e 100644
--- a/dom/bindings/BindingUtils.cpp
+++ b/dom/bindings/BindingUtils.cpp
@@ -459,7 +459,7 @@ CreateInterfaceObject(JSContext* cx, JS::Handle<JSObject*> global,
     }
 
     if (!JS_DefineProperty(cx, constructor, "length", ctorNargs,
-                           JSPROP_READONLY)) {
+                           JSPROP_READONLY | JSPROP_PERMANENT)) {
       return nullptr;
     }
 

From 18496ecb42b05274ba7b1c0bb8670eedf52b42bd Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Sat, 25 Oct 2014 02:09:12 -0400
Subject: [PATCH 16/37] Bug 1083648 followup to fix orange on CLOSED TREE due
 to random XBL stuff getting defined as props on the global.  r=bholley
 pending

---
 dom/xbl/nsXBLProtoImplMethod.cpp   | 3 ++-
 dom/xbl/nsXBLProtoImplProperty.cpp | 6 ++++--
 dom/xbl/nsXBLPrototypeHandler.cpp  | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dom/xbl/nsXBLProtoImplMethod.cpp b/dom/xbl/nsXBLProtoImplMethod.cpp
index 08e980d4b06..8f1d9c6bca9 100644
--- a/dom/xbl/nsXBLProtoImplMethod.cpp
+++ b/dom/xbl/nsXBLProtoImplMethod.cpp
@@ -194,7 +194,8 @@ nsXBLProtoImplMethod::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassStr
   JS::CompileOptions options(cx);
   options.setFileAndLine(functionUri.get(),
                          uncompiledMethod->mBodyText.GetLineNumber())
-         .setVersion(JSVERSION_LATEST);
+         .setVersion(JSVERSION_LATEST)
+         .setDefineOnScope(false);
   JS::Rooted<JSObject*> methodObject(cx);
   JS::AutoObjectVector emptyVector(cx);
   nsresult rv = nsJSUtils::CompileFunction(jsapi, emptyVector, options, cname,
diff --git a/dom/xbl/nsXBLProtoImplProperty.cpp b/dom/xbl/nsXBLProtoImplProperty.cpp
index cc3d18ba9cc..6d2cba125f0 100644
--- a/dom/xbl/nsXBLProtoImplProperty.cpp
+++ b/dom/xbl/nsXBLProtoImplProperty.cpp
@@ -192,7 +192,8 @@ nsXBLProtoImplProperty::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassS
       JSAutoCompartment ac(cx, aClassObject);
       JS::CompileOptions options(cx);
       options.setFileAndLine(functionUri.get(), getterText->GetLineNumber())
-             .setVersion(JSVERSION_LATEST);
+             .setVersion(JSVERSION_LATEST)
+             .setDefineOnScope(false);
       nsCString name = NS_LITERAL_CSTRING("get_") + NS_ConvertUTF16toUTF8(mName);
       JS::Rooted<JSObject*> getterObject(cx);
       JS::AutoObjectVector emptyVector(cx);
@@ -238,7 +239,8 @@ nsXBLProtoImplProperty::CompileMember(AutoJSAPI& jsapi, const nsCString& aClassS
       JSAutoCompartment ac(cx, aClassObject);
       JS::CompileOptions options(cx);
       options.setFileAndLine(functionUri.get(), setterText->GetLineNumber())
-             .setVersion(JSVERSION_LATEST);
+             .setVersion(JSVERSION_LATEST)
+             .setDefineOnScope(false);
       nsCString name = NS_LITERAL_CSTRING("set_") + NS_ConvertUTF16toUTF8(mName);
       JS::Rooted<JSObject*> setterObject(cx);
       JS::AutoObjectVector emptyVector(cx);
diff --git a/dom/xbl/nsXBLPrototypeHandler.cpp b/dom/xbl/nsXBLPrototypeHandler.cpp
index 65716fcf8f8..2179373c5b3 100644
--- a/dom/xbl/nsXBLPrototypeHandler.cpp
+++ b/dom/xbl/nsXBLPrototypeHandler.cpp
@@ -370,7 +370,8 @@ nsXBLPrototypeHandler::EnsureEventHandler(AutoJSAPI& jsapi, nsIAtom* aName,
   JSAutoCompartment ac(cx, scopeObject);
   JS::CompileOptions options(cx);
   options.setFileAndLine(bindingURI.get(), mLineNumber)
-         .setVersion(JSVERSION_LATEST);
+         .setVersion(JSVERSION_LATEST)
+         .setDefineOnScope(false);
 
   JS::Rooted<JSObject*> handlerFun(cx);
   JS::AutoObjectVector emptyVector(cx);

From 4d43b37773dc00f1fb2b622f7b96bcdab6f966a1 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Sat, 25 Oct 2014 12:09:25 +0100
Subject: [PATCH 17/37] Bug 1088547 - Don't pass NS_UNCONSTRAINEDSIZE as
 inline-size constraint to ComputeSize. r=smontagu

---
 layout/generic/nsHTMLReflowState.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index 0565d0a7228..ee3ba16c134 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -2145,10 +2145,17 @@ nsHTMLReflowState::InitConstraints(nsPresContext* aPresContext,
       }
 
       WritingMode wm = GetWritingMode();
+
+      LogicalSize cbSize(wm, nsSize(aContainingBlockWidth,
+                                    aContainingBlockHeight));
+      if (cbSize.ISize(wm) == NS_UNCONSTRAINEDSIZE) {
+        // For orthogonal flows, where we found a parent orthogonal-limit
+        // for AvailableISize() in Init(), we'll use the same here as well.
+        cbSize.ISize(wm) = AvailableISize();
+      }
+
       LogicalSize size =
-        frame->ComputeSize(rendContext, wm,
-                           LogicalSize(wm, nsSize(aContainingBlockWidth,
-                                                  aContainingBlockHeight)),
+        frame->ComputeSize(rendContext, wm, cbSize,
                            AvailableISize(),
                            ComputedLogicalMargin().Size(wm),
                            ComputedLogicalBorderPadding().Size(wm) -

From 0325442c3c666f64dc6e4f72802b73876d399986 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Sat, 25 Oct 2014 13:55:55 +0100
Subject: [PATCH 18/37] Bug 1086977 follow-up - Add some |#if
 defined(MOZ_CRASHREPORTER)| code to unbreak bug 1086977's bustage of
 --disable-crashreporter

---
 dom/plugins/base/nsPluginsDirDarwin.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dom/plugins/base/nsPluginsDirDarwin.cpp b/dom/plugins/base/nsPluginsDirDarwin.cpp
index 8a2252a7c94..feb51b00ace 100644
--- a/dom/plugins/base/nsPluginsDirDarwin.cpp
+++ b/dom/plugins/base/nsPluginsDirDarwin.cpp
@@ -25,7 +25,9 @@
 #include "nsILocalFileMac.h"
 
 #include "nsCocoaFeatures.h"
+#if defined(MOZ_CRASHREPORTER)
 #include "nsExceptionHandler.h"
+#endif
 
 #include <string.h>
 #include <stdio.h>
@@ -480,12 +482,14 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
       NS_WARNING("Preventing load of fbplugin (see bug 1086977)");
       return NS_ERROR_FAILURE;
     }
+#if defined(MOZ_CRASHREPORTER)
     // The block above assumes that "fbplugin" is the filename of the plugin
     // to be blocked, but be don't yet know for sure if this is true.  It might
     // also be the name of a file indirectly loaded by the plugin.  So for the
     // time being we must record extra information in our crash logs.
     CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug 1086977"),
                                        fileName);
+#endif
   }
 
   // It's possible that our plugin has 2 entry points that'll give us mime type
@@ -495,6 +499,7 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
 
   // Sadly we have to load the library for this to work.
   rv = LoadPlugin(outLibrary);
+#if defined(MOZ_CRASHREPORTER)
   if (nsCocoaFeatures::OnYosemiteOrLater()) {
     // If we didn't crash in LoadPlugin(), change the previous annotation so we
     // don't sow confusion.  Unfortunately there's not (yet) any way to get rid
@@ -502,6 +507,7 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
     CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Bug 1086977"),
                                        NS_LITERAL_CSTRING("Didn't crash, please ignore"));
   }
+#endif
   if (NS_FAILED(rv))
     return rv;
 

From bd1aec7b7a384b124d6bda0e38a10fa4e5c69497 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:21:03 +0300
Subject: [PATCH 19/37] Bug 946065 - Part 8: Move content/xul/ to dom/ and
 flatten subdirectories. r=janv

--HG--
rename : content/xul/document/src/XULDocument.cpp => dom/xul/XULDocument.cpp
rename : content/xul/document/src/XULDocument.h => dom/xul/XULDocument.h
rename : content/xul/content/crashtests/107518-1.xml => dom/xul/crashtests/107518-1.xml
rename : content/xul/content/crashtests/252448-1.xul => dom/xul/crashtests/252448-1.xul
rename : content/xul/content/crashtests/253479-1.xul => dom/xul/crashtests/253479-1.xul
rename : content/xul/content/crashtests/253479-2.xul => dom/xul/crashtests/253479-2.xul
rename : content/xul/document/crashtests/326204-1.xul => dom/xul/crashtests/326204-1.xul
rename : content/xul/content/crashtests/326644-1-inner.xul => dom/xul/crashtests/326644-1-inner.xul
rename : content/xul/content/crashtests/326644-1.html => dom/xul/crashtests/326644-1.html
rename : content/xul/content/crashtests/326644-2-inner.xul => dom/xul/crashtests/326644-2-inner.xul
rename : content/xul/content/crashtests/326644-2.html => dom/xul/crashtests/326644-2.html
rename : content/xul/content/crashtests/326864-1.xul => dom/xul/crashtests/326864-1.xul
rename : content/xul/content/crashtests/326875-1.xul => dom/xul/crashtests/326875-1.xul
rename : content/xul/content/crashtests/326881-1.xul => dom/xul/crashtests/326881-1.xul
rename : content/xul/content/crashtests/329982-1.xhtml => dom/xul/crashtests/329982-1.xhtml
rename : content/xul/content/crashtests/336096-1.xhtml => dom/xul/crashtests/336096-1.xhtml
rename : content/xul/document/crashtests/344215-1.xul => dom/xul/crashtests/344215-1.xul
rename : content/xul/content/crashtests/354611-1.html => dom/xul/crashtests/354611-1.html
rename : content/xul/content/crashtests/360078-1.xhtml => dom/xul/crashtests/360078-1.xhtml
rename : content/xul/content/crashtests/360078-1xbl.xml => dom/xul/crashtests/360078-1xbl.xml
rename : content/xul/content/crashtests/363791-1.xul => dom/xul/crashtests/363791-1.xul
rename : content/xul/content/crashtests/384740-1.xul => dom/xul/crashtests/384740-1.xul
rename : content/xul/content/crashtests/384877-1-inner.xul => dom/xul/crashtests/384877-1-inner.xul
rename : content/xul/content/crashtests/384877-1.html => dom/xul/crashtests/384877-1.html
rename : content/xul/document/crashtests/386914-1-inner.xul => dom/xul/crashtests/386914-1-inner.xul
rename : content/xul/document/crashtests/386914-1.html => dom/xul/crashtests/386914-1.html
rename : content/xul/content/crashtests/386947-1.xul => dom/xul/crashtests/386947-1.xul
rename : content/xul/content/crashtests/425821-1.xul => dom/xul/crashtests/425821-1.xul
rename : content/xul/document/crashtests/428951-1.xul => dom/xul/crashtests/428951-1.xul
rename : content/xul/content/crashtests/429085-1.xhtml => dom/xul/crashtests/429085-1.xhtml
rename : content/xul/content/crashtests/431906-1-inner.xul => dom/xul/crashtests/431906-1-inner.xul
rename : content/xul/content/crashtests/431906-1.html => dom/xul/crashtests/431906-1.html
rename : content/xul/content/crashtests/451311-1.xul => dom/xul/crashtests/451311-1.xul
rename : content/xul/content/crashtests/461917-1.xhtml => dom/xul/crashtests/461917-1.xhtml
rename : content/xul/document/crashtests/468211-1.xul => dom/xul/crashtests/468211-1.xul
rename : content/xul/document/crashtests/468211-2-binding.xml => dom/xul/crashtests/468211-2-binding.xml
rename : content/xul/document/crashtests/468211-2.xul => dom/xul/crashtests/468211-2.xul
rename : content/xul/document/crashtests/468211-3.xul => dom/xul/crashtests/468211-3.xul
rename : content/xul/document/crashtests/495635-1.xul => dom/xul/crashtests/495635-1.xul
rename : content/xul/content/crashtests/509719-1-overlay.xul => dom/xul/crashtests/509719-1-overlay.xul
rename : content/xul/content/crashtests/509719-1.xul => dom/xul/crashtests/509719-1.xul
rename : content/xul/content/crashtests/509719-2-overlay.xul => dom/xul/crashtests/509719-2-overlay.xul
rename : content/xul/content/crashtests/509719-2.xul => dom/xul/crashtests/509719-2.xul
rename : content/xul/document/crashtests/583230.xul => dom/xul/crashtests/583230.xul
rename : content/xul/content/crashtests/crashtests.list => dom/xul/crashtests/crashtests.list
rename : content/xul/document/crashtests/extA1.xul => dom/xul/crashtests/extA1.xul
rename : content/xul/document/crashtests/extA2.xul => dom/xul/crashtests/extA2.xul
rename : content/xul/document/crashtests/extB1.xul => dom/xul/crashtests/extB1.xul
rename : content/xul/moz.build => dom/xul/moz.build
rename : content/xul/document/src/nsForwardReference.h => dom/xul/nsForwardReference.h
rename : content/xul/document/public/nsIController.idl => dom/xul/nsIController.idl
rename : content/xul/document/public/nsIControllers.idl => dom/xul/nsIControllers.idl
rename : content/xul/content/public/nsIXULContextMenuBuilder.idl => dom/xul/nsIXULContextMenuBuilder.idl
rename : content/xul/document/public/nsIXULDocument.h => dom/xul/nsIXULDocument.h
rename : content/xul/document/public/nsIXULOverlayProvider.idl => dom/xul/nsIXULOverlayProvider.idl
rename : content/xul/document/src/nsXULCommandDispatcher.cpp => dom/xul/nsXULCommandDispatcher.cpp
rename : content/xul/document/src/nsXULCommandDispatcher.h => dom/xul/nsXULCommandDispatcher.h
rename : content/xul/document/src/nsXULContentSink.cpp => dom/xul/nsXULContentSink.cpp
rename : content/xul/document/src/nsXULContentSink.h => dom/xul/nsXULContentSink.h
rename : content/xul/content/src/nsXULContextMenuBuilder.cpp => dom/xul/nsXULContextMenuBuilder.cpp
rename : content/xul/content/src/nsXULContextMenuBuilder.h => dom/xul/nsXULContextMenuBuilder.h
rename : content/xul/document/src/nsXULControllers.cpp => dom/xul/nsXULControllers.cpp
rename : content/xul/document/src/nsXULControllers.h => dom/xul/nsXULControllers.h
rename : content/xul/content/src/nsXULElement.cpp => dom/xul/nsXULElement.cpp
rename : content/xul/content/src/nsXULElement.h => dom/xul/nsXULElement.h
rename : content/xul/content/src/nsXULPopupListener.cpp => dom/xul/nsXULPopupListener.cpp
rename : content/xul/content/src/nsXULPopupListener.h => dom/xul/nsXULPopupListener.h
rename : content/xul/document/src/nsXULPrototypeCache.cpp => dom/xul/nsXULPrototypeCache.cpp
rename : content/xul/document/src/nsXULPrototypeCache.h => dom/xul/nsXULPrototypeCache.h
rename : content/xul/document/src/nsXULPrototypeDocument.cpp => dom/xul/nsXULPrototypeDocument.cpp
rename : content/xul/document/src/nsXULPrototypeDocument.h => dom/xul/nsXULPrototypeDocument.h
rename : content/xul/templates/src/crashtests/257752-1-recursion.rdf => dom/xul/templates/crashtests/257752-1-recursion.rdf
rename : content/xul/templates/src/crashtests/257752-1-recursion.xul => dom/xul/templates/crashtests/257752-1-recursion.xul
rename : content/xul/templates/src/crashtests/329884-1.xul => dom/xul/templates/crashtests/329884-1.xul
rename : content/xul/templates/src/crashtests/330012-1.rdf => dom/xul/templates/crashtests/330012-1.rdf
rename : content/xul/templates/src/crashtests/330012-1.xul => dom/xul/templates/crashtests/330012-1.xul
rename : content/xul/templates/src/crashtests/404346-1.xul => dom/xul/templates/crashtests/404346-1.xul
rename : content/xul/templates/src/crashtests/415019-1.xul => dom/xul/templates/crashtests/415019-1.xul
rename : content/xul/templates/src/crashtests/417840-1.xul => dom/xul/templates/crashtests/417840-1.xul
rename : content/xul/templates/src/crashtests/424418-1.xul => dom/xul/templates/crashtests/424418-1.xul
rename : content/xul/templates/src/crashtests/crashtests.list => dom/xul/templates/crashtests/crashtests.list
rename : content/xul/templates/moz.build => dom/xul/templates/moz.build
rename : content/xul/templates/src/nsContentSupportMap.cpp => dom/xul/templates/nsContentSupportMap.cpp
rename : content/xul/templates/src/nsContentSupportMap.h => dom/xul/templates/nsContentSupportMap.h
rename : content/xul/templates/src/nsContentTestNode.cpp => dom/xul/templates/nsContentTestNode.cpp
rename : content/xul/templates/src/nsContentTestNode.h => dom/xul/templates/nsContentTestNode.h
rename : content/xul/templates/public/nsIXULBuilderListener.idl => dom/xul/templates/nsIXULBuilderListener.idl
rename : content/xul/templates/public/nsIXULSortService.idl => dom/xul/templates/nsIXULSortService.idl
rename : content/xul/templates/public/nsIXULTemplateBuilder.idl => dom/xul/templates/nsIXULTemplateBuilder.idl
rename : content/xul/templates/public/nsIXULTemplateQueryProcessor.idl => dom/xul/templates/nsIXULTemplateQueryProcessor.idl
rename : content/xul/templates/public/nsIXULTemplateResult.idl => dom/xul/templates/nsIXULTemplateResult.idl
rename : content/xul/templates/public/nsIXULTemplateRuleFilter.idl => dom/xul/templates/nsIXULTemplateRuleFilter.idl
rename : content/xul/templates/src/nsInstantiationNode.cpp => dom/xul/templates/nsInstantiationNode.cpp
rename : content/xul/templates/src/nsInstantiationNode.h => dom/xul/templates/nsInstantiationNode.h
rename : content/xul/templates/src/nsRDFBinding.cpp => dom/xul/templates/nsRDFBinding.cpp
rename : content/xul/templates/src/nsRDFBinding.h => dom/xul/templates/nsRDFBinding.h
rename : content/xul/templates/src/nsRDFConInstanceTestNode.cpp => dom/xul/templates/nsRDFConInstanceTestNode.cpp
rename : content/xul/templates/src/nsRDFConInstanceTestNode.h => dom/xul/templates/nsRDFConInstanceTestNode.h
rename : content/xul/templates/src/nsRDFConMemberTestNode.cpp => dom/xul/templates/nsRDFConMemberTestNode.cpp
rename : content/xul/templates/src/nsRDFConMemberTestNode.h => dom/xul/templates/nsRDFConMemberTestNode.h
rename : content/xul/templates/src/nsRDFPropertyTestNode.cpp => dom/xul/templates/nsRDFPropertyTestNode.cpp
rename : content/xul/templates/src/nsRDFPropertyTestNode.h => dom/xul/templates/nsRDFPropertyTestNode.h
rename : content/xul/templates/src/nsRDFQuery.cpp => dom/xul/templates/nsRDFQuery.cpp
rename : content/xul/templates/src/nsRDFQuery.h => dom/xul/templates/nsRDFQuery.h
rename : content/xul/templates/src/nsRDFTestNode.h => dom/xul/templates/nsRDFTestNode.h
rename : content/xul/templates/src/nsResourceSet.cpp => dom/xul/templates/nsResourceSet.cpp
rename : content/xul/templates/src/nsResourceSet.h => dom/xul/templates/nsResourceSet.h
rename : content/xul/templates/src/nsRuleNetwork.cpp => dom/xul/templates/nsRuleNetwork.cpp
rename : content/xul/templates/src/nsRuleNetwork.h => dom/xul/templates/nsRuleNetwork.h
rename : content/xul/templates/src/nsTemplateMap.h => dom/xul/templates/nsTemplateMap.h
rename : content/xul/templates/src/nsTemplateMatch.cpp => dom/xul/templates/nsTemplateMatch.cpp
rename : content/xul/templates/src/nsTemplateMatch.h => dom/xul/templates/nsTemplateMatch.h
rename : content/xul/templates/src/nsTemplateRule.cpp => dom/xul/templates/nsTemplateRule.cpp
rename : content/xul/templates/src/nsTemplateRule.h => dom/xul/templates/nsTemplateRule.h
rename : content/xul/templates/src/nsTreeRows.cpp => dom/xul/templates/nsTreeRows.cpp
rename : content/xul/templates/src/nsTreeRows.h => dom/xul/templates/nsTreeRows.h
rename : content/xul/templates/src/nsXMLBinding.cpp => dom/xul/templates/nsXMLBinding.cpp
rename : content/xul/templates/src/nsXMLBinding.h => dom/xul/templates/nsXMLBinding.h
rename : content/xul/templates/src/nsXULContentBuilder.cpp => dom/xul/templates/nsXULContentBuilder.cpp
rename : content/xul/templates/src/nsXULContentUtils.cpp => dom/xul/templates/nsXULContentUtils.cpp
rename : content/xul/templates/src/nsXULContentUtils.h => dom/xul/templates/nsXULContentUtils.h
rename : content/xul/templates/src/nsXULResourceList.h => dom/xul/templates/nsXULResourceList.h
rename : content/xul/templates/src/nsXULSortService.cpp => dom/xul/templates/nsXULSortService.cpp
rename : content/xul/templates/src/nsXULSortService.h => dom/xul/templates/nsXULSortService.h
rename : content/xul/templates/src/nsXULTemplateBuilder.cpp => dom/xul/templates/nsXULTemplateBuilder.cpp
rename : content/xul/templates/src/nsXULTemplateBuilder.h => dom/xul/templates/nsXULTemplateBuilder.h
rename : content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp => dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
rename : content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h => dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
rename : content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp => dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
rename : content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h => dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
rename : content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp => dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
rename : content/xul/templates/src/nsXULTemplateQueryProcessorXML.h => dom/xul/templates/nsXULTemplateQueryProcessorXML.h
rename : content/xul/templates/src/nsXULTemplateResultRDF.cpp => dom/xul/templates/nsXULTemplateResultRDF.cpp
rename : content/xul/templates/src/nsXULTemplateResultRDF.h => dom/xul/templates/nsXULTemplateResultRDF.h
rename : content/xul/templates/src/nsXULTemplateResultSetRDF.cpp => dom/xul/templates/nsXULTemplateResultSetRDF.cpp
rename : content/xul/templates/src/nsXULTemplateResultSetRDF.h => dom/xul/templates/nsXULTemplateResultSetRDF.h
rename : content/xul/templates/src/nsXULTemplateResultStorage.cpp => dom/xul/templates/nsXULTemplateResultStorage.cpp
rename : content/xul/templates/src/nsXULTemplateResultStorage.h => dom/xul/templates/nsXULTemplateResultStorage.h
rename : content/xul/templates/src/nsXULTemplateResultXML.cpp => dom/xul/templates/nsXULTemplateResultXML.cpp
rename : content/xul/templates/src/nsXULTemplateResultXML.h => dom/xul/templates/nsXULTemplateResultXML.h
rename : content/xul/templates/src/nsXULTreeBuilder.cpp => dom/xul/templates/nsXULTreeBuilder.cpp
rename : content/xul/templates/tests/chrome/animals.rdf => dom/xul/templates/tests/chrome/animals.rdf
rename : content/xul/templates/tests/chrome/animals.sqlite => dom/xul/templates/tests/chrome/animals.sqlite
rename : content/xul/templates/tests/chrome/animals.xml => dom/xul/templates/tests/chrome/animals.xml
rename : content/xul/templates/tests/chrome/bug441785-1.rdf => dom/xul/templates/tests/chrome/bug441785-1.rdf
rename : content/xul/templates/tests/chrome/bug441785-2.rdf => dom/xul/templates/tests/chrome/bug441785-2.rdf
rename : content/xul/templates/tests/chrome/chrome.ini => dom/xul/templates/tests/chrome/chrome.ini
rename : content/xul/templates/tests/chrome/file_bug330010.rdf => dom/xul/templates/tests/chrome/file_bug330010.rdf
rename : content/xul/templates/tests/chrome/templates_shared.js => dom/xul/templates/tests/chrome/templates_shared.js
rename : content/xul/templates/tests/chrome/test_bug329335.xul => dom/xul/templates/tests/chrome/test_bug329335.xul
rename : content/xul/templates/tests/chrome/test_bug330010.xul => dom/xul/templates/tests/chrome/test_bug330010.xul
rename : content/xul/templates/tests/chrome/test_bug397148.xul => dom/xul/templates/tests/chrome/test_bug397148.xul
rename : content/xul/templates/tests/chrome/test_bug441785.xul => dom/xul/templates/tests/chrome/test_bug441785.xul
rename : content/xul/templates/tests/chrome/test_bug476634.xul => dom/xul/templates/tests/chrome/test_bug476634.xul
rename : content/xul/templates/tests/chrome/test_sortservice.xul => dom/xul/templates/tests/chrome/test_sortservice.xul
rename : content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul => dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul => dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
rename : content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul => dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul => dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
rename : content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul => dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
rename : content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul => dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
rename : content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul => dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
rename : content/xul/templates/tests/chrome/test_tmpl_errors.xul => dom/xul/templates/tests/chrome/test_tmpl_errors.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
rename : content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul => dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
rename : content/xul/templates/tests/chrome/test_tmpl_gridelement.xul => dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
rename : content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul => dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
rename : content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul => dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
rename : content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul => dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
rename : content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul => dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
rename : content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul => dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
rename : content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul => dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
rename : content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul => dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
rename : content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul => dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
rename : content/xul/templates/tests/chrome/test_tmpl_menuelement.xul => dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
rename : content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul => dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
rename : content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul => dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
rename : content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul => dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
rename : content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul => dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
rename : content/xul/templates/tests/chrome/test_tmpl_noaction.xul => dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
rename : content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul => dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
rename : content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul => dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
rename : content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul => dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
rename : content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_query3triples.xul => dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
rename : content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul => dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul => dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul => dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul => dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul => dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
rename : content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul => dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul => dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysetone.xul => dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul => dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul => dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul => dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul => dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul => dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul => dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul => dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul => dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul => dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul => dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
rename : content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul => dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
rename : content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul => dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul => dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
rename : content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul => dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
rename : content/xul/templates/tests/chrome/test_tmpl_regenerate.xul => dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
rename : content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul => dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
rename : content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul => dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul => dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul => dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
rename : content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul => dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
rename : content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul => dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
rename : content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul => dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul => dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul => dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul => dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul => dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul => dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul => dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul => dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequals.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul => dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul => dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul => dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul => dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul => dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
rename : content/xul/templates/tests/chrome/test_tmpl_whereless.xul => dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul => dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul => dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul => dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul => dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul => dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul => dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul => dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
rename : content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul => dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
rename : content/xul/content/test/398289-resource.xul => dom/xul/test/398289-resource.xul
rename : content/xul/document/test/bug497875-iframe.xul => dom/xul/test/bug497875-iframe.xul
rename : content/xul/content/test/chrome.ini => dom/xul/test/chrome.ini
rename : content/xul/content/test/file_bug236853.rdf => dom/xul/test/file_bug236853.rdf
rename : content/xul/content/test/mochitest.ini => dom/xul/test/mochitest.ini
rename : content/xul/document/test/overlay1_bug335375.xul => dom/xul/test/overlay1_bug335375.xul
rename : content/xul/document/test/overlay2_bug335375.xul => dom/xul/test/overlay2_bug335375.xul
rename : content/xul/document/test/overlay_640158.xul => dom/xul/test/overlay_640158.xul
rename : content/xul/document/test/test_bug199692.xul => dom/xul/test/test_bug199692.xul
rename : content/xul/content/test/test_bug233643.xul => dom/xul/test/test_bug233643.xul
rename : content/xul/content/test/test_bug236853.xul => dom/xul/test/test_bug236853.xul
rename : content/xul/document/test/test_bug311681.xul => dom/xul/test/test_bug311681.xul
rename : content/xul/document/test/test_bug335375.xul => dom/xul/test/test_bug335375.xul
rename : content/xul/document/test/test_bug391002.xul => dom/xul/test/test_bug391002.xul
rename : content/xul/content/test/test_bug398289.html => dom/xul/test/test_bug398289.html
rename : content/xul/document/test/test_bug403868.xul => dom/xul/test/test_bug403868.xul
rename : content/xul/document/test/test_bug414907.xul => dom/xul/test/test_bug414907.xul
rename : content/xul/document/test/test_bug418216.xul => dom/xul/test/test_bug418216.xul
rename : content/xul/document/test/test_bug445177.xul => dom/xul/test/test_bug445177.xul
rename : content/xul/document/test/test_bug449457.xul => dom/xul/test/test_bug449457.xul
rename : content/xul/document/test/test_bug468176.xul => dom/xul/test/test_bug468176.xul
rename : content/xul/content/test/test_bug486990.xul => dom/xul/test/test_bug486990.xul
rename : content/xul/document/test/test_bug497875.xul => dom/xul/test/test_bug497875.xul
rename : content/xul/document/test/test_bug583948.xul => dom/xul/test/test_bug583948.xul
rename : content/xul/document/test/test_bug640158_overlay_persist.xul => dom/xul/test/test_bug640158_overlay_persist.xul
rename : content/xul/content/test/test_bug749367.xul => dom/xul/test/test_bug749367.xul
rename : content/xul/document/test/test_bug757137.xul => dom/xul/test/test_bug757137.xul
rename : content/xul/content/test/test_bug775972.xul => dom/xul/test/test_bug775972.xul
rename : content/xul/content/test/test_import_xul_to_content.xul => dom/xul/test/test_import_xul_to_content.xul
rename : content/xul/document/test/window_bug583948.xul => dom/xul/test/window_bug583948.xul
rename : content/xul/document/test/window_bug757137.xul => dom/xul/test/window_bug757137.xul
---
 b2g/installer/package-manifest.in             |   1 -
 browser/installer/package-manifest.in         |   1 -
 content/base/src/moz.build                    |   3 +-
 content/html/content/src/moz.build            |   2 +-
 content/moz.build                             |   1 -
 content/xul/content/moz.build                 |  11 ------
 content/xul/content/public/moz.build          |  13 -------
 content/xul/content/src/moz.build             |  30 ---------------
 content/xul/content/test/chrome.ini           |  10 -----
 .../xul/document/crashtests/crashtests.list   |   9 -----
 content/xul/document/moz.build                |   9 -----
 content/xul/document/public/moz.build         |  21 -----------
 content/xul/moz.build                         |  14 -------
 content/xul/templates/moz.build               |   9 -----
 content/xul/templates/public/moz.build        |  17 ---------
 dom/base/moz.build                            |   2 +-
 dom/bindings/moz.build                        |   3 +-
 dom/canvas/moz.build                          |   2 +-
 dom/events/moz.build                          |   2 +-
 dom/moz.build                                 |   1 +
 dom/xbl/moz.build                             |   3 +-
 dom/xml/moz.build                             |   2 +-
 .../document/src => dom/xul}/XULDocument.cpp  |   0
 .../document/src => dom/xul}/XULDocument.h    |   0
 .../xul}/crashtests/107518-1.xml              |   0
 .../xul}/crashtests/252448-1.xul              |   0
 .../xul}/crashtests/253479-1.xul              |   0
 .../xul}/crashtests/253479-2.xul              |   0
 .../xul}/crashtests/326204-1.xul              |   0
 .../xul}/crashtests/326644-1-inner.xul        |   0
 .../xul}/crashtests/326644-1.html             |   0
 .../xul}/crashtests/326644-2-inner.xul        |   0
 .../xul}/crashtests/326644-2.html             |   0
 .../xul}/crashtests/326864-1.xul              |   0
 .../xul}/crashtests/326875-1.xul              |   0
 .../xul}/crashtests/326881-1.xul              |   0
 .../xul}/crashtests/329982-1.xhtml            |   0
 .../xul}/crashtests/336096-1.xhtml            |   0
 .../xul}/crashtests/344215-1.xul              |   0
 .../xul}/crashtests/354611-1.html             |   0
 .../xul}/crashtests/360078-1.xhtml            |   0
 .../xul}/crashtests/360078-1xbl.xml           |   0
 .../xul}/crashtests/363791-1.xul              |   0
 .../xul}/crashtests/384740-1.xul              |   0
 .../xul}/crashtests/384877-1-inner.xul        |   0
 .../xul}/crashtests/384877-1.html             |   0
 .../xul}/crashtests/386914-1-inner.xul        |   0
 .../xul}/crashtests/386914-1.html             |   0
 .../xul}/crashtests/386947-1.xul              |   0
 .../xul}/crashtests/425821-1.xul              |   0
 .../xul}/crashtests/428951-1.xul              |   0
 .../xul}/crashtests/429085-1.xhtml            |   0
 .../xul}/crashtests/431906-1-inner.xul        |   0
 .../xul}/crashtests/431906-1.html             |   0
 .../xul}/crashtests/451311-1.xul              |   0
 .../xul}/crashtests/461917-1.xhtml            |   0
 .../xul}/crashtests/468211-1.xul              |   0
 .../xul}/crashtests/468211-2-binding.xml      |   0
 .../xul}/crashtests/468211-2.xul              |   0
 .../xul}/crashtests/468211-3.xul              |   0
 .../xul}/crashtests/495635-1.xul              |   0
 .../xul}/crashtests/509719-1-overlay.xul      |   0
 .../xul}/crashtests/509719-1.xul              |   0
 .../xul}/crashtests/509719-2-overlay.xul      |   0
 .../xul}/crashtests/509719-2.xul              |   0
 .../xul}/crashtests/583230.xul                |   0
 .../xul}/crashtests/crashtests.list           |   9 +++++
 .../document => dom/xul}/crashtests/extA1.xul |   0
 .../document => dom/xul}/crashtests/extA2.xul |   0
 .../document => dom/xul}/crashtests/extB1.xul |   0
 .../xul/document/src => dom/xul}/moz.build    |  35 +++++++++++++++---
 .../src => dom/xul}/nsForwardReference.h      |   0
 .../public => dom/xul}/nsIController.idl      |   0
 .../public => dom/xul}/nsIControllers.idl     |   0
 .../xul}/nsIXULContextMenuBuilder.idl         |   0
 .../public => dom/xul}/nsIXULDocument.h       |   0
 .../xul}/nsIXULOverlayProvider.idl            |   0
 .../xul}/nsXULCommandDispatcher.cpp           |   0
 .../src => dom/xul}/nsXULCommandDispatcher.h  |   0
 .../src => dom/xul}/nsXULContentSink.cpp      |   0
 .../src => dom/xul}/nsXULContentSink.h        |   0
 .../xul}/nsXULContextMenuBuilder.cpp          |   0
 .../src => dom/xul}/nsXULContextMenuBuilder.h |   0
 .../src => dom/xul}/nsXULControllers.cpp      |   0
 .../src => dom/xul}/nsXULControllers.h        |   0
 .../content/src => dom/xul}/nsXULElement.cpp  |   0
 .../content/src => dom/xul}/nsXULElement.h    |   0
 .../src => dom/xul}/nsXULPopupListener.cpp    |   0
 .../src => dom/xul}/nsXULPopupListener.h      |   0
 .../src => dom/xul}/nsXULPrototypeCache.cpp   |   0
 .../src => dom/xul}/nsXULPrototypeCache.h     |   0
 .../xul}/nsXULPrototypeDocument.cpp           |   0
 .../src => dom/xul}/nsXULPrototypeDocument.h  |   0
 .../crashtests/257752-1-recursion.rdf         |   0
 .../crashtests/257752-1-recursion.xul         |   0
 .../xul/templates}/crashtests/329884-1.xul    |   0
 .../xul/templates}/crashtests/330012-1.rdf    |   0
 .../xul/templates}/crashtests/330012-1.xul    |   0
 .../xul/templates}/crashtests/404346-1.xul    |   0
 .../xul/templates}/crashtests/415019-1.xul    |   0
 .../xul/templates}/crashtests/417840-1.xul    |   0
 .../xul/templates}/crashtests/424418-1.xul    |   0
 .../xul/templates}/crashtests/crashtests.list |   0
 .../src => dom/xul/templates}/moz.build       |  15 +++++++-
 .../xul/templates}/nsContentSupportMap.cpp    |   0
 .../xul/templates}/nsContentSupportMap.h      |   0
 .../xul/templates}/nsContentTestNode.cpp      |   0
 .../xul/templates}/nsContentTestNode.h        |   0
 .../xul/templates}/nsIXULBuilderListener.idl  |   0
 .../xul/templates}/nsIXULSortService.idl      |   0
 .../xul/templates}/nsIXULTemplateBuilder.idl  |   0
 .../nsIXULTemplateQueryProcessor.idl          |   0
 .../xul/templates}/nsIXULTemplateResult.idl   |   0
 .../templates}/nsIXULTemplateRuleFilter.idl   |   0
 .../xul/templates}/nsInstantiationNode.cpp    |   0
 .../xul/templates}/nsInstantiationNode.h      |   0
 .../xul/templates}/nsRDFBinding.cpp           |   0
 .../src => dom/xul/templates}/nsRDFBinding.h  |   0
 .../templates}/nsRDFConInstanceTestNode.cpp   |   0
 .../xul/templates}/nsRDFConInstanceTestNode.h |   0
 .../xul/templates}/nsRDFConMemberTestNode.cpp |   0
 .../xul/templates}/nsRDFConMemberTestNode.h   |   0
 .../xul/templates}/nsRDFPropertyTestNode.cpp  |   0
 .../xul/templates}/nsRDFPropertyTestNode.h    |   0
 .../src => dom/xul/templates}/nsRDFQuery.cpp  |   0
 .../src => dom/xul/templates}/nsRDFQuery.h    |   0
 .../src => dom/xul/templates}/nsRDFTestNode.h |   0
 .../xul/templates}/nsResourceSet.cpp          |   0
 .../src => dom/xul/templates}/nsResourceSet.h |   0
 .../xul/templates}/nsRuleNetwork.cpp          |   0
 .../src => dom/xul/templates}/nsRuleNetwork.h |   0
 .../src => dom/xul/templates}/nsTemplateMap.h |   0
 .../xul/templates}/nsTemplateMatch.cpp        |   0
 .../xul/templates}/nsTemplateMatch.h          |   0
 .../xul/templates}/nsTemplateRule.cpp         |   0
 .../xul/templates}/nsTemplateRule.h           |   0
 .../src => dom/xul/templates}/nsTreeRows.cpp  |   0
 .../src => dom/xul/templates}/nsTreeRows.h    |   0
 .../xul/templates}/nsXMLBinding.cpp           |   0
 .../src => dom/xul/templates}/nsXMLBinding.h  |   0
 .../xul/templates}/nsXULContentBuilder.cpp    |   0
 .../xul/templates}/nsXULContentUtils.cpp      |   0
 .../xul/templates}/nsXULContentUtils.h        |   0
 .../xul/templates}/nsXULResourceList.h        |   0
 .../xul/templates}/nsXULSortService.cpp       |   0
 .../xul/templates}/nsXULSortService.h         |   0
 .../xul/templates}/nsXULTemplateBuilder.cpp   |   0
 .../xul/templates}/nsXULTemplateBuilder.h     |   0
 .../nsXULTemplateQueryProcessorRDF.cpp        |   0
 .../nsXULTemplateQueryProcessorRDF.h          |   0
 .../nsXULTemplateQueryProcessorStorage.cpp    |   0
 .../nsXULTemplateQueryProcessorStorage.h      |   0
 .../nsXULTemplateQueryProcessorXML.cpp        |   0
 .../nsXULTemplateQueryProcessorXML.h          |   0
 .../xul/templates}/nsXULTemplateResultRDF.cpp |   0
 .../xul/templates}/nsXULTemplateResultRDF.h   |   0
 .../templates}/nsXULTemplateResultSetRDF.cpp  |   0
 .../templates}/nsXULTemplateResultSetRDF.h    |   0
 .../templates}/nsXULTemplateResultStorage.cpp |   0
 .../templates}/nsXULTemplateResultStorage.h   |   0
 .../xul/templates}/nsXULTemplateResultXML.cpp |   0
 .../xul/templates}/nsXULTemplateResultXML.h   |   0
 .../xul/templates}/nsXULTreeBuilder.cpp       |   0
 .../xul/templates/tests/chrome/animals.rdf    |   0
 .../xul/templates/tests/chrome/animals.sqlite | Bin
 .../xul/templates/tests/chrome/animals.xml    |   0
 .../templates/tests/chrome/bug441785-1.rdf    |   0
 .../templates/tests/chrome/bug441785-2.rdf    |   0
 .../xul/templates/tests/chrome/chrome.ini     |   0
 .../templates/tests/chrome/file_bug330010.rdf |   0
 .../tests/chrome/templates_shared.js          |   0
 .../templates/tests/chrome/test_bug329335.xul |   0
 .../templates/tests/chrome/test_bug330010.xul |   0
 .../templates/tests/chrome/test_bug397148.xul |   0
 .../templates/tests/chrome/test_bug441785.xul |   0
 .../templates/tests/chrome/test_bug476634.xul |   0
 .../tests/chrome/test_sortservice.xul         |   0
 .../test_tmpl_bindingsextendedsyntax.xul      |   0
 .../chrome/test_tmpl_bindingsmultiple.xul     |   0
 .../chrome/test_tmpl_bindingsquerysyntax.xul  |   0
 .../chrome/test_tmpl_bindingsreversed.xul     |   0
 .../chrome/test_tmpl_bindingssameastriple.xul |   0
 ...tmpl_containerandmembervariablechanged.xul |   0
 .../test_tmpl_containervariablechanged.xul    |   0
 .../chrome/test_tmpl_containmentattribute.xul |   0
 ...est_tmpl_defaultcontainervariableisuri.xul |   0
 .../tests/chrome/test_tmpl_errors.xul         |   0
 .../tests/chrome/test_tmpl_extendedsyntax.xul |   0
 ...est_tmpl_extendedsyntaxemptyconditions.xul |   0
 ...st_tmpl_extendedsyntaxotherrefvariable.xul |   0
 ...est_tmpl_extendedsyntaxremoveunmatched.xul |   0
 ...tendedsyntaxsimplevariablesubstitution.xul |   0
 ...est_tmpl_extendedsyntaxtworulesrecurse.xul |   0
 ...endedsyntaxusinganinterveningcontainer.xul |   0
 ...test_tmpl_extendedvariablesubstitution.xul |   0
 .../tests/chrome/test_tmpl_gridelement.xul    |   0
 ...l_htmlelementextendedsyntaxwithbinding.xul |   0
 ...t_tmpl_htmlelementquerysyntaxrecursive.xul |   0
 ...tmlelementquerysyntaxwithmultiplerules.xul |   0
 .../test_tmpl_htmlelementsimplesyntax.xul     |   0
 ..._htmlelementsimplesyntaxusingatextnode.xul |   0
 .../tests/chrome/test_tmpl_invalidqp.xul      |   0
 .../tests/chrome/test_tmpl_listboxelement.xul |   0
 .../chrome/test_tmpl_literalasmember.xul      |   0
 .../test_tmpl_membervariablechanged.xul       |   0
 .../test_tmpl_membervariablesubstitution.xul  |   0
 .../tests/chrome/test_tmpl_menuelement.xul    |   0
 .../chrome/test_tmpl_menuelementrecursive.xul |   0
 .../chrome/test_tmpl_menulistelement.xul      |   0
 .../test_tmpl_mixedsyntaxiscontainer.xul      |   0
 ...est_tmpl_mixedsyntaxiscontainerisempty.xul |   0
 .../chrome/test_tmpl_mixedsyntaxisempty.xul   |   0
 .../tests/chrome/test_tmpl_noaction.xul       |   0
 .../chrome/test_tmpl_noactionuriattribute.xul |   0
 .../chrome/test_tmpl_parentconditions.xul     |   0
 .../chrome/test_tmpl_parentcontenttag.xul     |   0
 .../chrome/test_tmpl_parentsimplesyntax.xul   |   0
 .../tests/chrome/test_tmpl_query3triples.xul  |   0
 .../test_tmpl_query3tripleswherecontains.xul  |   0
 ...st_tmpl_querymember3tripleswhereequals.xul |   0
 .../test_tmpl_querymemberandtwotriples.xul    |   0
 ...est_tmpl_querymembertriplemembertriple.xul |   0
 .../chrome/test_tmpl_queryresourcematch.xul   |   0
 .../chrome/test_tmpl_queryreversetriple.xul   |   0
 .../chrome/test_tmpl_queryselfwithtriple.xul  |   0
 .../tests/chrome/test_tmpl_querysetone.xul    |   0
 .../tests/chrome/test_tmpl_querysettwo.xul    |   0
 .../test_tmpl_querysettwowithcondition.xul    |   0
 .../tests/chrome/test_tmpl_querysyntax.xul    |   0
 .../test_tmpl_querysyntaxmultiplerules.xul    |   0
 ...rysyntaxmultiplerulesfirstconditionall.xul |   0
 ..._querysyntaxmultiplerulestwoconditions.xul |   0
 .../test_tmpl_querytripleandmembermerge.xul   |   0
 .../test_tmpl_querytripleobjecttosubject.xul  |   0
 .../chrome/test_tmpl_querytwomembers.xul      |   0
 .../test_tmpl_querytwomembersfiltered.xul     |   0
 .../chrome/test_tmpl_querytwotriples.xul      |   0
 .../chrome/test_tmpl_queryupwardsmember.xul   |   0
 ...yupwardsmembertripleandfilteringtriple.xul |   0
 .../test_tmpl_querywithemptyconditions.xul    |   0
 .../chrome/test_tmpl_referenceasmember.xul    |   0
 .../tests/chrome/test_tmpl_regenerate.xul     |   0
 ...test_tmpl_selfgenerationextendedsyntax.xul |   0
 .../test_tmpl_selfgenerationsimplesyntax.xul  |   0
 ..._tmpl_simplesyntaxenclosedinacontainer.xul |   0
 ...plesyntaxenclosedinacontainerwitharule.xul |   0
 .../chrome/test_tmpl_simplesyntaxfilter.xul   |   0
 ...pl_simplesyntaxfilterwithmultiplerules.xul |   0
 .../test_tmpl_simplesyntaxfilterwithrule.xul  |   0
 ..._simplesyntaxiteratingoverasinglevalue.xul |   0
 ...implesyntaxusinganinterveningcontainer.xul |   0
 .../test_tmpl_simplesyntaxusingatextnode.xul  |   0
 ...axusingcontainerasthegenerationelement.xul |   0
 ...test_tmpl_simplesyntaxusingdontrecurse.xul |   0
 ...l_simplesyntaxusingrecursivegeneration.xul |   0
 ...plesyntaxusingrecursivegenerationagain.xul |   0
 ..._tmpl_simplesyntaxwithtwovariablesused.xul |   0
 ...blesubstitutioncaretsatbeginningandend.xul |   0
 ...evariablesubstitutioncaretsubstitution.xul |   0
 ...l_simplevariablesubstitutionnovariable.xul |   0
 ...bstitutionquestionmarkaspartofvariable.xul |   0
 ...lesubstitutionquestionmarksubstitution.xul |   0
 ...plevariablesubstitutiontextandvariable.xul |   0
 ...ubstitutionvariableandtextconcatenated.xul |   0
 ...iablesubstitutionvariablesconcatenated.xul |   0
 .../chrome/test_tmpl_sortascendinginteger.xul |   0
 .../test_tmpl_sortascendingquerysyntax.xul    |   0
 ..._tmpl_sortascendingtworulesquerysyntax.xul |   0
 ...endingtworuleswithcontainerquerysyntax.xul |   0
 ...ruleswithdifferentcontainerquerysyntax.xul |   0
 .../test_tmpl_sortdescendingquerysyntax.xul   |   0
 ...test_tmpl_sortquerymemberandtwotriples.xul |   0
 ...pl_sortresource2descendingsimplesyntax.xul |   0
 ...rce2settopredicateascendingquerysyntax.xul |   0
 ...ce2settopredicatedescendingquerysyntax.xul |   0
 ..._tmpl_sortresourceascendingquerysyntax.xul |   0
 ...tmpl_sortresourcedescendingquerysyntax.xul |   0
 ...urcesettopredicateascendingquerysyntax.xul |   0
 ...rcesettopredicatedescendingquerysyntax.xul |   0
 ...ingsettopredicatedescendingquerysyntax.xul |   0
 ...rcessettopredicateascendingquerysyntax.xul |   0
 ...l_sorttwovariablesascendingquerysyntax.xul |   0
 ..._sorttwovariablesascendingsimplesyntax.xul |   0
 ..._sorttwovariablesdescendingquerysyntax.xul |   0
 ...t_tmpl_sortunknownascendingquerysyntax.xul |   0
 .../test_tmpl_storage_bad_parameters.xul      |   0
 .../test_tmpl_storage_bad_parameters_2.xul    |   0
 .../test_tmpl_storage_bad_parameters_3.xul    |   0
 .../test_tmpl_storage_baddatasource.xul       |   0
 .../chrome/test_tmpl_storage_badquery.xul     |   0
 .../test_tmpl_storage_dynamicparameters.xul   |   0
 .../chrome/test_tmpl_storage_listbox.xul      |   0
 .../chrome/test_tmpl_storage_multiqueries.xul |   0
 .../chrome/test_tmpl_storage_parameters.xul   |   0
 .../tests/chrome/test_tmpl_storage_rule.xul   |   0
 .../tests/chrome/test_tmpl_storage_simple.xul |   0
 .../test_tmpl_storage_sortintegerasc.xul      |   0
 .../test_tmpl_storage_sortintegerdesc.xul     |   0
 .../test_tmpl_storage_sortstringasc.xul       |   0
 .../test_tmpl_storage_sortstringdesc.xul      |   0
 .../tests/chrome/test_tmpl_storage_tree.xul   |   0
 .../test_tmpl_treeelementquerysyntax.xul      |   0
 ...mpl_treeelementquerysyntaxnotrecursive.xul |   0
 ...mentquerysyntaxnotrecursivetreebuilder.xul |   0
 ...t_tmpl_treeelementquerysyntaxrecursive.xul |   0
 ...ementquerysyntaxrecursivemultiplerules.xul |   0
 ...yntaxrecursivemultiplerulestreebuilder.xul |   0
 ...elementquerysyntaxrecursivetreebuilder.xul |   0
 ...tmpl_treeelementquerysyntaxtreebuilder.xul |   0
 ...pl_treeelementsimplesyntaxnotrecursive.xul |   0
 ...entsimplesyntaxnotrecursivetreebuilder.xul |   0
 ..._tmpl_treeelementsimplesyntaxrecursive.xul |   0
 ...lementsimplesyntaxrecursivetreebuilder.xul |   0
 .../chrome/test_tmpl_treeelementtreecell.xul  |   0
 ..._tmpl_treeelementtreecellsortascending.xul |   0
 ...lementtreecellsortascendingtreebuilder.xul |   0
 ...st_tmpl_treeelementtreecelltreebuilder.xul |   0
 .../test_tmpl_treeelementtreeitemonly.xul     |   0
 ..._tmpl_treeelementtreeitemsortascending.xul |   0
 .../chrome/test_tmpl_twogenerationnodes.xul   |   0
 .../chrome/test_tmpl_whereafterignorecase.xul |   0
 .../chrome/test_tmpl_whereafterlowercase.xul  |   0
 .../chrome/test_tmpl_whereafternegation.xul   |   0
 .../chrome/test_tmpl_whereafteruppercase.xul  |   0
 .../test_tmpl_wherebeforeignorecase.xul       |   0
 .../chrome/test_tmpl_wherebeforelowercase.xul |   0
 .../chrome/test_tmpl_wherebeforenegation.xul  |   0
 .../chrome/test_tmpl_wherebeforeuppercase.xul |   0
 .../tests/chrome/test_tmpl_wherecontains.xul  |   0
 .../test_tmpl_wherecontainsignorecase.xul     |   0
 .../test_tmpl_wherecontainsnegation.xul       |   0
 .../chrome/test_tmpl_wherecontainsnumber.xul  |   0
 .../test_tmpl_wherecontainsnumberstring.xul   |   0
 .../test_tmpl_wherecontainsresource.xul       |   0
 .../chrome/test_tmpl_wherecontainstwo.xul     |   0
 .../tests/chrome/test_tmpl_whereendswith.xul  |   0
 .../test_tmpl_whereendswithignorecase.xul     |   0
 .../test_tmpl_whereendswithnegation.xul       |   0
 .../tests/chrome/test_tmpl_whereequals.xul    |   0
 .../test_tmpl_whereequalsignorecase.xul       |   0
 .../chrome/test_tmpl_whereequalsmultiple.xul  |   0
 .../test_tmpl_whereequalsmultiplenegation.xul |   0
 ..._whereequalsmultiplenegationignorecase.xul |   0
 .../chrome/test_tmpl_whereequalsnegation.xul  |   0
 ...est_tmpl_whereequalsnegationignorecase.xul |   0
 ...test_tmpl_whereequalsnegationwrongcase.xul |   0
 .../chrome/test_tmpl_whereequalsnumber.xul    |   0
 .../test_tmpl_whereequalsothervariable.xul    |   0
 .../chrome/test_tmpl_whereequalsresource.xul  |   0
 .../test_tmpl_whereequalssamevariable.xul     |   0
 .../chrome/test_tmpl_whereequalswrongcase.xul |   0
 .../tests/chrome/test_tmpl_wheregreater.xul   |   0
 .../chrome/test_tmpl_wheregreaternegation.xul |   0
 .../test_tmpl_wheregreaternegationstring.xul  |   0
 .../chrome/test_tmpl_wheregreaterstring.xul   |   0
 .../tests/chrome/test_tmpl_whereless.xul      |   0
 .../chrome/test_tmpl_wherelessnegation.xul    |   0
 .../test_tmpl_wherelessnegationstring.xul     |   0
 .../chrome/test_tmpl_wherelessstring.xul      |   0
 .../tests/chrome/test_tmpl_wherenorel.xul     |   0
 .../tests/chrome/test_tmpl_wherenosubject.xul |   0
 .../tests/chrome/test_tmpl_wherenovalue.xul   |   0
 .../chrome/test_tmpl_wherestartswith.xul      |   0
 .../test_tmpl_wherestartswithignorecase.xul   |   0
 .../test_tmpl_wherestartswithmultiple.xul     |   0
 .../test_tmpl_wherestartswithnegation.xul     |   0
 ...st_tmpl_wherestartswithunknownvariable.xul |   0
 .../test_tmpl_wherestartswithvariable.xul     |   0
 .../test_tmpl_wheresubjectequalsvariable.xul  |   0
 ...st_tmpl_wheresubjectstartswithvariable.xul |   0
 .../tests/chrome/test_tmpl_xmlquerysimple.xul |   8 ++--
 .../chrome/test_tmpl_xmlquerywithassign.xul   |   8 ++--
 ...mpl_xmlquerywithassignmentandcondition.xul |   0
 ...ywithassignmentandconditiondontrecurse.xul |   0
 ...est_tmpl_xmlquerywithbindinginbindings.xul |   0
 .../test_tmpl_xmlquerywithbindinginrule.xul   |   0
 .../test_tmpl_xmlquerywithdifferentmember.xul |   8 ++--
 .../test_tmpl_xmlquerywithinlinedata.xul      |   0
 ...querywithinlinedatawithmultiplequeries.xul |   0
 .../test_tmpl_xmlquerywithmultiplequeries.xul |   8 ++--
 .../test_tmpl_xmlquerywithothertypes.xul      |   8 ++--
 .../chrome/test_tmpl_xmlquerywithsort.xul     |   8 ++--
 .../test_tmpl_xmlquerywithsortotherfield.xul  |   8 ++--
 .../xul}/test/398289-resource.xul             |   0
 .../xul}/test/bug497875-iframe.xul            |   0
 .../xul/document => dom/xul}/test/chrome.ini  |   7 ++++
 .../xul}/test/file_bug236853.rdf              |   0
 .../content => dom/xul}/test/mochitest.ini    |   0
 .../xul}/test/overlay1_bug335375.xul          |   0
 .../xul}/test/overlay2_bug335375.xul          |   0
 .../xul}/test/overlay_640158.xul              |   0
 .../xul}/test/test_bug199692.xul              |   0
 .../xul}/test/test_bug233643.xul              |   0
 .../xul}/test/test_bug236853.xul              |   0
 .../xul}/test/test_bug311681.xul              |   0
 .../xul}/test/test_bug335375.xul              |   0
 .../xul}/test/test_bug391002.xul              |   0
 .../xul}/test/test_bug398289.html             |   0
 .../xul}/test/test_bug403868.xul              |   0
 .../xul}/test/test_bug414907.xul              |   0
 .../xul}/test/test_bug418216.xul              |   0
 .../xul}/test/test_bug445177.xul              |   0
 .../xul}/test/test_bug449457.xul              |   0
 .../xul}/test/test_bug468176.xul              |   0
 .../xul}/test/test_bug486990.xul              |   0
 .../xul}/test/test_bug497875.xul              |   0
 .../xul}/test/test_bug583948.xul              |   0
 .../test/test_bug640158_overlay_persist.xul   |   0
 .../xul}/test/test_bug749367.xul              |   0
 .../xul}/test/test_bug757137.xul              |   0
 .../xul}/test/test_bug775972.xul              |   0
 .../xul}/test/test_import_xul_to_content.xul  |   0
 .../xul}/test/window_bug583948.xul            |   0
 .../xul}/test/window_bug757137.xul            |   0
 layout/build/moz.build                        |   5 +--
 layout/generic/moz.build                      |   2 +-
 layout/reftests/xul-document-load/readme.txt  |   2 +-
 layout/style/moz.build                        |   2 +-
 mobile/android/installer/package-manifest.in  |   1 -
 testing/crashtest/crashtests.list             |   5 +--
 420 files changed, 104 insertions(+), 201 deletions(-)
 delete mode 100644 content/xul/content/moz.build
 delete mode 100644 content/xul/content/public/moz.build
 delete mode 100644 content/xul/content/src/moz.build
 delete mode 100644 content/xul/content/test/chrome.ini
 delete mode 100644 content/xul/document/crashtests/crashtests.list
 delete mode 100644 content/xul/document/moz.build
 delete mode 100644 content/xul/document/public/moz.build
 delete mode 100644 content/xul/moz.build
 delete mode 100644 content/xul/templates/moz.build
 delete mode 100644 content/xul/templates/public/moz.build
 rename {content/xul/document/src => dom/xul}/XULDocument.cpp (100%)
 rename {content/xul/document/src => dom/xul}/XULDocument.h (100%)
 rename {content/xul/content => dom/xul}/crashtests/107518-1.xml (100%)
 rename {content/xul/content => dom/xul}/crashtests/252448-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/253479-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/253479-2.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/326204-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/326644-1-inner.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/326644-1.html (100%)
 rename {content/xul/content => dom/xul}/crashtests/326644-2-inner.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/326644-2.html (100%)
 rename {content/xul/content => dom/xul}/crashtests/326864-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/326875-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/326881-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/329982-1.xhtml (100%)
 rename {content/xul/content => dom/xul}/crashtests/336096-1.xhtml (100%)
 rename {content/xul/document => dom/xul}/crashtests/344215-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/354611-1.html (100%)
 rename {content/xul/content => dom/xul}/crashtests/360078-1.xhtml (100%)
 rename {content/xul/content => dom/xul}/crashtests/360078-1xbl.xml (100%)
 rename {content/xul/content => dom/xul}/crashtests/363791-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/384740-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/384877-1-inner.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/384877-1.html (100%)
 rename {content/xul/document => dom/xul}/crashtests/386914-1-inner.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/386914-1.html (100%)
 rename {content/xul/content => dom/xul}/crashtests/386947-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/425821-1.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/428951-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/429085-1.xhtml (100%)
 rename {content/xul/content => dom/xul}/crashtests/431906-1-inner.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/431906-1.html (100%)
 rename {content/xul/content => dom/xul}/crashtests/451311-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/461917-1.xhtml (100%)
 rename {content/xul/document => dom/xul}/crashtests/468211-1.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/468211-2-binding.xml (100%)
 rename {content/xul/document => dom/xul}/crashtests/468211-2.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/468211-3.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/495635-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/509719-1-overlay.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/509719-1.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/509719-2-overlay.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/509719-2.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/583230.xul (100%)
 rename {content/xul/content => dom/xul}/crashtests/crashtests.list (74%)
 rename {content/xul/document => dom/xul}/crashtests/extA1.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/extA2.xul (100%)
 rename {content/xul/document => dom/xul}/crashtests/extB1.xul (100%)
 rename {content/xul/document/src => dom/xul}/moz.build (61%)
 rename {content/xul/document/src => dom/xul}/nsForwardReference.h (100%)
 rename {content/xul/document/public => dom/xul}/nsIController.idl (100%)
 rename {content/xul/document/public => dom/xul}/nsIControllers.idl (100%)
 rename {content/xul/content/public => dom/xul}/nsIXULContextMenuBuilder.idl (100%)
 rename {content/xul/document/public => dom/xul}/nsIXULDocument.h (100%)
 rename {content/xul/document/public => dom/xul}/nsIXULOverlayProvider.idl (100%)
 rename {content/xul/document/src => dom/xul}/nsXULCommandDispatcher.cpp (100%)
 rename {content/xul/document/src => dom/xul}/nsXULCommandDispatcher.h (100%)
 rename {content/xul/document/src => dom/xul}/nsXULContentSink.cpp (100%)
 rename {content/xul/document/src => dom/xul}/nsXULContentSink.h (100%)
 rename {content/xul/content/src => dom/xul}/nsXULContextMenuBuilder.cpp (100%)
 rename {content/xul/content/src => dom/xul}/nsXULContextMenuBuilder.h (100%)
 rename {content/xul/document/src => dom/xul}/nsXULControllers.cpp (100%)
 rename {content/xul/document/src => dom/xul}/nsXULControllers.h (100%)
 rename {content/xul/content/src => dom/xul}/nsXULElement.cpp (100%)
 rename {content/xul/content/src => dom/xul}/nsXULElement.h (100%)
 rename {content/xul/content/src => dom/xul}/nsXULPopupListener.cpp (100%)
 rename {content/xul/content/src => dom/xul}/nsXULPopupListener.h (100%)
 rename {content/xul/document/src => dom/xul}/nsXULPrototypeCache.cpp (100%)
 rename {content/xul/document/src => dom/xul}/nsXULPrototypeCache.h (100%)
 rename {content/xul/document/src => dom/xul}/nsXULPrototypeDocument.cpp (100%)
 rename {content/xul/document/src => dom/xul}/nsXULPrototypeDocument.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/257752-1-recursion.rdf (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/257752-1-recursion.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/329884-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/330012-1.rdf (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/330012-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/404346-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/415019-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/417840-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/424418-1.xul (100%)
 rename {content/xul/templates/src => dom/xul/templates}/crashtests/crashtests.list (100%)
 rename {content/xul/templates/src => dom/xul/templates}/moz.build (79%)
 rename {content/xul/templates/src => dom/xul/templates}/nsContentSupportMap.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsContentSupportMap.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsContentTestNode.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsContentTestNode.h (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULBuilderListener.idl (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULSortService.idl (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULTemplateBuilder.idl (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULTemplateQueryProcessor.idl (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULTemplateResult.idl (100%)
 rename {content/xul/templates/public => dom/xul/templates}/nsIXULTemplateRuleFilter.idl (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsInstantiationNode.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsInstantiationNode.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFBinding.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFBinding.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFConInstanceTestNode.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFConInstanceTestNode.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFConMemberTestNode.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFConMemberTestNode.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFPropertyTestNode.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFPropertyTestNode.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFQuery.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFQuery.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRDFTestNode.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsResourceSet.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsResourceSet.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRuleNetwork.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsRuleNetwork.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTemplateMap.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTemplateMatch.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTemplateMatch.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTemplateRule.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTemplateRule.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTreeRows.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsTreeRows.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXMLBinding.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXMLBinding.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULContentBuilder.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULContentUtils.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULContentUtils.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULResourceList.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULSortService.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULSortService.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateBuilder.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateBuilder.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorRDF.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorRDF.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorStorage.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorStorage.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorXML.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateQueryProcessorXML.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultRDF.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultRDF.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultSetRDF.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultSetRDF.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultStorage.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultStorage.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultXML.cpp (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTemplateResultXML.h (100%)
 rename {content/xul/templates/src => dom/xul/templates}/nsXULTreeBuilder.cpp (100%)
 rename {content => dom}/xul/templates/tests/chrome/animals.rdf (100%)
 rename {content => dom}/xul/templates/tests/chrome/animals.sqlite (100%)
 rename {content => dom}/xul/templates/tests/chrome/animals.xml (100%)
 rename {content => dom}/xul/templates/tests/chrome/bug441785-1.rdf (100%)
 rename {content => dom}/xul/templates/tests/chrome/bug441785-2.rdf (100%)
 rename {content => dom}/xul/templates/tests/chrome/chrome.ini (100%)
 rename {content => dom}/xul/templates/tests/chrome/file_bug330010.rdf (100%)
 rename {content => dom}/xul/templates/tests/chrome/templates_shared.js (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_bug329335.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_bug330010.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_bug397148.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_bug441785.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_bug476634.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_sortservice.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_errors.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_gridelement.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_invalidqp.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_listboxelement.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_literalasmember.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_menuelement.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_menulistelement.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_noaction.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_parentconditions.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_query3triples.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysetone.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysettwo.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_regenerate.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_rule.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_simple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_storage_tree.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontains.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereendswith.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequals.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheregreater.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_whereless.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherenorel.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul (69%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul (77%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul (69%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul (100%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul (74%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul (77%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul (70%)
 rename {content => dom}/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul (70%)
 rename {content/xul/content => dom/xul}/test/398289-resource.xul (100%)
 rename {content/xul/document => dom/xul}/test/bug497875-iframe.xul (100%)
 rename {content/xul/document => dom/xul}/test/chrome.ini (73%)
 rename {content/xul/content => dom/xul}/test/file_bug236853.rdf (100%)
 rename {content/xul/content => dom/xul}/test/mochitest.ini (100%)
 rename {content/xul/document => dom/xul}/test/overlay1_bug335375.xul (100%)
 rename {content/xul/document => dom/xul}/test/overlay2_bug335375.xul (100%)
 rename {content/xul/document => dom/xul}/test/overlay_640158.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug199692.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug233643.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug236853.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug311681.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug335375.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug391002.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug398289.html (100%)
 rename {content/xul/document => dom/xul}/test/test_bug403868.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug414907.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug418216.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug445177.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug449457.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug468176.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug486990.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug497875.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug583948.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug640158_overlay_persist.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug749367.xul (100%)
 rename {content/xul/document => dom/xul}/test/test_bug757137.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_bug775972.xul (100%)
 rename {content/xul/content => dom/xul}/test/test_import_xul_to_content.xul (100%)
 rename {content/xul/document => dom/xul}/test/window_bug583948.xul (100%)
 rename {content/xul/document => dom/xul}/test/window_bug757137.xul (100%)

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index a62f06d6470..47612812e53 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -337,7 +337,6 @@
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
-@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 13351a82803..52dd95b5b31 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -358,7 +358,6 @@
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
-@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 @BINPATH@/components/telemetry.xpt
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 849e9448b32..7de3efef2fc 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -211,8 +211,6 @@ LOCAL_INCLUDES += [
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
@@ -220,6 +218,7 @@ LOCAL_INCLUDES += [
     '/dom/xbl',
     '/dom/xml',
     '/dom/xslt/xpath',
+    '/dom/xul',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
index e23a8fa5ec9..ca6d6bac751 100644
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -174,10 +174,10 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/media/',
-    '/content/xul/content/src',
     '/dom/base',
     '/dom/canvas',
     '/dom/xbl',
+    '/dom/xul',
     '/editor/libeditor',
     '/editor/txmgr',
     '/layout/forms',
diff --git a/content/moz.build b/content/moz.build
index d43637f304b..d3fb25d8753 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -9,7 +9,6 @@ DIRS += [
     'html',
     'media',
     'svg',
-    'xul',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/content/xul/content/moz.build b/content/xul/content/moz.build
deleted file mode 100644
index 66ba864b903..00000000000
--- a/content/xul/content/moz.build
+++ /dev/null
@@ -1,11 +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 += ['public', 'src']
-
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
diff --git a/content/xul/content/public/moz.build b/content/xul/content/public/moz.build
deleted file mode 100644
index f45c9902222..00000000000
--- a/content/xul/content/public/moz.build
+++ /dev/null
@@ -1,13 +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/.
-
-if CONFIG['MOZ_XUL']:
-    XPIDL_SOURCES += [
-        'nsIXULContextMenuBuilder.idl',
-    ]
-
-XPIDL_MODULE = 'xul'
-
diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build
deleted file mode 100644
index 111c8d8d48b..00000000000
--- a/content/xul/content/src/moz.build
+++ /dev/null
@@ -1,30 +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/.
-
-if CONFIG['MOZ_XUL']:
-    MSVC_ENABLE_PGO = True
-
-    UNIFIED_SOURCES += [
-        'nsXULContextMenuBuilder.cpp',
-        'nsXULElement.cpp',
-        'nsXULPopupListener.cpp',
-    ]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '../../document/src',
-    '../../templates/src',
-    '/content/base/src',
-    '/content/html/content/src',
-    '/dom/xbl',
-    '/dom/xml',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/xul',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/content/xul/content/test/chrome.ini b/content/xul/content/test/chrome.ini
deleted file mode 100644
index 29544814f14..00000000000
--- a/content/xul/content/test/chrome.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-support-files =
-  398289-resource.xul
-  file_bug236853.rdf
-
-[test_bug233643.xul]
-[test_bug236853.xul]
-[test_bug398289.html]
-[test_bug775972.xul]
-[test_import_xul_to_content.xul]
diff --git a/content/xul/document/crashtests/crashtests.list b/content/xul/document/crashtests/crashtests.list
deleted file mode 100644
index c34c41ef4ed..00000000000
--- a/content/xul/document/crashtests/crashtests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-load 326204-1.xul
-load 344215-1.xul
-load 386914-1.html
-load 428951-1.xul
-load 468211-1.xul
-load 468211-2.xul
-load 468211-3.xul
-load 495635-1.xul
-load 583230.xul
diff --git a/content/xul/document/moz.build b/content/xul/document/moz.build
deleted file mode 100644
index 9b19590c7e9..00000000000
--- a/content/xul/document/moz.build
+++ /dev/null
@@ -1,9 +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 += ['public', 'src']
-
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
diff --git a/content/xul/document/public/moz.build b/content/xul/document/public/moz.build
deleted file mode 100644
index 7c457d06f14..00000000000
--- a/content/xul/document/public/moz.build
+++ /dev/null
@@ -1,21 +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/.
-
-XPIDL_SOURCES += [
-    'nsIController.idl',
-    'nsIControllers.idl',
-]
-
-if CONFIG['MOZ_XUL']:
-    XPIDL_SOURCES += [
-        'nsIXULOverlayProvider.idl',
-    ]
-    EXPORTS += [
-        'nsIXULDocument.h',
-    ]
-
-XPIDL_MODULE = 'xuldoc'
-
diff --git a/content/xul/moz.build b/content/xul/moz.build
deleted file mode 100644
index 5e677c67407..00000000000
--- a/content/xul/moz.build
+++ /dev/null
@@ -1,14 +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/.
-
-# We need to build document even if XUL is disabled, for the nsIController[s]
-# interfaces and implementations.
-# Likewise for content, because of nsXULAtoms.
-DIRS += ['document', 'content']
-
-if CONFIG['MOZ_XUL']:
-    DIRS += ['templates']
-
diff --git a/content/xul/templates/moz.build b/content/xul/templates/moz.build
deleted file mode 100644
index a728d0c9e0c..00000000000
--- a/content/xul/templates/moz.build
+++ /dev/null
@@ -1,9 +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 += ['public', 'src']
-
-MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
diff --git a/content/xul/templates/public/moz.build b/content/xul/templates/public/moz.build
deleted file mode 100644
index f20810747b8..00000000000
--- a/content/xul/templates/public/moz.build
+++ /dev/null
@@ -1,17 +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/.
-
-XPIDL_SOURCES += [
-    'nsIXULBuilderListener.idl',
-    'nsIXULSortService.idl',
-    'nsIXULTemplateBuilder.idl',
-    'nsIXULTemplateQueryProcessor.idl',
-    'nsIXULTemplateResult.idl',
-    'nsIXULTemplateRuleFilter.idl',
-]
-
-XPIDL_MODULE = 'xultmpl'
-
diff --git a/dom/base/moz.build b/dom/base/moz.build
index 73ed5d94614..f53220d9348 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -156,10 +156,10 @@ LOCAL_INCLUDES += [
     '../xbl',
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xul/document/src',
     '/docshell/base',
     '/dom/geolocation',
     '/dom/storage',
+    '/dom/xul',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 5d42453eb75..b90f884dc7f 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -47,8 +47,6 @@ LOCAL_INCLUDES += [
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
@@ -61,6 +59,7 @@ LOCAL_INCLUDES += [
     '/dom/xml',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
+    '/dom/xul',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index 766a8e9b00c..ba9d73596e8 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -127,8 +127,8 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/svg/content/src',
-    '/content/xul/content/src',
     '/dom/base',
+    '/dom/xul',
     '/gfx/gl',
     '/image/src',
     '/js/xpconnect/src',
diff --git a/dom/events/moz.build b/dom/events/moz.build
index 7dff5c9d78c..8b405e877b3 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -132,12 +132,12 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/xul/content/src',
     '/dom/base',
     '/dom/settings',
     '/dom/storage',
     '/dom/workers',
     '/dom/xml',
+    '/dom/xul',
     '/js/xpconnect/wrappers',
     '/layout/generic',
     '/layout/xul',
diff --git a/dom/moz.build b/dom/moz.build
index d132aab1a02..81d9f5ed058 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -97,6 +97,7 @@ DIRS += [
     'xbl',
     'xml',
     'xslt',
+    'xul',
     'resourcestats',
 ]
 
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
index 20b30c32650..209956432ce 100644
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -43,10 +43,9 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
     '/dom/base',
     '/dom/xml',
+    '/dom/xul',
     '/layout/style',
 ]
 
diff --git a/dom/xml/moz.build b/dom/xml/moz.build
index 3f71a6baa50..edb7eabd691 100644
--- a/dom/xml/moz.build
+++ b/dom/xml/moz.build
@@ -41,8 +41,8 @@ LOCAL_INCLUDES += [
     '/caps',
     '/content/base/src',
     '/content/html/document/src',
-    '/content/xul/content/src',
     '/dom/base',
+    '/dom/xul',
     '/layout/style',
 ]
 
diff --git a/content/xul/document/src/XULDocument.cpp b/dom/xul/XULDocument.cpp
similarity index 100%
rename from content/xul/document/src/XULDocument.cpp
rename to dom/xul/XULDocument.cpp
diff --git a/content/xul/document/src/XULDocument.h b/dom/xul/XULDocument.h
similarity index 100%
rename from content/xul/document/src/XULDocument.h
rename to dom/xul/XULDocument.h
diff --git a/content/xul/content/crashtests/107518-1.xml b/dom/xul/crashtests/107518-1.xml
similarity index 100%
rename from content/xul/content/crashtests/107518-1.xml
rename to dom/xul/crashtests/107518-1.xml
diff --git a/content/xul/content/crashtests/252448-1.xul b/dom/xul/crashtests/252448-1.xul
similarity index 100%
rename from content/xul/content/crashtests/252448-1.xul
rename to dom/xul/crashtests/252448-1.xul
diff --git a/content/xul/content/crashtests/253479-1.xul b/dom/xul/crashtests/253479-1.xul
similarity index 100%
rename from content/xul/content/crashtests/253479-1.xul
rename to dom/xul/crashtests/253479-1.xul
diff --git a/content/xul/content/crashtests/253479-2.xul b/dom/xul/crashtests/253479-2.xul
similarity index 100%
rename from content/xul/content/crashtests/253479-2.xul
rename to dom/xul/crashtests/253479-2.xul
diff --git a/content/xul/document/crashtests/326204-1.xul b/dom/xul/crashtests/326204-1.xul
similarity index 100%
rename from content/xul/document/crashtests/326204-1.xul
rename to dom/xul/crashtests/326204-1.xul
diff --git a/content/xul/content/crashtests/326644-1-inner.xul b/dom/xul/crashtests/326644-1-inner.xul
similarity index 100%
rename from content/xul/content/crashtests/326644-1-inner.xul
rename to dom/xul/crashtests/326644-1-inner.xul
diff --git a/content/xul/content/crashtests/326644-1.html b/dom/xul/crashtests/326644-1.html
similarity index 100%
rename from content/xul/content/crashtests/326644-1.html
rename to dom/xul/crashtests/326644-1.html
diff --git a/content/xul/content/crashtests/326644-2-inner.xul b/dom/xul/crashtests/326644-2-inner.xul
similarity index 100%
rename from content/xul/content/crashtests/326644-2-inner.xul
rename to dom/xul/crashtests/326644-2-inner.xul
diff --git a/content/xul/content/crashtests/326644-2.html b/dom/xul/crashtests/326644-2.html
similarity index 100%
rename from content/xul/content/crashtests/326644-2.html
rename to dom/xul/crashtests/326644-2.html
diff --git a/content/xul/content/crashtests/326864-1.xul b/dom/xul/crashtests/326864-1.xul
similarity index 100%
rename from content/xul/content/crashtests/326864-1.xul
rename to dom/xul/crashtests/326864-1.xul
diff --git a/content/xul/content/crashtests/326875-1.xul b/dom/xul/crashtests/326875-1.xul
similarity index 100%
rename from content/xul/content/crashtests/326875-1.xul
rename to dom/xul/crashtests/326875-1.xul
diff --git a/content/xul/content/crashtests/326881-1.xul b/dom/xul/crashtests/326881-1.xul
similarity index 100%
rename from content/xul/content/crashtests/326881-1.xul
rename to dom/xul/crashtests/326881-1.xul
diff --git a/content/xul/content/crashtests/329982-1.xhtml b/dom/xul/crashtests/329982-1.xhtml
similarity index 100%
rename from content/xul/content/crashtests/329982-1.xhtml
rename to dom/xul/crashtests/329982-1.xhtml
diff --git a/content/xul/content/crashtests/336096-1.xhtml b/dom/xul/crashtests/336096-1.xhtml
similarity index 100%
rename from content/xul/content/crashtests/336096-1.xhtml
rename to dom/xul/crashtests/336096-1.xhtml
diff --git a/content/xul/document/crashtests/344215-1.xul b/dom/xul/crashtests/344215-1.xul
similarity index 100%
rename from content/xul/document/crashtests/344215-1.xul
rename to dom/xul/crashtests/344215-1.xul
diff --git a/content/xul/content/crashtests/354611-1.html b/dom/xul/crashtests/354611-1.html
similarity index 100%
rename from content/xul/content/crashtests/354611-1.html
rename to dom/xul/crashtests/354611-1.html
diff --git a/content/xul/content/crashtests/360078-1.xhtml b/dom/xul/crashtests/360078-1.xhtml
similarity index 100%
rename from content/xul/content/crashtests/360078-1.xhtml
rename to dom/xul/crashtests/360078-1.xhtml
diff --git a/content/xul/content/crashtests/360078-1xbl.xml b/dom/xul/crashtests/360078-1xbl.xml
similarity index 100%
rename from content/xul/content/crashtests/360078-1xbl.xml
rename to dom/xul/crashtests/360078-1xbl.xml
diff --git a/content/xul/content/crashtests/363791-1.xul b/dom/xul/crashtests/363791-1.xul
similarity index 100%
rename from content/xul/content/crashtests/363791-1.xul
rename to dom/xul/crashtests/363791-1.xul
diff --git a/content/xul/content/crashtests/384740-1.xul b/dom/xul/crashtests/384740-1.xul
similarity index 100%
rename from content/xul/content/crashtests/384740-1.xul
rename to dom/xul/crashtests/384740-1.xul
diff --git a/content/xul/content/crashtests/384877-1-inner.xul b/dom/xul/crashtests/384877-1-inner.xul
similarity index 100%
rename from content/xul/content/crashtests/384877-1-inner.xul
rename to dom/xul/crashtests/384877-1-inner.xul
diff --git a/content/xul/content/crashtests/384877-1.html b/dom/xul/crashtests/384877-1.html
similarity index 100%
rename from content/xul/content/crashtests/384877-1.html
rename to dom/xul/crashtests/384877-1.html
diff --git a/content/xul/document/crashtests/386914-1-inner.xul b/dom/xul/crashtests/386914-1-inner.xul
similarity index 100%
rename from content/xul/document/crashtests/386914-1-inner.xul
rename to dom/xul/crashtests/386914-1-inner.xul
diff --git a/content/xul/document/crashtests/386914-1.html b/dom/xul/crashtests/386914-1.html
similarity index 100%
rename from content/xul/document/crashtests/386914-1.html
rename to dom/xul/crashtests/386914-1.html
diff --git a/content/xul/content/crashtests/386947-1.xul b/dom/xul/crashtests/386947-1.xul
similarity index 100%
rename from content/xul/content/crashtests/386947-1.xul
rename to dom/xul/crashtests/386947-1.xul
diff --git a/content/xul/content/crashtests/425821-1.xul b/dom/xul/crashtests/425821-1.xul
similarity index 100%
rename from content/xul/content/crashtests/425821-1.xul
rename to dom/xul/crashtests/425821-1.xul
diff --git a/content/xul/document/crashtests/428951-1.xul b/dom/xul/crashtests/428951-1.xul
similarity index 100%
rename from content/xul/document/crashtests/428951-1.xul
rename to dom/xul/crashtests/428951-1.xul
diff --git a/content/xul/content/crashtests/429085-1.xhtml b/dom/xul/crashtests/429085-1.xhtml
similarity index 100%
rename from content/xul/content/crashtests/429085-1.xhtml
rename to dom/xul/crashtests/429085-1.xhtml
diff --git a/content/xul/content/crashtests/431906-1-inner.xul b/dom/xul/crashtests/431906-1-inner.xul
similarity index 100%
rename from content/xul/content/crashtests/431906-1-inner.xul
rename to dom/xul/crashtests/431906-1-inner.xul
diff --git a/content/xul/content/crashtests/431906-1.html b/dom/xul/crashtests/431906-1.html
similarity index 100%
rename from content/xul/content/crashtests/431906-1.html
rename to dom/xul/crashtests/431906-1.html
diff --git a/content/xul/content/crashtests/451311-1.xul b/dom/xul/crashtests/451311-1.xul
similarity index 100%
rename from content/xul/content/crashtests/451311-1.xul
rename to dom/xul/crashtests/451311-1.xul
diff --git a/content/xul/content/crashtests/461917-1.xhtml b/dom/xul/crashtests/461917-1.xhtml
similarity index 100%
rename from content/xul/content/crashtests/461917-1.xhtml
rename to dom/xul/crashtests/461917-1.xhtml
diff --git a/content/xul/document/crashtests/468211-1.xul b/dom/xul/crashtests/468211-1.xul
similarity index 100%
rename from content/xul/document/crashtests/468211-1.xul
rename to dom/xul/crashtests/468211-1.xul
diff --git a/content/xul/document/crashtests/468211-2-binding.xml b/dom/xul/crashtests/468211-2-binding.xml
similarity index 100%
rename from content/xul/document/crashtests/468211-2-binding.xml
rename to dom/xul/crashtests/468211-2-binding.xml
diff --git a/content/xul/document/crashtests/468211-2.xul b/dom/xul/crashtests/468211-2.xul
similarity index 100%
rename from content/xul/document/crashtests/468211-2.xul
rename to dom/xul/crashtests/468211-2.xul
diff --git a/content/xul/document/crashtests/468211-3.xul b/dom/xul/crashtests/468211-3.xul
similarity index 100%
rename from content/xul/document/crashtests/468211-3.xul
rename to dom/xul/crashtests/468211-3.xul
diff --git a/content/xul/document/crashtests/495635-1.xul b/dom/xul/crashtests/495635-1.xul
similarity index 100%
rename from content/xul/document/crashtests/495635-1.xul
rename to dom/xul/crashtests/495635-1.xul
diff --git a/content/xul/content/crashtests/509719-1-overlay.xul b/dom/xul/crashtests/509719-1-overlay.xul
similarity index 100%
rename from content/xul/content/crashtests/509719-1-overlay.xul
rename to dom/xul/crashtests/509719-1-overlay.xul
diff --git a/content/xul/content/crashtests/509719-1.xul b/dom/xul/crashtests/509719-1.xul
similarity index 100%
rename from content/xul/content/crashtests/509719-1.xul
rename to dom/xul/crashtests/509719-1.xul
diff --git a/content/xul/content/crashtests/509719-2-overlay.xul b/dom/xul/crashtests/509719-2-overlay.xul
similarity index 100%
rename from content/xul/content/crashtests/509719-2-overlay.xul
rename to dom/xul/crashtests/509719-2-overlay.xul
diff --git a/content/xul/content/crashtests/509719-2.xul b/dom/xul/crashtests/509719-2.xul
similarity index 100%
rename from content/xul/content/crashtests/509719-2.xul
rename to dom/xul/crashtests/509719-2.xul
diff --git a/content/xul/document/crashtests/583230.xul b/dom/xul/crashtests/583230.xul
similarity index 100%
rename from content/xul/document/crashtests/583230.xul
rename to dom/xul/crashtests/583230.xul
diff --git a/content/xul/content/crashtests/crashtests.list b/dom/xul/crashtests/crashtests.list
similarity index 74%
rename from content/xul/content/crashtests/crashtests.list
rename to dom/xul/crashtests/crashtests.list
index 80dcefc3993..737a32f60fd 100644
--- a/content/xul/content/crashtests/crashtests.list
+++ b/dom/xul/crashtests/crashtests.list
@@ -2,6 +2,7 @@ load 107518-1.xml
 load 252448-1.xul
 load 253479-1.xul
 load 253479-2.xul
+load 326204-1.xul
 load 326644-1.html
 load 326644-2.html
 load 326864-1.xul
@@ -9,16 +10,24 @@ load 326875-1.xul
 load 326881-1.xul
 load 329982-1.xhtml
 load 336096-1.xhtml
+load 344215-1.xul
 load 354611-1.html
 load 360078-1.xhtml
 load 363791-1.xul
 load 384740-1.xul
 load 384877-1.html
+load 386914-1.html
 load 386947-1.xul
 load 425821-1.xul
+load 428951-1.xul
 load 429085-1.xhtml
 load 431906-1.html
 load 451311-1.xul
 load 461917-1.xhtml
+load 468211-1.xul
+load 468211-2.xul
+load 468211-3.xul
+load 495635-1.xul
 load 509719-1.xul
 asserts(3) load 509719-2.xul # bug 909819
+load 583230.xul
diff --git a/content/xul/document/crashtests/extA1.xul b/dom/xul/crashtests/extA1.xul
similarity index 100%
rename from content/xul/document/crashtests/extA1.xul
rename to dom/xul/crashtests/extA1.xul
diff --git a/content/xul/document/crashtests/extA2.xul b/dom/xul/crashtests/extA2.xul
similarity index 100%
rename from content/xul/document/crashtests/extA2.xul
rename to dom/xul/crashtests/extA2.xul
diff --git a/content/xul/document/crashtests/extB1.xul b/dom/xul/crashtests/extB1.xul
similarity index 100%
rename from content/xul/document/crashtests/extB1.xul
rename to dom/xul/crashtests/extB1.xul
diff --git a/content/xul/document/src/moz.build b/dom/xul/moz.build
similarity index 61%
rename from content/xul/document/src/moz.build
rename to dom/xul/moz.build
index c2a97b95368..35aa5169e02 100644
--- a/content/xul/document/src/moz.build
+++ b/dom/xul/moz.build
@@ -4,31 +4,56 @@
 # 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/.
 
-UNIFIED_SOURCES += [
-    'nsXULControllers.cpp',
-]
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 if CONFIG['MOZ_XUL']:
+    DIRS += ['templates']
+
+    XPIDL_SOURCES += [
+        'nsIXULContextMenuBuilder.idl',
+        'nsIXULOverlayProvider.idl',
+    ]
+
+    EXPORTS += [
+        'nsIXULDocument.h',
+    ]
+
     UNIFIED_SOURCES += [
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
+        'nsXULContextMenuBuilder.cpp',
+        'nsXULElement.cpp',
+        'nsXULPopupListener.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
         'XULDocument.cpp',
     ]
 
+XPIDL_SOURCES += [
+    'nsIController.idl',
+    'nsIControllers.idl',
+]
+
+XPIDL_MODULE = 'xul'
+
+UNIFIED_SOURCES += [
+    'nsXULControllers.cpp',
+]
+
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/xul/content/src',
-    '/content/xul/templates/src',
+    '/content/html/content/src',
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
     '/dom/xml',
+    '/dom/xul/templates',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
diff --git a/content/xul/document/src/nsForwardReference.h b/dom/xul/nsForwardReference.h
similarity index 100%
rename from content/xul/document/src/nsForwardReference.h
rename to dom/xul/nsForwardReference.h
diff --git a/content/xul/document/public/nsIController.idl b/dom/xul/nsIController.idl
similarity index 100%
rename from content/xul/document/public/nsIController.idl
rename to dom/xul/nsIController.idl
diff --git a/content/xul/document/public/nsIControllers.idl b/dom/xul/nsIControllers.idl
similarity index 100%
rename from content/xul/document/public/nsIControllers.idl
rename to dom/xul/nsIControllers.idl
diff --git a/content/xul/content/public/nsIXULContextMenuBuilder.idl b/dom/xul/nsIXULContextMenuBuilder.idl
similarity index 100%
rename from content/xul/content/public/nsIXULContextMenuBuilder.idl
rename to dom/xul/nsIXULContextMenuBuilder.idl
diff --git a/content/xul/document/public/nsIXULDocument.h b/dom/xul/nsIXULDocument.h
similarity index 100%
rename from content/xul/document/public/nsIXULDocument.h
rename to dom/xul/nsIXULDocument.h
diff --git a/content/xul/document/public/nsIXULOverlayProvider.idl b/dom/xul/nsIXULOverlayProvider.idl
similarity index 100%
rename from content/xul/document/public/nsIXULOverlayProvider.idl
rename to dom/xul/nsIXULOverlayProvider.idl
diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/dom/xul/nsXULCommandDispatcher.cpp
similarity index 100%
rename from content/xul/document/src/nsXULCommandDispatcher.cpp
rename to dom/xul/nsXULCommandDispatcher.cpp
diff --git a/content/xul/document/src/nsXULCommandDispatcher.h b/dom/xul/nsXULCommandDispatcher.h
similarity index 100%
rename from content/xul/document/src/nsXULCommandDispatcher.h
rename to dom/xul/nsXULCommandDispatcher.h
diff --git a/content/xul/document/src/nsXULContentSink.cpp b/dom/xul/nsXULContentSink.cpp
similarity index 100%
rename from content/xul/document/src/nsXULContentSink.cpp
rename to dom/xul/nsXULContentSink.cpp
diff --git a/content/xul/document/src/nsXULContentSink.h b/dom/xul/nsXULContentSink.h
similarity index 100%
rename from content/xul/document/src/nsXULContentSink.h
rename to dom/xul/nsXULContentSink.h
diff --git a/content/xul/content/src/nsXULContextMenuBuilder.cpp b/dom/xul/nsXULContextMenuBuilder.cpp
similarity index 100%
rename from content/xul/content/src/nsXULContextMenuBuilder.cpp
rename to dom/xul/nsXULContextMenuBuilder.cpp
diff --git a/content/xul/content/src/nsXULContextMenuBuilder.h b/dom/xul/nsXULContextMenuBuilder.h
similarity index 100%
rename from content/xul/content/src/nsXULContextMenuBuilder.h
rename to dom/xul/nsXULContextMenuBuilder.h
diff --git a/content/xul/document/src/nsXULControllers.cpp b/dom/xul/nsXULControllers.cpp
similarity index 100%
rename from content/xul/document/src/nsXULControllers.cpp
rename to dom/xul/nsXULControllers.cpp
diff --git a/content/xul/document/src/nsXULControllers.h b/dom/xul/nsXULControllers.h
similarity index 100%
rename from content/xul/document/src/nsXULControllers.h
rename to dom/xul/nsXULControllers.h
diff --git a/content/xul/content/src/nsXULElement.cpp b/dom/xul/nsXULElement.cpp
similarity index 100%
rename from content/xul/content/src/nsXULElement.cpp
rename to dom/xul/nsXULElement.cpp
diff --git a/content/xul/content/src/nsXULElement.h b/dom/xul/nsXULElement.h
similarity index 100%
rename from content/xul/content/src/nsXULElement.h
rename to dom/xul/nsXULElement.h
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/dom/xul/nsXULPopupListener.cpp
similarity index 100%
rename from content/xul/content/src/nsXULPopupListener.cpp
rename to dom/xul/nsXULPopupListener.cpp
diff --git a/content/xul/content/src/nsXULPopupListener.h b/dom/xul/nsXULPopupListener.h
similarity index 100%
rename from content/xul/content/src/nsXULPopupListener.h
rename to dom/xul/nsXULPopupListener.h
diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/dom/xul/nsXULPrototypeCache.cpp
similarity index 100%
rename from content/xul/document/src/nsXULPrototypeCache.cpp
rename to dom/xul/nsXULPrototypeCache.cpp
diff --git a/content/xul/document/src/nsXULPrototypeCache.h b/dom/xul/nsXULPrototypeCache.h
similarity index 100%
rename from content/xul/document/src/nsXULPrototypeCache.h
rename to dom/xul/nsXULPrototypeCache.h
diff --git a/content/xul/document/src/nsXULPrototypeDocument.cpp b/dom/xul/nsXULPrototypeDocument.cpp
similarity index 100%
rename from content/xul/document/src/nsXULPrototypeDocument.cpp
rename to dom/xul/nsXULPrototypeDocument.cpp
diff --git a/content/xul/document/src/nsXULPrototypeDocument.h b/dom/xul/nsXULPrototypeDocument.h
similarity index 100%
rename from content/xul/document/src/nsXULPrototypeDocument.h
rename to dom/xul/nsXULPrototypeDocument.h
diff --git a/content/xul/templates/src/crashtests/257752-1-recursion.rdf b/dom/xul/templates/crashtests/257752-1-recursion.rdf
similarity index 100%
rename from content/xul/templates/src/crashtests/257752-1-recursion.rdf
rename to dom/xul/templates/crashtests/257752-1-recursion.rdf
diff --git a/content/xul/templates/src/crashtests/257752-1-recursion.xul b/dom/xul/templates/crashtests/257752-1-recursion.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/257752-1-recursion.xul
rename to dom/xul/templates/crashtests/257752-1-recursion.xul
diff --git a/content/xul/templates/src/crashtests/329884-1.xul b/dom/xul/templates/crashtests/329884-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/329884-1.xul
rename to dom/xul/templates/crashtests/329884-1.xul
diff --git a/content/xul/templates/src/crashtests/330012-1.rdf b/dom/xul/templates/crashtests/330012-1.rdf
similarity index 100%
rename from content/xul/templates/src/crashtests/330012-1.rdf
rename to dom/xul/templates/crashtests/330012-1.rdf
diff --git a/content/xul/templates/src/crashtests/330012-1.xul b/dom/xul/templates/crashtests/330012-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/330012-1.xul
rename to dom/xul/templates/crashtests/330012-1.xul
diff --git a/content/xul/templates/src/crashtests/404346-1.xul b/dom/xul/templates/crashtests/404346-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/404346-1.xul
rename to dom/xul/templates/crashtests/404346-1.xul
diff --git a/content/xul/templates/src/crashtests/415019-1.xul b/dom/xul/templates/crashtests/415019-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/415019-1.xul
rename to dom/xul/templates/crashtests/415019-1.xul
diff --git a/content/xul/templates/src/crashtests/417840-1.xul b/dom/xul/templates/crashtests/417840-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/417840-1.xul
rename to dom/xul/templates/crashtests/417840-1.xul
diff --git a/content/xul/templates/src/crashtests/424418-1.xul b/dom/xul/templates/crashtests/424418-1.xul
similarity index 100%
rename from content/xul/templates/src/crashtests/424418-1.xul
rename to dom/xul/templates/crashtests/424418-1.xul
diff --git a/content/xul/templates/src/crashtests/crashtests.list b/dom/xul/templates/crashtests/crashtests.list
similarity index 100%
rename from content/xul/templates/src/crashtests/crashtests.list
rename to dom/xul/templates/crashtests/crashtests.list
diff --git a/content/xul/templates/src/moz.build b/dom/xul/templates/moz.build
similarity index 79%
rename from content/xul/templates/src/moz.build
rename to dom/xul/templates/moz.build
index a6ce12926d2..9e8e1c1435a 100644
--- a/content/xul/templates/src/moz.build
+++ b/dom/xul/templates/moz.build
@@ -4,6 +4,19 @@
 # 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/.
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
+
+XPIDL_SOURCES += [
+    'nsIXULBuilderListener.idl',
+    'nsIXULSortService.idl',
+    'nsIXULTemplateBuilder.idl',
+    'nsIXULTemplateQueryProcessor.idl',
+    'nsIXULTemplateResult.idl',
+    'nsIXULTemplateRuleFilter.idl',
+]
+
+XPIDL_MODULE = 'xultmpl'
+
 UNIFIED_SOURCES += [
     'nsContentSupportMap.cpp',
     'nsContentTestNode.cpp',
@@ -36,9 +49,9 @@ UNIFIED_SOURCES += [
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '../../content/src',
     '/content/base/src',
     '/dom/base',
+    '/dom/xul',
     '/layout/xul/tree/',
 ]
 
diff --git a/content/xul/templates/src/nsContentSupportMap.cpp b/dom/xul/templates/nsContentSupportMap.cpp
similarity index 100%
rename from content/xul/templates/src/nsContentSupportMap.cpp
rename to dom/xul/templates/nsContentSupportMap.cpp
diff --git a/content/xul/templates/src/nsContentSupportMap.h b/dom/xul/templates/nsContentSupportMap.h
similarity index 100%
rename from content/xul/templates/src/nsContentSupportMap.h
rename to dom/xul/templates/nsContentSupportMap.h
diff --git a/content/xul/templates/src/nsContentTestNode.cpp b/dom/xul/templates/nsContentTestNode.cpp
similarity index 100%
rename from content/xul/templates/src/nsContentTestNode.cpp
rename to dom/xul/templates/nsContentTestNode.cpp
diff --git a/content/xul/templates/src/nsContentTestNode.h b/dom/xul/templates/nsContentTestNode.h
similarity index 100%
rename from content/xul/templates/src/nsContentTestNode.h
rename to dom/xul/templates/nsContentTestNode.h
diff --git a/content/xul/templates/public/nsIXULBuilderListener.idl b/dom/xul/templates/nsIXULBuilderListener.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULBuilderListener.idl
rename to dom/xul/templates/nsIXULBuilderListener.idl
diff --git a/content/xul/templates/public/nsIXULSortService.idl b/dom/xul/templates/nsIXULSortService.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULSortService.idl
rename to dom/xul/templates/nsIXULSortService.idl
diff --git a/content/xul/templates/public/nsIXULTemplateBuilder.idl b/dom/xul/templates/nsIXULTemplateBuilder.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULTemplateBuilder.idl
rename to dom/xul/templates/nsIXULTemplateBuilder.idl
diff --git a/content/xul/templates/public/nsIXULTemplateQueryProcessor.idl b/dom/xul/templates/nsIXULTemplateQueryProcessor.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULTemplateQueryProcessor.idl
rename to dom/xul/templates/nsIXULTemplateQueryProcessor.idl
diff --git a/content/xul/templates/public/nsIXULTemplateResult.idl b/dom/xul/templates/nsIXULTemplateResult.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULTemplateResult.idl
rename to dom/xul/templates/nsIXULTemplateResult.idl
diff --git a/content/xul/templates/public/nsIXULTemplateRuleFilter.idl b/dom/xul/templates/nsIXULTemplateRuleFilter.idl
similarity index 100%
rename from content/xul/templates/public/nsIXULTemplateRuleFilter.idl
rename to dom/xul/templates/nsIXULTemplateRuleFilter.idl
diff --git a/content/xul/templates/src/nsInstantiationNode.cpp b/dom/xul/templates/nsInstantiationNode.cpp
similarity index 100%
rename from content/xul/templates/src/nsInstantiationNode.cpp
rename to dom/xul/templates/nsInstantiationNode.cpp
diff --git a/content/xul/templates/src/nsInstantiationNode.h b/dom/xul/templates/nsInstantiationNode.h
similarity index 100%
rename from content/xul/templates/src/nsInstantiationNode.h
rename to dom/xul/templates/nsInstantiationNode.h
diff --git a/content/xul/templates/src/nsRDFBinding.cpp b/dom/xul/templates/nsRDFBinding.cpp
similarity index 100%
rename from content/xul/templates/src/nsRDFBinding.cpp
rename to dom/xul/templates/nsRDFBinding.cpp
diff --git a/content/xul/templates/src/nsRDFBinding.h b/dom/xul/templates/nsRDFBinding.h
similarity index 100%
rename from content/xul/templates/src/nsRDFBinding.h
rename to dom/xul/templates/nsRDFBinding.h
diff --git a/content/xul/templates/src/nsRDFConInstanceTestNode.cpp b/dom/xul/templates/nsRDFConInstanceTestNode.cpp
similarity index 100%
rename from content/xul/templates/src/nsRDFConInstanceTestNode.cpp
rename to dom/xul/templates/nsRDFConInstanceTestNode.cpp
diff --git a/content/xul/templates/src/nsRDFConInstanceTestNode.h b/dom/xul/templates/nsRDFConInstanceTestNode.h
similarity index 100%
rename from content/xul/templates/src/nsRDFConInstanceTestNode.h
rename to dom/xul/templates/nsRDFConInstanceTestNode.h
diff --git a/content/xul/templates/src/nsRDFConMemberTestNode.cpp b/dom/xul/templates/nsRDFConMemberTestNode.cpp
similarity index 100%
rename from content/xul/templates/src/nsRDFConMemberTestNode.cpp
rename to dom/xul/templates/nsRDFConMemberTestNode.cpp
diff --git a/content/xul/templates/src/nsRDFConMemberTestNode.h b/dom/xul/templates/nsRDFConMemberTestNode.h
similarity index 100%
rename from content/xul/templates/src/nsRDFConMemberTestNode.h
rename to dom/xul/templates/nsRDFConMemberTestNode.h
diff --git a/content/xul/templates/src/nsRDFPropertyTestNode.cpp b/dom/xul/templates/nsRDFPropertyTestNode.cpp
similarity index 100%
rename from content/xul/templates/src/nsRDFPropertyTestNode.cpp
rename to dom/xul/templates/nsRDFPropertyTestNode.cpp
diff --git a/content/xul/templates/src/nsRDFPropertyTestNode.h b/dom/xul/templates/nsRDFPropertyTestNode.h
similarity index 100%
rename from content/xul/templates/src/nsRDFPropertyTestNode.h
rename to dom/xul/templates/nsRDFPropertyTestNode.h
diff --git a/content/xul/templates/src/nsRDFQuery.cpp b/dom/xul/templates/nsRDFQuery.cpp
similarity index 100%
rename from content/xul/templates/src/nsRDFQuery.cpp
rename to dom/xul/templates/nsRDFQuery.cpp
diff --git a/content/xul/templates/src/nsRDFQuery.h b/dom/xul/templates/nsRDFQuery.h
similarity index 100%
rename from content/xul/templates/src/nsRDFQuery.h
rename to dom/xul/templates/nsRDFQuery.h
diff --git a/content/xul/templates/src/nsRDFTestNode.h b/dom/xul/templates/nsRDFTestNode.h
similarity index 100%
rename from content/xul/templates/src/nsRDFTestNode.h
rename to dom/xul/templates/nsRDFTestNode.h
diff --git a/content/xul/templates/src/nsResourceSet.cpp b/dom/xul/templates/nsResourceSet.cpp
similarity index 100%
rename from content/xul/templates/src/nsResourceSet.cpp
rename to dom/xul/templates/nsResourceSet.cpp
diff --git a/content/xul/templates/src/nsResourceSet.h b/dom/xul/templates/nsResourceSet.h
similarity index 100%
rename from content/xul/templates/src/nsResourceSet.h
rename to dom/xul/templates/nsResourceSet.h
diff --git a/content/xul/templates/src/nsRuleNetwork.cpp b/dom/xul/templates/nsRuleNetwork.cpp
similarity index 100%
rename from content/xul/templates/src/nsRuleNetwork.cpp
rename to dom/xul/templates/nsRuleNetwork.cpp
diff --git a/content/xul/templates/src/nsRuleNetwork.h b/dom/xul/templates/nsRuleNetwork.h
similarity index 100%
rename from content/xul/templates/src/nsRuleNetwork.h
rename to dom/xul/templates/nsRuleNetwork.h
diff --git a/content/xul/templates/src/nsTemplateMap.h b/dom/xul/templates/nsTemplateMap.h
similarity index 100%
rename from content/xul/templates/src/nsTemplateMap.h
rename to dom/xul/templates/nsTemplateMap.h
diff --git a/content/xul/templates/src/nsTemplateMatch.cpp b/dom/xul/templates/nsTemplateMatch.cpp
similarity index 100%
rename from content/xul/templates/src/nsTemplateMatch.cpp
rename to dom/xul/templates/nsTemplateMatch.cpp
diff --git a/content/xul/templates/src/nsTemplateMatch.h b/dom/xul/templates/nsTemplateMatch.h
similarity index 100%
rename from content/xul/templates/src/nsTemplateMatch.h
rename to dom/xul/templates/nsTemplateMatch.h
diff --git a/content/xul/templates/src/nsTemplateRule.cpp b/dom/xul/templates/nsTemplateRule.cpp
similarity index 100%
rename from content/xul/templates/src/nsTemplateRule.cpp
rename to dom/xul/templates/nsTemplateRule.cpp
diff --git a/content/xul/templates/src/nsTemplateRule.h b/dom/xul/templates/nsTemplateRule.h
similarity index 100%
rename from content/xul/templates/src/nsTemplateRule.h
rename to dom/xul/templates/nsTemplateRule.h
diff --git a/content/xul/templates/src/nsTreeRows.cpp b/dom/xul/templates/nsTreeRows.cpp
similarity index 100%
rename from content/xul/templates/src/nsTreeRows.cpp
rename to dom/xul/templates/nsTreeRows.cpp
diff --git a/content/xul/templates/src/nsTreeRows.h b/dom/xul/templates/nsTreeRows.h
similarity index 100%
rename from content/xul/templates/src/nsTreeRows.h
rename to dom/xul/templates/nsTreeRows.h
diff --git a/content/xul/templates/src/nsXMLBinding.cpp b/dom/xul/templates/nsXMLBinding.cpp
similarity index 100%
rename from content/xul/templates/src/nsXMLBinding.cpp
rename to dom/xul/templates/nsXMLBinding.cpp
diff --git a/content/xul/templates/src/nsXMLBinding.h b/dom/xul/templates/nsXMLBinding.h
similarity index 100%
rename from content/xul/templates/src/nsXMLBinding.h
rename to dom/xul/templates/nsXMLBinding.h
diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/dom/xul/templates/nsXULContentBuilder.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULContentBuilder.cpp
rename to dom/xul/templates/nsXULContentBuilder.cpp
diff --git a/content/xul/templates/src/nsXULContentUtils.cpp b/dom/xul/templates/nsXULContentUtils.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULContentUtils.cpp
rename to dom/xul/templates/nsXULContentUtils.cpp
diff --git a/content/xul/templates/src/nsXULContentUtils.h b/dom/xul/templates/nsXULContentUtils.h
similarity index 100%
rename from content/xul/templates/src/nsXULContentUtils.h
rename to dom/xul/templates/nsXULContentUtils.h
diff --git a/content/xul/templates/src/nsXULResourceList.h b/dom/xul/templates/nsXULResourceList.h
similarity index 100%
rename from content/xul/templates/src/nsXULResourceList.h
rename to dom/xul/templates/nsXULResourceList.h
diff --git a/content/xul/templates/src/nsXULSortService.cpp b/dom/xul/templates/nsXULSortService.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULSortService.cpp
rename to dom/xul/templates/nsXULSortService.cpp
diff --git a/content/xul/templates/src/nsXULSortService.h b/dom/xul/templates/nsXULSortService.h
similarity index 100%
rename from content/xul/templates/src/nsXULSortService.h
rename to dom/xul/templates/nsXULSortService.h
diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/dom/xul/templates/nsXULTemplateBuilder.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateBuilder.cpp
rename to dom/xul/templates/nsXULTemplateBuilder.cpp
diff --git a/content/xul/templates/src/nsXULTemplateBuilder.h b/dom/xul/templates/nsXULTemplateBuilder.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateBuilder.h
rename to dom/xul/templates/nsXULTemplateBuilder.h
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorRDF.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorStorage.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorStorage.cpp
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h b/dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorStorage.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorStorage.h
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp b/dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorXML.cpp
rename to dom/xul/templates/nsXULTemplateQueryProcessorXML.cpp
diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorXML.h b/dom/xul/templates/nsXULTemplateQueryProcessorXML.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateQueryProcessorXML.h
rename to dom/xul/templates/nsXULTemplateQueryProcessorXML.h
diff --git a/content/xul/templates/src/nsXULTemplateResultRDF.cpp b/dom/xul/templates/nsXULTemplateResultRDF.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultRDF.cpp
rename to dom/xul/templates/nsXULTemplateResultRDF.cpp
diff --git a/content/xul/templates/src/nsXULTemplateResultRDF.h b/dom/xul/templates/nsXULTemplateResultRDF.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultRDF.h
rename to dom/xul/templates/nsXULTemplateResultRDF.h
diff --git a/content/xul/templates/src/nsXULTemplateResultSetRDF.cpp b/dom/xul/templates/nsXULTemplateResultSetRDF.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultSetRDF.cpp
rename to dom/xul/templates/nsXULTemplateResultSetRDF.cpp
diff --git a/content/xul/templates/src/nsXULTemplateResultSetRDF.h b/dom/xul/templates/nsXULTemplateResultSetRDF.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultSetRDF.h
rename to dom/xul/templates/nsXULTemplateResultSetRDF.h
diff --git a/content/xul/templates/src/nsXULTemplateResultStorage.cpp b/dom/xul/templates/nsXULTemplateResultStorage.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultStorage.cpp
rename to dom/xul/templates/nsXULTemplateResultStorage.cpp
diff --git a/content/xul/templates/src/nsXULTemplateResultStorage.h b/dom/xul/templates/nsXULTemplateResultStorage.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultStorage.h
rename to dom/xul/templates/nsXULTemplateResultStorage.h
diff --git a/content/xul/templates/src/nsXULTemplateResultXML.cpp b/dom/xul/templates/nsXULTemplateResultXML.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultXML.cpp
rename to dom/xul/templates/nsXULTemplateResultXML.cpp
diff --git a/content/xul/templates/src/nsXULTemplateResultXML.h b/dom/xul/templates/nsXULTemplateResultXML.h
similarity index 100%
rename from content/xul/templates/src/nsXULTemplateResultXML.h
rename to dom/xul/templates/nsXULTemplateResultXML.h
diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/dom/xul/templates/nsXULTreeBuilder.cpp
similarity index 100%
rename from content/xul/templates/src/nsXULTreeBuilder.cpp
rename to dom/xul/templates/nsXULTreeBuilder.cpp
diff --git a/content/xul/templates/tests/chrome/animals.rdf b/dom/xul/templates/tests/chrome/animals.rdf
similarity index 100%
rename from content/xul/templates/tests/chrome/animals.rdf
rename to dom/xul/templates/tests/chrome/animals.rdf
diff --git a/content/xul/templates/tests/chrome/animals.sqlite b/dom/xul/templates/tests/chrome/animals.sqlite
similarity index 100%
rename from content/xul/templates/tests/chrome/animals.sqlite
rename to dom/xul/templates/tests/chrome/animals.sqlite
diff --git a/content/xul/templates/tests/chrome/animals.xml b/dom/xul/templates/tests/chrome/animals.xml
similarity index 100%
rename from content/xul/templates/tests/chrome/animals.xml
rename to dom/xul/templates/tests/chrome/animals.xml
diff --git a/content/xul/templates/tests/chrome/bug441785-1.rdf b/dom/xul/templates/tests/chrome/bug441785-1.rdf
similarity index 100%
rename from content/xul/templates/tests/chrome/bug441785-1.rdf
rename to dom/xul/templates/tests/chrome/bug441785-1.rdf
diff --git a/content/xul/templates/tests/chrome/bug441785-2.rdf b/dom/xul/templates/tests/chrome/bug441785-2.rdf
similarity index 100%
rename from content/xul/templates/tests/chrome/bug441785-2.rdf
rename to dom/xul/templates/tests/chrome/bug441785-2.rdf
diff --git a/content/xul/templates/tests/chrome/chrome.ini b/dom/xul/templates/tests/chrome/chrome.ini
similarity index 100%
rename from content/xul/templates/tests/chrome/chrome.ini
rename to dom/xul/templates/tests/chrome/chrome.ini
diff --git a/content/xul/templates/tests/chrome/file_bug330010.rdf b/dom/xul/templates/tests/chrome/file_bug330010.rdf
similarity index 100%
rename from content/xul/templates/tests/chrome/file_bug330010.rdf
rename to dom/xul/templates/tests/chrome/file_bug330010.rdf
diff --git a/content/xul/templates/tests/chrome/templates_shared.js b/dom/xul/templates/tests/chrome/templates_shared.js
similarity index 100%
rename from content/xul/templates/tests/chrome/templates_shared.js
rename to dom/xul/templates/tests/chrome/templates_shared.js
diff --git a/content/xul/templates/tests/chrome/test_bug329335.xul b/dom/xul/templates/tests/chrome/test_bug329335.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_bug329335.xul
rename to dom/xul/templates/tests/chrome/test_bug329335.xul
diff --git a/content/xul/templates/tests/chrome/test_bug330010.xul b/dom/xul/templates/tests/chrome/test_bug330010.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_bug330010.xul
rename to dom/xul/templates/tests/chrome/test_bug330010.xul
diff --git a/content/xul/templates/tests/chrome/test_bug397148.xul b/dom/xul/templates/tests/chrome/test_bug397148.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_bug397148.xul
rename to dom/xul/templates/tests/chrome/test_bug397148.xul
diff --git a/content/xul/templates/tests/chrome/test_bug441785.xul b/dom/xul/templates/tests/chrome/test_bug441785.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_bug441785.xul
rename to dom/xul/templates/tests/chrome/test_bug441785.xul
diff --git a/content/xul/templates/tests/chrome/test_bug476634.xul b/dom/xul/templates/tests/chrome/test_bug476634.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_bug476634.xul
rename to dom/xul/templates/tests/chrome/test_bug476634.xul
diff --git a/content/xul/templates/tests/chrome/test_sortservice.xul b/dom/xul/templates/tests/chrome/test_sortservice.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_sortservice.xul
rename to dom/xul/templates/tests/chrome/test_sortservice.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsextendedsyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul b/dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsmultiple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul b/dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingsreversed.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul b/dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_bindingssameastriple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul b/dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containerandmembervariablechanged.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul b/dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containervariablechanged.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul b/dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_containmentattribute.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul b/dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_defaultcontainervariableisuri.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_errors.xul b/dom/xul/templates/tests/chrome/test_tmpl_errors.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_errors.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_errors.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxemptyconditions.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxotherrefvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxremoveunmatched.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxsimplevariablesubstitution.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxtworulesrecurse.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedsyntaxusinganinterveningcontainer.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul b/dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_extendedvariablesubstitution.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_gridelement.xul b/dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_gridelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_gridelement.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul b/dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementextendedsyntaxwithbinding.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul b/dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementquerysyntaxwithmultiplerules.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul b/dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_htmlelementsimplesyntaxusingatextnode.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul b/dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_invalidqp.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul b/dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_listboxelement.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul b/dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_literalasmember.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul b/dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_membervariablechanged.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul b/dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_membervariablesubstitution.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_menuelement.xul b/dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_menuelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menuelement.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menuelementrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul b/dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_menulistelement.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul b/dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainer.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul b/dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxiscontainerisempty.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul b/dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_mixedsyntaxisempty.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_noaction.xul b/dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_noaction.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_noaction.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul b/dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_noactionuriattribute.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul b/dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentconditions.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul b/dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentcontenttag.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_parentsimplesyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_query3triples.xul b/dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_query3triples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_query3triples.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul b/dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_query3tripleswherecontains.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul b/dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymember3tripleswhereequals.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul b/dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymemberandtwotriples.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul b/dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querymembertriplemembertriple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul b/dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryresourcematch.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul b/dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryreversetriple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul b/dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryselfwithtriple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysetone.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysetone.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysetone.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysettwo.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysettwowithcondition.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerules.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulesfirstconditionall.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul b/dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querysyntaxmultiplerulestwoconditions.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul b/dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytripleandmembermerge.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul b/dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytripleobjecttosubject.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul b/dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwomembers.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul b/dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwomembersfiltered.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul b/dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querytwotriples.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul b/dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmember.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul b/dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_queryupwardsmembertripleandfilteringtriple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul b/dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_querywithemptyconditions.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul b/dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_referenceasmember.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_regenerate.xul b/dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_regenerate.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_regenerate.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_selfgenerationextendedsyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_selfgenerationsimplesyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainer.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxenclosedinacontainerwitharule.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilter.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithmultiplerules.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxfilterwithrule.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxiteratingoverasinglevalue.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusinganinterveningcontainer.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingatextnode.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingcontainerasthegenerationelement.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingdontrecurse.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegeneration.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxusingrecursivegenerationagain.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplesyntaxwithtwovariablesused.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsatbeginningandend.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutioncaretsubstitution.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionnovariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarkaspartofvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionquestionmarksubstitution.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutiontextandvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariableandtextconcatenated.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul b/dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_simplevariablesubstitutionvariablesconcatenated.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendinginteger.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworulesquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithcontainerquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortascendingtworuleswithdifferentcontainerquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortdescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortquerymemberandtwotriples.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2descendingsimplesyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicateascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresource2settopredicatedescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourceascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcedescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicateascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortresourcesettopredicatedescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcesasstringsettopredicatedescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttworesourcessettopredicateascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesascendingsimplesyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sorttwovariablesdescendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_sortunknownascendingquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_2.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_bad_parameters_3.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_baddatasource.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_badquery.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_dynamicparameters.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_listbox.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_multiqueries.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_parameters.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_rule.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_simple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerasc.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortintegerdesc.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringasc.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_sortstringdesc.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul b/dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_storage_tree.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntax.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxnotrecursivetreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerules.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivemultiplerulestreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxrecursivetreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementquerysyntaxtreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxnotrecursivetreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursive.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementsimplesyntaxrecursivetreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecell.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascending.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecellsortascendingtreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreecelltreebuilder.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemonly.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul b/dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_treeelementtreeitemsortascending.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul b/dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_twogenerationnodes.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafterignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafterlowercase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafternegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereafteruppercase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforeignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforelowercase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforenegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherebeforeuppercase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontains.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumber.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsnumberstring.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainsresource.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherecontainstwo.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswith.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswithignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereendswithnegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequals.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequals.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequals.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsmultiplenegationignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnegationwrongcase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsnumber.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsothervariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalsresource.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalssamevariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereequalswrongcase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreater.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaternegationstring.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheregreaterstring.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_whereless.xul b/dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_whereless.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_whereless.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessnegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessnegationstring.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherelessstring.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenorel.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenosubject.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherenovalue.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswith.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithignorecase.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithmultiple.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithnegation.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithunknownvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wherestartswithvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheresubjectequalsvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul b/dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_wheresubjectstartswithvariable.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
similarity index 69%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
index b34bbd6b500..9a576e37029 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerysimple.xul
@@ -15,10 +15,10 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
   </data>
 
 <script src="templates_shared.js"/>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
similarity index 77%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
index b7d6096639e..39992b43e60 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassign.xul
@@ -15,19 +15,19 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon">
       <button label="Chameleon"/>
       <label value="9"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae">
       <button label="Emu"/>
       <label value="3"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba">
       <button label="Barn Owl"/>
       <label value="8"/>
     </hbox>
-    <hbox id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax">
+    <hbox id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax">
       <button label="Raven"/>
       <label value="5"/>
     </hbox>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandcondition.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithassignmentandconditiondontrecurse.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginbindings.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithbindinginrule.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
similarity index 69%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
index 315ee4f1088..160d4bddbb8 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithdifferentmember.xul
@@ -15,10 +15,10 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon 2"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu 12"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl 4"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven 0"/>
   </data>
 
 <script src="templates_shared.js"/>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedata.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
similarity index 100%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithinlinedatawithmultiplequeries.xul
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
similarity index 74%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
index 769f8beb91a..075d2c45351 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithmultiplequeries.xul
@@ -15,10 +15,10 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="(Dromaius-novaehollandiae) is a large bird"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="(Tyto-alba) Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="(Corvus-corax) Raven"/>
-    <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="(Dromaius-novaehollandiae) is a large bird"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="(Tyto-alba) Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="(Corvus-corax) Raven"/>
+    <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
   </data>
 
 <script src="templates_shared.js"/>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
similarity index 77%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
index abe9fbe36ed..ce728b2b122 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithothertypes.xul
@@ -17,13 +17,13 @@
   <data id="output">
     <groupbox anyid="true" container="true" empty="false">
       <caption label="Reptiles false"/>
-      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
+      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" value="Chameleon"/>
     </groupbox>
     <groupbox anyid="true" container="true" empty="false">
       <caption label="Birds true"/>
-      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" value="Emu"/>
-      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" value="Barn Owl"/>
-      <label id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" value="Raven"/>
+      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" value="Emu"/>
+      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" value="Barn Owl"/>
+      <label id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" value="Raven"/>
     </groupbox>
   </data>
 
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
similarity index 70%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
index 8ce39ecb3cc..b83fc3595a6 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsort.xul
@@ -15,10 +15,10 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
   </data>
 
 <script src="templates_shared.js"/>
diff --git a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
similarity index 70%
rename from content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
rename to dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
index 89e0a19c963..ad1829d0d57 100644
--- a/content/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
+++ b/dom/xul/templates/tests/chrome/test_tmpl_xmlquerywithsortotherfield.xul
@@ -15,10 +15,10 @@
   <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;"/>
 
   <data id="output">
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
-    <button id="chrome://mochitests/content/chrome/content/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Tyto-alba" label="Barn Owl"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Dromaius-novaehollandiae" label="Emu"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Corvus-corax" label="Raven"/>
+    <button id="chrome://mochitests/content/chrome/dom/xul/templates/tests/chrome/animals.xml#Chamaeleo-chamaelon" label="Chameleon"/>
   </data>
 
 <script src="templates_shared.js"/>
diff --git a/content/xul/content/test/398289-resource.xul b/dom/xul/test/398289-resource.xul
similarity index 100%
rename from content/xul/content/test/398289-resource.xul
rename to dom/xul/test/398289-resource.xul
diff --git a/content/xul/document/test/bug497875-iframe.xul b/dom/xul/test/bug497875-iframe.xul
similarity index 100%
rename from content/xul/document/test/bug497875-iframe.xul
rename to dom/xul/test/bug497875-iframe.xul
diff --git a/content/xul/document/test/chrome.ini b/dom/xul/test/chrome.ini
similarity index 73%
rename from content/xul/document/test/chrome.ini
rename to dom/xul/test/chrome.ini
index 2c2c5f4b5c4..fd35e02482e 100644
--- a/content/xul/document/test/chrome.ini
+++ b/dom/xul/test/chrome.ini
@@ -1,15 +1,20 @@
 [DEFAULT]
 support-files =
+  398289-resource.xul
   bug497875-iframe.xul
+  file_bug236853.rdf
   overlay1_bug335375.xul
   overlay2_bug335375.xul
   window_bug583948.xul
   window_bug757137.xul
 
 [test_bug199692.xul]
+[test_bug233643.xul]
+[test_bug236853.xul]
 [test_bug311681.xul]
 [test_bug335375.xul]
 [test_bug391002.xul]
+[test_bug398289.html]
 [test_bug403868.xul]
 [test_bug414907.xul]
 [test_bug418216.xul]
@@ -20,3 +25,5 @@ support-files =
 [test_bug583948.xul]
 [test_bug640158_overlay_persist.xul]
 [test_bug757137.xul]
+[test_bug775972.xul]
+[test_import_xul_to_content.xul]
diff --git a/content/xul/content/test/file_bug236853.rdf b/dom/xul/test/file_bug236853.rdf
similarity index 100%
rename from content/xul/content/test/file_bug236853.rdf
rename to dom/xul/test/file_bug236853.rdf
diff --git a/content/xul/content/test/mochitest.ini b/dom/xul/test/mochitest.ini
similarity index 100%
rename from content/xul/content/test/mochitest.ini
rename to dom/xul/test/mochitest.ini
diff --git a/content/xul/document/test/overlay1_bug335375.xul b/dom/xul/test/overlay1_bug335375.xul
similarity index 100%
rename from content/xul/document/test/overlay1_bug335375.xul
rename to dom/xul/test/overlay1_bug335375.xul
diff --git a/content/xul/document/test/overlay2_bug335375.xul b/dom/xul/test/overlay2_bug335375.xul
similarity index 100%
rename from content/xul/document/test/overlay2_bug335375.xul
rename to dom/xul/test/overlay2_bug335375.xul
diff --git a/content/xul/document/test/overlay_640158.xul b/dom/xul/test/overlay_640158.xul
similarity index 100%
rename from content/xul/document/test/overlay_640158.xul
rename to dom/xul/test/overlay_640158.xul
diff --git a/content/xul/document/test/test_bug199692.xul b/dom/xul/test/test_bug199692.xul
similarity index 100%
rename from content/xul/document/test/test_bug199692.xul
rename to dom/xul/test/test_bug199692.xul
diff --git a/content/xul/content/test/test_bug233643.xul b/dom/xul/test/test_bug233643.xul
similarity index 100%
rename from content/xul/content/test/test_bug233643.xul
rename to dom/xul/test/test_bug233643.xul
diff --git a/content/xul/content/test/test_bug236853.xul b/dom/xul/test/test_bug236853.xul
similarity index 100%
rename from content/xul/content/test/test_bug236853.xul
rename to dom/xul/test/test_bug236853.xul
diff --git a/content/xul/document/test/test_bug311681.xul b/dom/xul/test/test_bug311681.xul
similarity index 100%
rename from content/xul/document/test/test_bug311681.xul
rename to dom/xul/test/test_bug311681.xul
diff --git a/content/xul/document/test/test_bug335375.xul b/dom/xul/test/test_bug335375.xul
similarity index 100%
rename from content/xul/document/test/test_bug335375.xul
rename to dom/xul/test/test_bug335375.xul
diff --git a/content/xul/document/test/test_bug391002.xul b/dom/xul/test/test_bug391002.xul
similarity index 100%
rename from content/xul/document/test/test_bug391002.xul
rename to dom/xul/test/test_bug391002.xul
diff --git a/content/xul/content/test/test_bug398289.html b/dom/xul/test/test_bug398289.html
similarity index 100%
rename from content/xul/content/test/test_bug398289.html
rename to dom/xul/test/test_bug398289.html
diff --git a/content/xul/document/test/test_bug403868.xul b/dom/xul/test/test_bug403868.xul
similarity index 100%
rename from content/xul/document/test/test_bug403868.xul
rename to dom/xul/test/test_bug403868.xul
diff --git a/content/xul/document/test/test_bug414907.xul b/dom/xul/test/test_bug414907.xul
similarity index 100%
rename from content/xul/document/test/test_bug414907.xul
rename to dom/xul/test/test_bug414907.xul
diff --git a/content/xul/document/test/test_bug418216.xul b/dom/xul/test/test_bug418216.xul
similarity index 100%
rename from content/xul/document/test/test_bug418216.xul
rename to dom/xul/test/test_bug418216.xul
diff --git a/content/xul/document/test/test_bug445177.xul b/dom/xul/test/test_bug445177.xul
similarity index 100%
rename from content/xul/document/test/test_bug445177.xul
rename to dom/xul/test/test_bug445177.xul
diff --git a/content/xul/document/test/test_bug449457.xul b/dom/xul/test/test_bug449457.xul
similarity index 100%
rename from content/xul/document/test/test_bug449457.xul
rename to dom/xul/test/test_bug449457.xul
diff --git a/content/xul/document/test/test_bug468176.xul b/dom/xul/test/test_bug468176.xul
similarity index 100%
rename from content/xul/document/test/test_bug468176.xul
rename to dom/xul/test/test_bug468176.xul
diff --git a/content/xul/content/test/test_bug486990.xul b/dom/xul/test/test_bug486990.xul
similarity index 100%
rename from content/xul/content/test/test_bug486990.xul
rename to dom/xul/test/test_bug486990.xul
diff --git a/content/xul/document/test/test_bug497875.xul b/dom/xul/test/test_bug497875.xul
similarity index 100%
rename from content/xul/document/test/test_bug497875.xul
rename to dom/xul/test/test_bug497875.xul
diff --git a/content/xul/document/test/test_bug583948.xul b/dom/xul/test/test_bug583948.xul
similarity index 100%
rename from content/xul/document/test/test_bug583948.xul
rename to dom/xul/test/test_bug583948.xul
diff --git a/content/xul/document/test/test_bug640158_overlay_persist.xul b/dom/xul/test/test_bug640158_overlay_persist.xul
similarity index 100%
rename from content/xul/document/test/test_bug640158_overlay_persist.xul
rename to dom/xul/test/test_bug640158_overlay_persist.xul
diff --git a/content/xul/content/test/test_bug749367.xul b/dom/xul/test/test_bug749367.xul
similarity index 100%
rename from content/xul/content/test/test_bug749367.xul
rename to dom/xul/test/test_bug749367.xul
diff --git a/content/xul/document/test/test_bug757137.xul b/dom/xul/test/test_bug757137.xul
similarity index 100%
rename from content/xul/document/test/test_bug757137.xul
rename to dom/xul/test/test_bug757137.xul
diff --git a/content/xul/content/test/test_bug775972.xul b/dom/xul/test/test_bug775972.xul
similarity index 100%
rename from content/xul/content/test/test_bug775972.xul
rename to dom/xul/test/test_bug775972.xul
diff --git a/content/xul/content/test/test_import_xul_to_content.xul b/dom/xul/test/test_import_xul_to_content.xul
similarity index 100%
rename from content/xul/content/test/test_import_xul_to_content.xul
rename to dom/xul/test/test_import_xul_to_content.xul
diff --git a/content/xul/document/test/window_bug583948.xul b/dom/xul/test/window_bug583948.xul
similarity index 100%
rename from content/xul/document/test/window_bug583948.xul
rename to dom/xul/test/window_bug583948.xul
diff --git a/content/xul/document/test/window_bug757137.xul b/dom/xul/test/window_bug757137.xul
similarity index 100%
rename from content/xul/document/test/window_bug757137.xul
rename to dom/xul/test/window_bug757137.xul
diff --git a/layout/build/moz.build b/layout/build/moz.build
index b4834added6..9c83178b0b9 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -41,9 +41,6 @@ LOCAL_INCLUDES += [
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
-    '/content/xul/content/src',
-    '/content/xul/document/src',
-    '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
@@ -63,6 +60,8 @@ LOCAL_INCLUDES += [
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
+    '/dom/xul',
+    '/dom/xul/templates',
     '/editor/composer',
     '/editor/libeditor',
     '/editor/txmgr',
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 590ff041257..b6da4921dc3 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -122,7 +122,6 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
-    '../../content/xul/content/src',
     '../../dom/base',
     '../../dom/plugins/base',
     '../base',
@@ -131,6 +130,7 @@ LOCAL_INCLUDES += [
     '../svg',
     '../tables',
     '../xul',
+    '/dom/xul',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/layout/reftests/xul-document-load/readme.txt b/layout/reftests/xul-document-load/readme.txt
index 4b93cbf6640..8879e9d4b11 100644
--- a/layout/reftests/xul-document-load/readme.txt
+++ b/layout/reftests/xul-document-load/readme.txt
@@ -1,4 +1,4 @@
-This directory contains various XUL document (mozilla/content/xul/document) testcases for reftest.
+This directory contains various XUL document (mozilla/dom/xul/document) testcases for reftest.
 
 test001: Checks that stylesheets referenced from an overlay via an
          xml-stylesheet PI are applied to the master document appropriately.
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 81b3b9a47ec..e23e7fde473 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -157,12 +157,12 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
-    '../../content/xul/document/src',
     '../base',
     '../generic',
     '../xul',
     '/dom/base',
     '/dom/xbl',
+    '/dom/xul',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index a902d4279b3..bf5e945aa17 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -281,7 +281,6 @@
 @BINPATH@/components/xpconnect.xpt
 @BINPATH@/components/xulapp.xpt
 @BINPATH@/components/xul.xpt
-@BINPATH@/components/xuldoc.xpt
 @BINPATH@/components/xultmpl.xpt
 @BINPATH@/components/zipwriter.xpt
 
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 47ec9fdb763..06dcc89f77e 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -10,9 +10,6 @@ include ../../content/html/content/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/media/test/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
-include ../../content/xul/content/crashtests/crashtests.list
-include ../../content/xul/document/crashtests/crashtests.list
-include ../../content/xul/templates/src/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
@@ -30,6 +27,8 @@ include ../../dom/workers/test/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xml/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
+include ../../dom/xul/crashtests/crashtests.list
+include ../../dom/xul/templates/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list

From a3d5c343f5c52ca9003eef605d95f72e97a40aae Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:21:12 +0300
Subject: [PATCH 20/37] Bug 946065 - Part 9: Move content/svg/ to dom/ and
 flatten subdirectories. r=jwatt

--HG--
rename : content/svg/content/src/DOMSVGAnimatedLengthList.cpp => dom/svg/DOMSVGAnimatedLengthList.cpp
rename : content/svg/content/src/DOMSVGAnimatedLengthList.h => dom/svg/DOMSVGAnimatedLengthList.h
rename : content/svg/content/src/DOMSVGAnimatedNumberList.cpp => dom/svg/DOMSVGAnimatedNumberList.cpp
rename : content/svg/content/src/DOMSVGAnimatedNumberList.h => dom/svg/DOMSVGAnimatedNumberList.h
rename : content/svg/content/src/DOMSVGLength.cpp => dom/svg/DOMSVGLength.cpp
rename : content/svg/content/src/DOMSVGLength.h => dom/svg/DOMSVGLength.h
rename : content/svg/content/src/DOMSVGLengthList.cpp => dom/svg/DOMSVGLengthList.cpp
rename : content/svg/content/src/DOMSVGLengthList.h => dom/svg/DOMSVGLengthList.h
rename : content/svg/content/src/DOMSVGNumber.cpp => dom/svg/DOMSVGNumber.cpp
rename : content/svg/content/src/DOMSVGNumber.h => dom/svg/DOMSVGNumber.h
rename : content/svg/content/src/DOMSVGNumberList.cpp => dom/svg/DOMSVGNumberList.cpp
rename : content/svg/content/src/DOMSVGNumberList.h => dom/svg/DOMSVGNumberList.h
rename : content/svg/content/src/DOMSVGPathSeg.cpp => dom/svg/DOMSVGPathSeg.cpp
rename : content/svg/content/src/DOMSVGPathSeg.h => dom/svg/DOMSVGPathSeg.h
rename : content/svg/content/src/DOMSVGPathSegList.cpp => dom/svg/DOMSVGPathSegList.cpp
rename : content/svg/content/src/DOMSVGPathSegList.h => dom/svg/DOMSVGPathSegList.h
rename : content/svg/content/src/DOMSVGPoint.cpp => dom/svg/DOMSVGPoint.cpp
rename : content/svg/content/src/DOMSVGPoint.h => dom/svg/DOMSVGPoint.h
rename : content/svg/content/src/DOMSVGPointList.cpp => dom/svg/DOMSVGPointList.cpp
rename : content/svg/content/src/DOMSVGPointList.h => dom/svg/DOMSVGPointList.h
rename : content/svg/content/src/DOMSVGStringList.cpp => dom/svg/DOMSVGStringList.cpp
rename : content/svg/content/src/DOMSVGStringList.h => dom/svg/DOMSVGStringList.h
rename : content/svg/content/src/DOMSVGTransformList.cpp => dom/svg/DOMSVGTransformList.cpp
rename : content/svg/content/src/DOMSVGTransformList.h => dom/svg/DOMSVGTransformList.h
rename : content/svg/content/src/SVGAElement.cpp => dom/svg/SVGAElement.cpp
rename : content/svg/content/src/SVGAElement.h => dom/svg/SVGAElement.h
rename : content/svg/content/src/SVGAltGlyphElement.cpp => dom/svg/SVGAltGlyphElement.cpp
rename : content/svg/content/src/SVGAltGlyphElement.h => dom/svg/SVGAltGlyphElement.h
rename : content/svg/content/src/SVGAngle.cpp => dom/svg/SVGAngle.cpp
rename : content/svg/content/src/SVGAngle.h => dom/svg/SVGAngle.h
rename : content/svg/content/src/SVGAnimateElement.cpp => dom/svg/SVGAnimateElement.cpp
rename : content/svg/content/src/SVGAnimateElement.h => dom/svg/SVGAnimateElement.h
rename : content/svg/content/src/SVGAnimateMotionElement.cpp => dom/svg/SVGAnimateMotionElement.cpp
rename : content/svg/content/src/SVGAnimateMotionElement.h => dom/svg/SVGAnimateMotionElement.h
rename : content/svg/content/src/SVGAnimateTransformElement.cpp => dom/svg/SVGAnimateTransformElement.cpp
rename : content/svg/content/src/SVGAnimateTransformElement.h => dom/svg/SVGAnimateTransformElement.h
rename : content/svg/content/src/SVGAnimatedAngle.cpp => dom/svg/SVGAnimatedAngle.cpp
rename : content/svg/content/src/SVGAnimatedAngle.h => dom/svg/SVGAnimatedAngle.h
rename : content/svg/content/src/SVGAnimatedBoolean.cpp => dom/svg/SVGAnimatedBoolean.cpp
rename : content/svg/content/src/SVGAnimatedBoolean.h => dom/svg/SVGAnimatedBoolean.h
rename : content/svg/content/src/SVGAnimatedEnumeration.cpp => dom/svg/SVGAnimatedEnumeration.cpp
rename : content/svg/content/src/SVGAnimatedEnumeration.h => dom/svg/SVGAnimatedEnumeration.h
rename : content/svg/content/src/SVGAnimatedInteger.cpp => dom/svg/SVGAnimatedInteger.cpp
rename : content/svg/content/src/SVGAnimatedInteger.h => dom/svg/SVGAnimatedInteger.h
rename : content/svg/content/src/SVGAnimatedLength.cpp => dom/svg/SVGAnimatedLength.cpp
rename : content/svg/content/src/SVGAnimatedLength.h => dom/svg/SVGAnimatedLength.h
rename : content/svg/content/src/SVGAnimatedLengthList.cpp => dom/svg/SVGAnimatedLengthList.cpp
rename : content/svg/content/src/SVGAnimatedLengthList.h => dom/svg/SVGAnimatedLengthList.h
rename : content/svg/content/src/SVGAnimatedNumber.cpp => dom/svg/SVGAnimatedNumber.cpp
rename : content/svg/content/src/SVGAnimatedNumber.h => dom/svg/SVGAnimatedNumber.h
rename : content/svg/content/src/SVGAnimatedNumberList.cpp => dom/svg/SVGAnimatedNumberList.cpp
rename : content/svg/content/src/SVGAnimatedNumberList.h => dom/svg/SVGAnimatedNumberList.h
rename : content/svg/content/src/SVGAnimatedPathSegList.cpp => dom/svg/SVGAnimatedPathSegList.cpp
rename : content/svg/content/src/SVGAnimatedPathSegList.h => dom/svg/SVGAnimatedPathSegList.h
rename : content/svg/content/src/SVGAnimatedPointList.cpp => dom/svg/SVGAnimatedPointList.cpp
rename : content/svg/content/src/SVGAnimatedPointList.h => dom/svg/SVGAnimatedPointList.h
rename : content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp => dom/svg/SVGAnimatedPreserveAspectRatio.cpp
rename : content/svg/content/src/SVGAnimatedPreserveAspectRatio.h => dom/svg/SVGAnimatedPreserveAspectRatio.h
rename : content/svg/content/src/SVGAnimatedRect.cpp => dom/svg/SVGAnimatedRect.cpp
rename : content/svg/content/src/SVGAnimatedRect.h => dom/svg/SVGAnimatedRect.h
rename : content/svg/content/src/SVGAnimatedString.cpp => dom/svg/SVGAnimatedString.cpp
rename : content/svg/content/src/SVGAnimatedString.h => dom/svg/SVGAnimatedString.h
rename : content/svg/content/src/SVGAnimatedTransformList.cpp => dom/svg/SVGAnimatedTransformList.cpp
rename : content/svg/content/src/SVGAnimatedTransformList.h => dom/svg/SVGAnimatedTransformList.h
rename : content/svg/content/src/SVGAnimationElement.cpp => dom/svg/SVGAnimationElement.cpp
rename : content/svg/content/src/SVGAnimationElement.h => dom/svg/SVGAnimationElement.h
rename : content/svg/content/src/SVGAttrValueWrapper.cpp => dom/svg/SVGAttrValueWrapper.cpp
rename : content/svg/content/src/SVGAttrValueWrapper.h => dom/svg/SVGAttrValueWrapper.h
rename : content/svg/content/src/SVGCircleElement.cpp => dom/svg/SVGCircleElement.cpp
rename : content/svg/content/src/SVGCircleElement.h => dom/svg/SVGCircleElement.h
rename : content/svg/content/src/SVGClipPathElement.cpp => dom/svg/SVGClipPathElement.cpp
rename : content/svg/content/src/SVGClipPathElement.h => dom/svg/SVGClipPathElement.h
rename : content/svg/content/src/SVGComponentTransferFunctionElement.h => dom/svg/SVGComponentTransferFunctionElement.h
rename : content/svg/content/src/SVGContentUtils.cpp => dom/svg/SVGContentUtils.cpp
rename : content/svg/content/src/SVGContentUtils.h => dom/svg/SVGContentUtils.h
rename : content/svg/content/src/SVGDefsElement.cpp => dom/svg/SVGDefsElement.cpp
rename : content/svg/content/src/SVGDefsElement.h => dom/svg/SVGDefsElement.h
rename : content/svg/content/src/SVGDescElement.cpp => dom/svg/SVGDescElement.cpp
rename : content/svg/content/src/SVGDescElement.h => dom/svg/SVGDescElement.h
rename : content/svg/document/src/SVGDocument.cpp => dom/svg/SVGDocument.cpp
rename : content/svg/document/src/SVGDocument.h => dom/svg/SVGDocument.h
rename : content/svg/content/src/SVGElementFactory.cpp => dom/svg/SVGElementFactory.cpp
rename : content/svg/content/src/SVGElementFactory.h => dom/svg/SVGElementFactory.h
rename : content/svg/content/src/SVGEllipseElement.cpp => dom/svg/SVGEllipseElement.cpp
rename : content/svg/content/src/SVGEllipseElement.h => dom/svg/SVGEllipseElement.h
rename : content/svg/content/src/SVGFEBlendElement.cpp => dom/svg/SVGFEBlendElement.cpp
rename : content/svg/content/src/SVGFEBlendElement.h => dom/svg/SVGFEBlendElement.h
rename : content/svg/content/src/SVGFEColorMatrixElement.cpp => dom/svg/SVGFEColorMatrixElement.cpp
rename : content/svg/content/src/SVGFEColorMatrixElement.h => dom/svg/SVGFEColorMatrixElement.h
rename : content/svg/content/src/SVGFEComponentTransferElement.cpp => dom/svg/SVGFEComponentTransferElement.cpp
rename : content/svg/content/src/SVGFEComponentTransferElement.h => dom/svg/SVGFEComponentTransferElement.h
rename : content/svg/content/src/SVGFECompositeElement.cpp => dom/svg/SVGFECompositeElement.cpp
rename : content/svg/content/src/SVGFECompositeElement.h => dom/svg/SVGFECompositeElement.h
rename : content/svg/content/src/SVGFEConvolveMatrixElement.cpp => dom/svg/SVGFEConvolveMatrixElement.cpp
rename : content/svg/content/src/SVGFEConvolveMatrixElement.h => dom/svg/SVGFEConvolveMatrixElement.h
rename : content/svg/content/src/SVGFEDiffuseLightingElement.cpp => dom/svg/SVGFEDiffuseLightingElement.cpp
rename : content/svg/content/src/SVGFEDiffuseLightingElement.h => dom/svg/SVGFEDiffuseLightingElement.h
rename : content/svg/content/src/SVGFEDisplacementMapElement.cpp => dom/svg/SVGFEDisplacementMapElement.cpp
rename : content/svg/content/src/SVGFEDisplacementMapElement.h => dom/svg/SVGFEDisplacementMapElement.h
rename : content/svg/content/src/SVGFEDistantLightElement.cpp => dom/svg/SVGFEDistantLightElement.cpp
rename : content/svg/content/src/SVGFEDistantLightElement.h => dom/svg/SVGFEDistantLightElement.h
rename : content/svg/content/src/SVGFEDropShadowElement.cpp => dom/svg/SVGFEDropShadowElement.cpp
rename : content/svg/content/src/SVGFEDropShadowElement.h => dom/svg/SVGFEDropShadowElement.h
rename : content/svg/content/src/SVGFEFloodElement.cpp => dom/svg/SVGFEFloodElement.cpp
rename : content/svg/content/src/SVGFEFloodElement.h => dom/svg/SVGFEFloodElement.h
rename : content/svg/content/src/SVGFEGaussianBlurElement.cpp => dom/svg/SVGFEGaussianBlurElement.cpp
rename : content/svg/content/src/SVGFEGaussianBlurElement.h => dom/svg/SVGFEGaussianBlurElement.h
rename : content/svg/content/src/SVGFEImageElement.cpp => dom/svg/SVGFEImageElement.cpp
rename : content/svg/content/src/SVGFEImageElement.h => dom/svg/SVGFEImageElement.h
rename : content/svg/content/src/SVGFEMergeElement.cpp => dom/svg/SVGFEMergeElement.cpp
rename : content/svg/content/src/SVGFEMergeElement.h => dom/svg/SVGFEMergeElement.h
rename : content/svg/content/src/SVGFEMergeNodeElement.cpp => dom/svg/SVGFEMergeNodeElement.cpp
rename : content/svg/content/src/SVGFEMergeNodeElement.h => dom/svg/SVGFEMergeNodeElement.h
rename : content/svg/content/src/SVGFEMorphologyElement.cpp => dom/svg/SVGFEMorphologyElement.cpp
rename : content/svg/content/src/SVGFEMorphologyElement.h => dom/svg/SVGFEMorphologyElement.h
rename : content/svg/content/src/SVGFEOffsetElement.cpp => dom/svg/SVGFEOffsetElement.cpp
rename : content/svg/content/src/SVGFEOffsetElement.h => dom/svg/SVGFEOffsetElement.h
rename : content/svg/content/src/SVGFEPointLightElement.cpp => dom/svg/SVGFEPointLightElement.cpp
rename : content/svg/content/src/SVGFEPointLightElement.h => dom/svg/SVGFEPointLightElement.h
rename : content/svg/content/src/SVGFESpecularLightingElement.cpp => dom/svg/SVGFESpecularLightingElement.cpp
rename : content/svg/content/src/SVGFESpecularLightingElement.h => dom/svg/SVGFESpecularLightingElement.h
rename : content/svg/content/src/SVGFESpotLightElement.cpp => dom/svg/SVGFESpotLightElement.cpp
rename : content/svg/content/src/SVGFESpotLightElement.h => dom/svg/SVGFESpotLightElement.h
rename : content/svg/content/src/SVGFETileElement.cpp => dom/svg/SVGFETileElement.cpp
rename : content/svg/content/src/SVGFETileElement.h => dom/svg/SVGFETileElement.h
rename : content/svg/content/src/SVGFETurbulenceElement.cpp => dom/svg/SVGFETurbulenceElement.cpp
rename : content/svg/content/src/SVGFETurbulenceElement.h => dom/svg/SVGFETurbulenceElement.h
rename : content/svg/content/src/SVGFilterElement.cpp => dom/svg/SVGFilterElement.cpp
rename : content/svg/content/src/SVGFilterElement.h => dom/svg/SVGFilterElement.h
rename : content/svg/content/src/SVGForeignObjectElement.cpp => dom/svg/SVGForeignObjectElement.cpp
rename : content/svg/content/src/SVGForeignObjectElement.h => dom/svg/SVGForeignObjectElement.h
rename : content/svg/content/src/SVGFragmentIdentifier.cpp => dom/svg/SVGFragmentIdentifier.cpp
rename : content/svg/content/src/SVGFragmentIdentifier.h => dom/svg/SVGFragmentIdentifier.h
rename : content/svg/content/src/SVGGElement.cpp => dom/svg/SVGGElement.cpp
rename : content/svg/content/src/SVGGElement.h => dom/svg/SVGGElement.h
rename : content/svg/content/src/SVGGradientElement.cpp => dom/svg/SVGGradientElement.cpp
rename : content/svg/content/src/SVGGradientElement.h => dom/svg/SVGGradientElement.h
rename : content/svg/content/src/SVGGraphicsElement.cpp => dom/svg/SVGGraphicsElement.cpp
rename : content/svg/content/src/SVGGraphicsElement.h => dom/svg/SVGGraphicsElement.h
rename : content/svg/content/src/SVGIFrameElement.cpp => dom/svg/SVGIFrameElement.cpp
rename : content/svg/content/src/SVGIFrameElement.h => dom/svg/SVGIFrameElement.h
rename : content/svg/content/src/SVGIRect.h => dom/svg/SVGIRect.h
rename : content/svg/content/src/SVGImageElement.cpp => dom/svg/SVGImageElement.cpp
rename : content/svg/content/src/SVGImageElement.h => dom/svg/SVGImageElement.h
rename : content/svg/content/src/SVGIntegerPairSMILType.cpp => dom/svg/SVGIntegerPairSMILType.cpp
rename : content/svg/content/src/SVGIntegerPairSMILType.h => dom/svg/SVGIntegerPairSMILType.h
rename : content/svg/content/src/SVGLength.cpp => dom/svg/SVGLength.cpp
rename : content/svg/content/src/SVGLength.h => dom/svg/SVGLength.h
rename : content/svg/content/src/SVGLengthList.cpp => dom/svg/SVGLengthList.cpp
rename : content/svg/content/src/SVGLengthList.h => dom/svg/SVGLengthList.h
rename : content/svg/content/src/SVGLengthListSMILType.cpp => dom/svg/SVGLengthListSMILType.cpp
rename : content/svg/content/src/SVGLengthListSMILType.h => dom/svg/SVGLengthListSMILType.h
rename : content/svg/content/src/SVGLineElement.cpp => dom/svg/SVGLineElement.cpp
rename : content/svg/content/src/SVGLineElement.h => dom/svg/SVGLineElement.h
rename : content/svg/content/src/SVGMPathElement.cpp => dom/svg/SVGMPathElement.cpp
rename : content/svg/content/src/SVGMPathElement.h => dom/svg/SVGMPathElement.h
rename : content/svg/content/src/SVGMarkerElement.cpp => dom/svg/SVGMarkerElement.cpp
rename : content/svg/content/src/SVGMarkerElement.h => dom/svg/SVGMarkerElement.h
rename : content/svg/content/src/SVGMaskElement.cpp => dom/svg/SVGMaskElement.cpp
rename : content/svg/content/src/SVGMaskElement.h => dom/svg/SVGMaskElement.h
rename : content/svg/content/src/SVGMatrix.cpp => dom/svg/SVGMatrix.cpp
rename : content/svg/content/src/SVGMatrix.h => dom/svg/SVGMatrix.h
rename : content/svg/content/src/SVGMetadataElement.cpp => dom/svg/SVGMetadataElement.cpp
rename : content/svg/content/src/SVGMetadataElement.h => dom/svg/SVGMetadataElement.h
rename : content/svg/content/src/SVGMotionSMILAnimationFunction.cpp => dom/svg/SVGMotionSMILAnimationFunction.cpp
rename : content/svg/content/src/SVGMotionSMILAnimationFunction.h => dom/svg/SVGMotionSMILAnimationFunction.h
rename : content/svg/content/src/SVGMotionSMILAttr.cpp => dom/svg/SVGMotionSMILAttr.cpp
rename : content/svg/content/src/SVGMotionSMILAttr.h => dom/svg/SVGMotionSMILAttr.h
rename : content/svg/content/src/SVGMotionSMILPathUtils.cpp => dom/svg/SVGMotionSMILPathUtils.cpp
rename : content/svg/content/src/SVGMotionSMILPathUtils.h => dom/svg/SVGMotionSMILPathUtils.h
rename : content/svg/content/src/SVGMotionSMILType.cpp => dom/svg/SVGMotionSMILType.cpp
rename : content/svg/content/src/SVGMotionSMILType.h => dom/svg/SVGMotionSMILType.h
rename : content/svg/content/src/SVGNumberList.cpp => dom/svg/SVGNumberList.cpp
rename : content/svg/content/src/SVGNumberList.h => dom/svg/SVGNumberList.h
rename : content/svg/content/src/SVGNumberListSMILType.cpp => dom/svg/SVGNumberListSMILType.cpp
rename : content/svg/content/src/SVGNumberListSMILType.h => dom/svg/SVGNumberListSMILType.h
rename : content/svg/content/src/SVGNumberPairSMILType.cpp => dom/svg/SVGNumberPairSMILType.cpp
rename : content/svg/content/src/SVGNumberPairSMILType.h => dom/svg/SVGNumberPairSMILType.h
rename : content/svg/content/src/SVGOrientSMILType.cpp => dom/svg/SVGOrientSMILType.cpp
rename : content/svg/content/src/SVGOrientSMILType.h => dom/svg/SVGOrientSMILType.h
rename : content/svg/content/src/SVGPathData.cpp => dom/svg/SVGPathData.cpp
rename : content/svg/content/src/SVGPathData.h => dom/svg/SVGPathData.h
rename : content/svg/content/src/SVGPathElement.cpp => dom/svg/SVGPathElement.cpp
rename : content/svg/content/src/SVGPathElement.h => dom/svg/SVGPathElement.h
rename : content/svg/content/src/SVGPathSegListSMILType.cpp => dom/svg/SVGPathSegListSMILType.cpp
rename : content/svg/content/src/SVGPathSegListSMILType.h => dom/svg/SVGPathSegListSMILType.h
rename : content/svg/content/src/SVGPathSegUtils.cpp => dom/svg/SVGPathSegUtils.cpp
rename : content/svg/content/src/SVGPathSegUtils.h => dom/svg/SVGPathSegUtils.h
rename : content/svg/content/src/SVGPatternElement.cpp => dom/svg/SVGPatternElement.cpp
rename : content/svg/content/src/SVGPatternElement.h => dom/svg/SVGPatternElement.h
rename : content/svg/content/src/SVGPoint.h => dom/svg/SVGPoint.h
rename : content/svg/content/src/SVGPointList.cpp => dom/svg/SVGPointList.cpp
rename : content/svg/content/src/SVGPointList.h => dom/svg/SVGPointList.h
rename : content/svg/content/src/SVGPointListSMILType.cpp => dom/svg/SVGPointListSMILType.cpp
rename : content/svg/content/src/SVGPointListSMILType.h => dom/svg/SVGPointListSMILType.h
rename : content/svg/content/src/SVGPolygonElement.cpp => dom/svg/SVGPolygonElement.cpp
rename : content/svg/content/src/SVGPolygonElement.h => dom/svg/SVGPolygonElement.h
rename : content/svg/content/src/SVGPolylineElement.cpp => dom/svg/SVGPolylineElement.cpp
rename : content/svg/content/src/SVGPolylineElement.h => dom/svg/SVGPolylineElement.h
rename : content/svg/content/src/SVGPreserveAspectRatio.cpp => dom/svg/SVGPreserveAspectRatio.cpp
rename : content/svg/content/src/SVGPreserveAspectRatio.h => dom/svg/SVGPreserveAspectRatio.h
rename : content/svg/content/src/SVGRect.cpp => dom/svg/SVGRect.cpp
rename : content/svg/content/src/SVGRect.h => dom/svg/SVGRect.h
rename : content/svg/content/src/SVGRectElement.cpp => dom/svg/SVGRectElement.cpp
rename : content/svg/content/src/SVGRectElement.h => dom/svg/SVGRectElement.h
rename : content/svg/content/src/SVGSVGElement.cpp => dom/svg/SVGSVGElement.cpp
rename : content/svg/content/src/SVGSVGElement.h => dom/svg/SVGSVGElement.h
rename : content/svg/content/src/SVGScriptElement.cpp => dom/svg/SVGScriptElement.cpp
rename : content/svg/content/src/SVGScriptElement.h => dom/svg/SVGScriptElement.h
rename : content/svg/content/src/SVGSetElement.cpp => dom/svg/SVGSetElement.cpp
rename : content/svg/content/src/SVGSetElement.h => dom/svg/SVGSetElement.h
rename : content/svg/content/src/SVGStopElement.cpp => dom/svg/SVGStopElement.cpp
rename : content/svg/content/src/SVGStopElement.h => dom/svg/SVGStopElement.h
rename : content/svg/content/src/SVGStringList.cpp => dom/svg/SVGStringList.cpp
rename : content/svg/content/src/SVGStringList.h => dom/svg/SVGStringList.h
rename : content/svg/content/src/SVGStyleElement.cpp => dom/svg/SVGStyleElement.cpp
rename : content/svg/content/src/SVGStyleElement.h => dom/svg/SVGStyleElement.h
rename : content/svg/content/src/SVGSwitchElement.cpp => dom/svg/SVGSwitchElement.cpp
rename : content/svg/content/src/SVGSwitchElement.h => dom/svg/SVGSwitchElement.h
rename : content/svg/content/src/SVGSymbolElement.cpp => dom/svg/SVGSymbolElement.cpp
rename : content/svg/content/src/SVGSymbolElement.h => dom/svg/SVGSymbolElement.h
rename : content/svg/content/src/SVGTSpanElement.cpp => dom/svg/SVGTSpanElement.cpp
rename : content/svg/content/src/SVGTSpanElement.h => dom/svg/SVGTSpanElement.h
rename : content/svg/content/src/SVGTagList.h => dom/svg/SVGTagList.h
rename : content/svg/content/src/SVGTests.cpp => dom/svg/SVGTests.cpp
rename : content/svg/content/src/SVGTests.h => dom/svg/SVGTests.h
rename : content/svg/content/src/SVGTextContentElement.cpp => dom/svg/SVGTextContentElement.cpp
rename : content/svg/content/src/SVGTextContentElement.h => dom/svg/SVGTextContentElement.h
rename : content/svg/content/src/SVGTextElement.cpp => dom/svg/SVGTextElement.cpp
rename : content/svg/content/src/SVGTextElement.h => dom/svg/SVGTextElement.h
rename : content/svg/content/src/SVGTextPathElement.cpp => dom/svg/SVGTextPathElement.cpp
rename : content/svg/content/src/SVGTextPathElement.h => dom/svg/SVGTextPathElement.h
rename : content/svg/content/src/SVGTextPositioningElement.cpp => dom/svg/SVGTextPositioningElement.cpp
rename : content/svg/content/src/SVGTextPositioningElement.h => dom/svg/SVGTextPositioningElement.h
rename : content/svg/content/src/SVGTitleElement.cpp => dom/svg/SVGTitleElement.cpp
rename : content/svg/content/src/SVGTitleElement.h => dom/svg/SVGTitleElement.h
rename : content/svg/content/src/SVGTransform.cpp => dom/svg/SVGTransform.cpp
rename : content/svg/content/src/SVGTransform.h => dom/svg/SVGTransform.h
rename : content/svg/content/src/SVGTransformList.cpp => dom/svg/SVGTransformList.cpp
rename : content/svg/content/src/SVGTransformList.h => dom/svg/SVGTransformList.h
rename : content/svg/content/src/SVGTransformListParser.cpp => dom/svg/SVGTransformListParser.cpp
rename : content/svg/content/src/SVGTransformListParser.h => dom/svg/SVGTransformListParser.h
rename : content/svg/content/src/SVGTransformListSMILType.cpp => dom/svg/SVGTransformListSMILType.cpp
rename : content/svg/content/src/SVGTransformListSMILType.h => dom/svg/SVGTransformListSMILType.h
rename : content/svg/content/src/SVGTransformableElement.cpp => dom/svg/SVGTransformableElement.cpp
rename : content/svg/content/src/SVGTransformableElement.h => dom/svg/SVGTransformableElement.h
rename : content/svg/content/src/SVGUseElement.cpp => dom/svg/SVGUseElement.cpp
rename : content/svg/content/src/SVGUseElement.h => dom/svg/SVGUseElement.h
rename : content/svg/content/src/SVGViewBoxSMILType.cpp => dom/svg/SVGViewBoxSMILType.cpp
rename : content/svg/content/src/SVGViewBoxSMILType.h => dom/svg/SVGViewBoxSMILType.h
rename : content/svg/content/src/SVGViewElement.cpp => dom/svg/SVGViewElement.cpp
rename : content/svg/content/src/SVGViewElement.h => dom/svg/SVGViewElement.h
rename : content/svg/content/src/SVGZoomEvent.cpp => dom/svg/SVGZoomEvent.cpp
rename : content/svg/content/src/SVGZoomEvent.h => dom/svg/SVGZoomEvent.h
rename : content/svg/content/src/crashtests/307322-1.svg => dom/svg/crashtests/307322-1.svg
rename : content/svg/content/src/crashtests/327705-1.svg => dom/svg/crashtests/327705-1.svg
rename : content/svg/content/src/crashtests/336994-1.html => dom/svg/crashtests/336994-1.html
rename : content/svg/content/src/crashtests/344888-1.svg => dom/svg/crashtests/344888-1.svg
rename : content/svg/content/src/crashtests/345445-1.svg => dom/svg/crashtests/345445-1.svg
rename : content/svg/content/src/crashtests/360836-1.svg => dom/svg/crashtests/360836-1.svg
rename : content/svg/content/src/crashtests/367357-1.xhtml => dom/svg/crashtests/367357-1.xhtml
rename : content/svg/content/src/crashtests/369051-1.svg => dom/svg/crashtests/369051-1.svg
rename : content/svg/content/src/crashtests/369249-1.svg => dom/svg/crashtests/369249-1.svg
rename : content/svg/content/src/crashtests/369291-1.svg => dom/svg/crashtests/369291-1.svg
rename : content/svg/content/src/crashtests/369291-2.svg => dom/svg/crashtests/369291-2.svg
rename : content/svg/content/src/crashtests/369568-1.svg => dom/svg/crashtests/369568-1.svg
rename : content/svg/content/src/crashtests/372046-1.svg => dom/svg/crashtests/372046-1.svg
rename : content/svg/content/src/crashtests/372046-2.svg => dom/svg/crashtests/372046-2.svg
rename : content/svg/content/src/crashtests/374882-1.svg => dom/svg/crashtests/374882-1.svg
rename : content/svg/content/src/crashtests/380101-1.svg => dom/svg/crashtests/380101-1.svg
rename : content/svg/content/src/crashtests/381777-1.svg => dom/svg/crashtests/381777-1.svg
rename : content/svg/content/src/crashtests/383685-1.svg => dom/svg/crashtests/383685-1.svg
rename : content/svg/content/src/crashtests/385096.html => dom/svg/crashtests/385096.html
rename : content/svg/content/src/crashtests/385554-1.html => dom/svg/crashtests/385554-1.html
rename : content/svg/content/src/crashtests/385554-2.xul => dom/svg/crashtests/385554-2.xul
rename : content/svg/content/src/crashtests/388712-1.svg => dom/svg/crashtests/388712-1.svg
rename : content/svg/content/src/crashtests/395616-1.html => dom/svg/crashtests/395616-1.html
rename : content/svg/content/src/crashtests/396618-1.html => dom/svg/crashtests/396618-1.html
rename : content/svg/content/src/crashtests/397017-1.html => dom/svg/crashtests/397017-1.html
rename : content/svg/content/src/crashtests/397551-1.svg => dom/svg/crashtests/397551-1.svg
rename : content/svg/content/src/crashtests/397704-1.svg => dom/svg/crashtests/397704-1.svg
rename : content/svg/content/src/crashtests/398926-both-different.svg => dom/svg/crashtests/398926-both-different.svg
rename : content/svg/content/src/crashtests/398926-both-same.svg => dom/svg/crashtests/398926-both-same.svg
rename : content/svg/content/src/crashtests/398926-fill.svg => dom/svg/crashtests/398926-fill.svg
rename : content/svg/content/src/crashtests/398926-stroke.svg => dom/svg/crashtests/398926-stroke.svg
rename : content/svg/content/src/crashtests/405639-1.svg => dom/svg/crashtests/405639-1.svg
rename : content/svg/content/src/crashtests/406361-1.html => dom/svg/crashtests/406361-1.html
rename : content/svg/content/src/crashtests/409811-1.html => dom/svg/crashtests/409811-1.html
rename : content/svg/content/src/crashtests/410659-1.svg => dom/svg/crashtests/410659-1.svg
rename : content/svg/content/src/crashtests/410659-2.svg => dom/svg/crashtests/410659-2.svg
rename : content/svg/content/src/crashtests/410659-3.svg => dom/svg/crashtests/410659-3.svg
rename : content/svg/content/src/crashtests/412104-1.svg => dom/svg/crashtests/412104-1.svg
rename : content/svg/content/src/crashtests/413174-1.svg => dom/svg/crashtests/413174-1.svg
rename : content/svg/content/src/crashtests/414188-1.svg => dom/svg/crashtests/414188-1.svg
rename : content/svg/content/src/crashtests/427325-1.svg => dom/svg/crashtests/427325-1.svg
rename : content/svg/content/src/crashtests/428228-1.svg => dom/svg/crashtests/428228-1.svg
rename : content/svg/content/src/crashtests/428841-1.svg => dom/svg/crashtests/428841-1.svg
rename : content/svg/content/src/crashtests/435209-1.svg => dom/svg/crashtests/435209-1.svg
rename : content/svg/content/src/crashtests/436418-mpathRoot-1.svg => dom/svg/crashtests/436418-mpathRoot-1.svg
rename : content/svg/content/src/crashtests/448244-1.svg => dom/svg/crashtests/448244-1.svg
rename : content/svg/content/src/crashtests/466576-1.xhtml => dom/svg/crashtests/466576-1.xhtml
rename : content/svg/content/src/crashtests/499879-1.svg => dom/svg/crashtests/499879-1.svg
rename : content/svg/content/src/crashtests/535691-1.svg => dom/svg/crashtests/535691-1.svg
rename : content/svg/content/src/crashtests/539167-1.svg => dom/svg/crashtests/539167-1.svg
rename : content/svg/content/src/crashtests/573316-1.svg => dom/svg/crashtests/573316-1.svg
rename : content/svg/content/src/crashtests/579356-1.svg => dom/svg/crashtests/579356-1.svg
rename : content/svg/content/src/crashtests/579356-2.svg => dom/svg/crashtests/579356-2.svg
rename : content/svg/content/src/crashtests/595608-1.svg => dom/svg/crashtests/595608-1.svg
rename : content/svg/content/src/crashtests/601251-1.html => dom/svg/crashtests/601251-1.html
rename : content/svg/content/src/crashtests/601406-1.svg => dom/svg/crashtests/601406-1.svg
rename : content/svg/content/src/crashtests/603145-1.svg => dom/svg/crashtests/603145-1.svg
rename : content/svg/content/src/crashtests/613899-1.svg => dom/svg/crashtests/613899-1.svg
rename : content/svg/content/src/crashtests/613899-2.svg => dom/svg/crashtests/613899-2.svg
rename : content/svg/content/src/crashtests/719779-1.svg => dom/svg/crashtests/719779-1.svg
rename : content/svg/content/src/crashtests/723441-1.html => dom/svg/crashtests/723441-1.html
rename : content/svg/content/src/crashtests/723441-resource.svg => dom/svg/crashtests/723441-resource.svg
rename : content/svg/content/src/crashtests/751515-1.svg => dom/svg/crashtests/751515-1.svg
rename : content/svg/content/src/crashtests/761507-1.svg => dom/svg/crashtests/761507-1.svg
rename : content/svg/content/src/crashtests/831561.html => dom/svg/crashtests/831561.html
rename : content/svg/content/src/crashtests/837450-1.svg => dom/svg/crashtests/837450-1.svg
rename : content/svg/content/src/crashtests/842463-1.html => dom/svg/crashtests/842463-1.html
rename : content/svg/content/src/crashtests/847138-1.svg => dom/svg/crashtests/847138-1.svg
rename : content/svg/content/src/crashtests/864509.svg => dom/svg/crashtests/864509.svg
rename : content/svg/content/src/crashtests/880544-1.svg => dom/svg/crashtests/880544-1.svg
rename : content/svg/content/src/crashtests/880544-2.svg => dom/svg/crashtests/880544-2.svg
rename : content/svg/content/src/crashtests/880544-3.svg => dom/svg/crashtests/880544-3.svg
rename : content/svg/content/src/crashtests/880544-4.svg => dom/svg/crashtests/880544-4.svg
rename : content/svg/content/src/crashtests/880544-5.svg => dom/svg/crashtests/880544-5.svg
rename : content/svg/content/src/crashtests/898915-1.svg => dom/svg/crashtests/898915-1.svg
rename : content/svg/content/src/crashtests/crashtests.list => dom/svg/crashtests/crashtests.list
rename : content/svg/content/src/crashtests/zero-size-image.svg => dom/svg/crashtests/zero-size-image.svg
rename : content/svg/moz.build => dom/svg/moz.build
rename : content/svg/content/src/nsISVGPoint.cpp => dom/svg/nsISVGPoint.cpp
rename : content/svg/content/src/nsISVGPoint.h => dom/svg/nsISVGPoint.h
rename : content/svg/content/src/nsSVGAngle.cpp => dom/svg/nsSVGAngle.cpp
rename : content/svg/content/src/nsSVGAngle.h => dom/svg/nsSVGAngle.h
rename : content/svg/content/src/nsSVGAnimatedTransformList.cpp => dom/svg/nsSVGAnimatedTransformList.cpp
rename : content/svg/content/src/nsSVGAnimatedTransformList.h => dom/svg/nsSVGAnimatedTransformList.h
rename : content/svg/content/src/nsSVGAttrTearoffTable.h => dom/svg/nsSVGAttrTearoffTable.h
rename : content/svg/content/src/nsSVGBoolean.cpp => dom/svg/nsSVGBoolean.cpp
rename : content/svg/content/src/nsSVGBoolean.h => dom/svg/nsSVGBoolean.h
rename : content/svg/content/src/nsSVGClass.cpp => dom/svg/nsSVGClass.cpp
rename : content/svg/content/src/nsSVGClass.h => dom/svg/nsSVGClass.h
rename : content/svg/content/src/nsSVGDataParser.cpp => dom/svg/nsSVGDataParser.cpp
rename : content/svg/content/src/nsSVGDataParser.h => dom/svg/nsSVGDataParser.h
rename : content/svg/content/src/nsSVGElement.cpp => dom/svg/nsSVGElement.cpp
rename : content/svg/content/src/nsSVGElement.h => dom/svg/nsSVGElement.h
rename : content/svg/content/src/nsSVGEnum.cpp => dom/svg/nsSVGEnum.cpp
rename : content/svg/content/src/nsSVGEnum.h => dom/svg/nsSVGEnum.h
rename : content/svg/content/src/nsSVGFeatures.cpp => dom/svg/nsSVGFeatures.cpp
rename : content/svg/content/src/nsSVGFeatures.h => dom/svg/nsSVGFeatures.h
rename : content/svg/content/src/nsSVGFeaturesList.h => dom/svg/nsSVGFeaturesList.h
rename : content/svg/content/src/nsSVGFilters.cpp => dom/svg/nsSVGFilters.cpp
rename : content/svg/content/src/nsSVGFilters.h => dom/svg/nsSVGFilters.h
rename : content/svg/content/src/nsSVGInteger.cpp => dom/svg/nsSVGInteger.cpp
rename : content/svg/content/src/nsSVGInteger.h => dom/svg/nsSVGInteger.h
rename : content/svg/content/src/nsSVGIntegerPair.cpp => dom/svg/nsSVGIntegerPair.cpp
rename : content/svg/content/src/nsSVGIntegerPair.h => dom/svg/nsSVGIntegerPair.h
rename : content/svg/content/src/nsSVGLength2.cpp => dom/svg/nsSVGLength2.cpp
rename : content/svg/content/src/nsSVGLength2.h => dom/svg/nsSVGLength2.h
rename : content/svg/content/src/nsSVGNumber2.cpp => dom/svg/nsSVGNumber2.cpp
rename : content/svg/content/src/nsSVGNumber2.h => dom/svg/nsSVGNumber2.h
rename : content/svg/content/src/nsSVGNumberPair.cpp => dom/svg/nsSVGNumberPair.cpp
rename : content/svg/content/src/nsSVGNumberPair.h => dom/svg/nsSVGNumberPair.h
rename : content/svg/content/src/nsSVGPathDataParser.cpp => dom/svg/nsSVGPathDataParser.cpp
rename : content/svg/content/src/nsSVGPathDataParser.h => dom/svg/nsSVGPathDataParser.h
rename : content/svg/content/src/nsSVGPathGeometryElement.cpp => dom/svg/nsSVGPathGeometryElement.cpp
rename : content/svg/content/src/nsSVGPathGeometryElement.h => dom/svg/nsSVGPathGeometryElement.h
rename : content/svg/content/src/nsSVGPolyElement.cpp => dom/svg/nsSVGPolyElement.cpp
rename : content/svg/content/src/nsSVGPolyElement.h => dom/svg/nsSVGPolyElement.h
rename : content/svg/content/src/nsSVGString.cpp => dom/svg/nsSVGString.cpp
rename : content/svg/content/src/nsSVGString.h => dom/svg/nsSVGString.h
rename : content/svg/content/src/nsSVGTransform.cpp => dom/svg/nsSVGTransform.cpp
rename : content/svg/content/src/nsSVGTransform.h => dom/svg/nsSVGTransform.h
rename : content/svg/content/src/nsSVGViewBox.cpp => dom/svg/nsSVGViewBox.cpp
rename : content/svg/content/src/nsSVGViewBox.h => dom/svg/nsSVGViewBox.h
rename : content/svg/content/test/MutationEventChecker.js => dom/svg/test/MutationEventChecker.js
rename : content/svg/content/test/a_href_destination.svg => dom/svg/test/a_href_destination.svg
rename : content/svg/content/test/a_href_helper_01.svg => dom/svg/test/a_href_helper_01.svg
rename : content/svg/content/test/a_href_helper_02_03.svg => dom/svg/test/a_href_helper_02_03.svg
rename : content/svg/content/test/a_href_helper_04.svg => dom/svg/test/a_href_helper_04.svg
rename : content/svg/content/test/animated-svg-image-helper.html => dom/svg/test/animated-svg-image-helper.html
rename : content/svg/content/test/animated-svg-image-helper.svg => dom/svg/test/animated-svg-image-helper.svg
rename : content/svg/content/test/bbox-helper.svg => dom/svg/test/bbox-helper.svg
rename : content/svg/content/test/bounds-helper.svg => dom/svg/test/bounds-helper.svg
rename : content/svg/content/test/dataTypes-helper.svg => dom/svg/test/dataTypes-helper.svg
rename : content/svg/content/test/fragments-helper.svg => dom/svg/test/fragments-helper.svg
rename : content/svg/content/test/getBBox-method-helper.svg => dom/svg/test/getBBox-method-helper.svg
rename : content/svg/content/test/getCTM-helper.svg => dom/svg/test/getCTM-helper.svg
rename : content/svg/content/test/getSubStringLength-helper.svg => dom/svg/test/getSubStringLength-helper.svg
rename : content/svg/content/test/matrixUtils.js => dom/svg/test/matrixUtils.js
rename : content/svg/content/test/mochitest.ini => dom/svg/test/mochitest.ini
rename : content/svg/content/test/object-delayed-intrinsic-size.sjs => dom/svg/test/object-delayed-intrinsic-size.sjs
rename : content/svg/content/test/pointer-events.js => dom/svg/test/pointer-events.js
rename : content/svg/content/test/scientific-helper.svg => dom/svg/test/scientific-helper.svg
rename : content/svg/content/test/selectSubString-helper.svg => dom/svg/test/selectSubString-helper.svg
rename : content/svg/content/test/switch-helper.svg => dom/svg/test/switch-helper.svg
rename : content/svg/content/test/test_SVGLengthList-2.xhtml => dom/svg/test/test_SVGLengthList-2.xhtml
rename : content/svg/content/test/test_SVGLengthList.xhtml => dom/svg/test/test_SVGLengthList.xhtml
rename : content/svg/content/test/test_SVGMatrix.xhtml => dom/svg/test/test_SVGMatrix.xhtml
rename : content/svg/content/test/test_SVGNumberList.xhtml => dom/svg/test/test_SVGNumberList.xhtml
rename : content/svg/content/test/test_SVGPathSegList.xhtml => dom/svg/test/test_SVGPathSegList.xhtml
rename : content/svg/content/test/test_SVGPointList.xhtml => dom/svg/test/test_SVGPointList.xhtml
rename : content/svg/content/test/test_SVGStringList.xhtml => dom/svg/test/test_SVGStringList.xhtml
rename : content/svg/content/test/test_SVGStyleElement.xhtml => dom/svg/test/test_SVGStyleElement.xhtml
rename : content/svg/content/test/test_SVGTransformList.xhtml => dom/svg/test/test_SVGTransformList.xhtml
rename : content/svg/content/test/test_SVGTransformListAddition.xhtml => dom/svg/test/test_SVGTransformListAddition.xhtml
rename : content/svg/content/test/test_SVGUnitTypes.html => dom/svg/test/test_SVGUnitTypes.html
rename : content/svg/content/test/test_SVG_namespace_ids.html => dom/svg/test/test_SVG_namespace_ids.html
rename : content/svg/content/test/test_SVGxxxList.xhtml => dom/svg/test/test_SVGxxxList.xhtml
rename : content/svg/content/test/test_SVGxxxListIndexing.xhtml => dom/svg/test/test_SVGxxxListIndexing.xhtml
rename : content/svg/content/test/test_a_href_01.xhtml => dom/svg/test/test_a_href_01.xhtml
rename : content/svg/content/test/test_a_href_02.xhtml => dom/svg/test/test_a_href_02.xhtml
rename : content/svg/content/test/test_animLengthObjectIdentity.xhtml => dom/svg/test/test_animLengthObjectIdentity.xhtml
rename : content/svg/content/test/test_animLengthReadonly.xhtml => dom/svg/test/test_animLengthReadonly.xhtml
rename : content/svg/content/test/test_animLengthUnits.xhtml => dom/svg/test/test_animLengthUnits.xhtml
rename : content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml => dom/svg/test/test_bbox-with-invalid-viewBox.xhtml
rename : content/svg/content/test/test_bbox.xhtml => dom/svg/test/test_bbox.xhtml
rename : content/svg/content/test/test_bounds.html => dom/svg/test/test_bounds.html
rename : content/svg/content/test/test_bug872812.html => dom/svg/test/test_bug872812.html
rename : content/svg/content/test/test_dataTypes.html => dom/svg/test/test_dataTypes.html
rename : content/svg/content/test/test_dataTypesModEvents.html => dom/svg/test/test_dataTypesModEvents.html
rename : content/svg/content/test/test_fragments.html => dom/svg/test/test_fragments.html
rename : content/svg/content/test/test_getBBox-method.html => dom/svg/test/test_getBBox-method.html
rename : content/svg/content/test/test_getCTM.html => dom/svg/test/test_getCTM.html
rename : content/svg/content/test/test_getElementById.xhtml => dom/svg/test/test_getElementById.xhtml
rename : content/svg/content/test/test_getSubStringLength.xhtml => dom/svg/test/test_getSubStringLength.xhtml
rename : content/svg/content/test/test_hasFeature.xhtml => dom/svg/test/test_hasFeature.xhtml
rename : content/svg/content/test/test_lang.xhtml => dom/svg/test/test_lang.xhtml
rename : content/svg/content/test/test_length.xhtml => dom/svg/test/test_length.xhtml
rename : content/svg/content/test/test_lengthParsing.html => dom/svg/test/test_lengthParsing.html
rename : content/svg/content/test/test_non-scaling-stroke.html => dom/svg/test/test_non-scaling-stroke.html
rename : content/svg/content/test/test_nonAnimStrings.xhtml => dom/svg/test/test_nonAnimStrings.xhtml
rename : content/svg/content/test/test_object-delayed-intrinsic-size.html => dom/svg/test/test_object-delayed-intrinsic-size.html
rename : content/svg/content/test/test_onerror.xhtml => dom/svg/test/test_onerror.xhtml
rename : content/svg/content/test/test_pathAnimInterpolation.xhtml => dom/svg/test/test_pathAnimInterpolation.xhtml
rename : content/svg/content/test/test_pathLength.html => dom/svg/test/test_pathLength.html
rename : content/svg/content/test/test_pathSeg.xhtml => dom/svg/test/test_pathSeg.xhtml
rename : content/svg/content/test/test_pointAtLength.xhtml => dom/svg/test/test_pointAtLength.xhtml
rename : content/svg/content/test/test_pointer-events-1a.xhtml => dom/svg/test/test_pointer-events-1a.xhtml
rename : content/svg/content/test/test_pointer-events-1b.xhtml => dom/svg/test/test_pointer-events-1b.xhtml
rename : content/svg/content/test/test_pointer-events-2.xhtml => dom/svg/test/test_pointer-events-2.xhtml
rename : content/svg/content/test/test_pointer-events-3.xhtml => dom/svg/test/test_pointer-events-3.xhtml
rename : content/svg/content/test/test_pointer-events-4.xhtml => dom/svg/test/test_pointer-events-4.xhtml
rename : content/svg/content/test/test_pointer-events-5.xhtml => dom/svg/test/test_pointer-events-5.xhtml
rename : content/svg/content/test/test_pointer-events-6.xhtml => dom/svg/test/test_pointer-events-6.xhtml
rename : content/svg/content/test/test_scientific.html => dom/svg/test/test_scientific.html
rename : content/svg/content/test/test_selectSubString.xhtml => dom/svg/test/test_selectSubString.xhtml
rename : content/svg/content/test/test_stroke-linecap-hit-testing.xhtml => dom/svg/test/test_stroke-linecap-hit-testing.xhtml
rename : content/svg/content/test/test_switch.xhtml => dom/svg/test/test_switch.xhtml
rename : content/svg/content/test/test_text.html => dom/svg/test/test_text.html
rename : content/svg/content/test/test_text_2.html => dom/svg/test/test_text_2.html
rename : content/svg/content/test/test_text_dirty.html => dom/svg/test/test_text_dirty.html
rename : content/svg/content/test/test_text_lengthAdjust.html => dom/svg/test/test_text_lengthAdjust.html
rename : content/svg/content/test/test_text_scaled.html => dom/svg/test/test_text_scaled.html
rename : content/svg/content/test/test_text_selection.html => dom/svg/test/test_text_selection.html
rename : content/svg/content/test/test_text_update.html => dom/svg/test/test_text_update.html
rename : content/svg/content/test/test_transform.xhtml => dom/svg/test/test_transform.xhtml
rename : content/svg/content/test/test_transformParsing.html => dom/svg/test/test_transformParsing.html
rename : content/svg/content/test/test_valueAsString.xhtml => dom/svg/test/test_valueAsString.xhtml
rename : content/svg/content/test/test_valueLeaks.xhtml => dom/svg/test/test_valueLeaks.xhtml
rename : content/svg/content/test/test_viewport.html => dom/svg/test/test_viewport.html
rename : content/svg/content/test/test_zoom.xhtml => dom/svg/test/test_zoom.xhtml
rename : content/svg/content/test/text-helper-scaled.svg => dom/svg/test/text-helper-scaled.svg
rename : content/svg/content/test/text-helper-selection.svg => dom/svg/test/text-helper-selection.svg
rename : content/svg/content/test/text-helper.svg => dom/svg/test/text-helper.svg
rename : content/svg/content/test/viewport-helper.svg => dom/svg/test/viewport-helper.svg
rename : content/svg/content/test/zoom-helper.svg => dom/svg/test/zoom-helper.svg
---
 content/base/src/moz.build                    |  2 +-
 content/moz.build                             |  1 -
 content/svg/content/moz.build                 |  9 -------
 content/svg/document/src/moz.build            | 25 -------------------
 content/svg/moz.build                         |  7 ------
 dom/bindings/moz.build                        |  2 +-
 dom/canvas/moz.build                          |  2 +-
 dom/moz.build                                 |  1 +
 dom/smil/moz.build                            |  2 +-
 .../svg}/DOMSVGAnimatedLengthList.cpp         |  0
 .../svg}/DOMSVGAnimatedLengthList.h           |  0
 .../svg}/DOMSVGAnimatedNumberList.cpp         |  0
 .../svg}/DOMSVGAnimatedNumberList.h           |  0
 .../content/src => dom/svg}/DOMSVGLength.cpp  |  0
 .../content/src => dom/svg}/DOMSVGLength.h    |  0
 .../src => dom/svg}/DOMSVGLengthList.cpp      |  0
 .../src => dom/svg}/DOMSVGLengthList.h        |  0
 .../content/src => dom/svg}/DOMSVGNumber.cpp  |  0
 .../content/src => dom/svg}/DOMSVGNumber.h    |  0
 .../src => dom/svg}/DOMSVGNumberList.cpp      |  0
 .../src => dom/svg}/DOMSVGNumberList.h        |  0
 .../content/src => dom/svg}/DOMSVGPathSeg.cpp |  0
 .../content/src => dom/svg}/DOMSVGPathSeg.h   |  0
 .../src => dom/svg}/DOMSVGPathSegList.cpp     |  0
 .../src => dom/svg}/DOMSVGPathSegList.h       |  0
 .../content/src => dom/svg}/DOMSVGPoint.cpp   |  0
 .../svg/content/src => dom/svg}/DOMSVGPoint.h |  0
 .../src => dom/svg}/DOMSVGPointList.cpp       |  0
 .../content/src => dom/svg}/DOMSVGPointList.h |  0
 .../src => dom/svg}/DOMSVGStringList.cpp      |  0
 .../src => dom/svg}/DOMSVGStringList.h        |  0
 .../src => dom/svg}/DOMSVGTransformList.cpp   |  0
 .../src => dom/svg}/DOMSVGTransformList.h     |  0
 .../content/src => dom/svg}/SVGAElement.cpp   |  0
 .../svg/content/src => dom/svg}/SVGAElement.h |  0
 .../src => dom/svg}/SVGAltGlyphElement.cpp    |  0
 .../src => dom/svg}/SVGAltGlyphElement.h      |  0
 .../svg/content/src => dom/svg}/SVGAngle.cpp  |  0
 .../svg/content/src => dom/svg}/SVGAngle.h    |  0
 .../src => dom/svg}/SVGAnimateElement.cpp     |  0
 .../src => dom/svg}/SVGAnimateElement.h       |  0
 .../svg}/SVGAnimateMotionElement.cpp          |  0
 .../src => dom/svg}/SVGAnimateMotionElement.h |  0
 .../svg}/SVGAnimateTransformElement.cpp       |  0
 .../svg}/SVGAnimateTransformElement.h         |  0
 .../src => dom/svg}/SVGAnimatedAngle.cpp      |  0
 .../src => dom/svg}/SVGAnimatedAngle.h        |  0
 .../src => dom/svg}/SVGAnimatedBoolean.cpp    |  0
 .../src => dom/svg}/SVGAnimatedBoolean.h      |  0
 .../svg}/SVGAnimatedEnumeration.cpp           |  0
 .../src => dom/svg}/SVGAnimatedEnumeration.h  |  0
 .../src => dom/svg}/SVGAnimatedInteger.cpp    |  0
 .../src => dom/svg}/SVGAnimatedInteger.h      |  0
 .../src => dom/svg}/SVGAnimatedLength.cpp     |  0
 .../src => dom/svg}/SVGAnimatedLength.h       |  0
 .../src => dom/svg}/SVGAnimatedLengthList.cpp |  0
 .../src => dom/svg}/SVGAnimatedLengthList.h   |  0
 .../src => dom/svg}/SVGAnimatedNumber.cpp     |  0
 .../src => dom/svg}/SVGAnimatedNumber.h       |  0
 .../src => dom/svg}/SVGAnimatedNumberList.cpp |  0
 .../src => dom/svg}/SVGAnimatedNumberList.h   |  0
 .../svg}/SVGAnimatedPathSegList.cpp           |  0
 .../src => dom/svg}/SVGAnimatedPathSegList.h  |  0
 .../src => dom/svg}/SVGAnimatedPointList.cpp  |  0
 .../src => dom/svg}/SVGAnimatedPointList.h    |  0
 .../svg}/SVGAnimatedPreserveAspectRatio.cpp   |  0
 .../svg}/SVGAnimatedPreserveAspectRatio.h     |  0
 .../src => dom/svg}/SVGAnimatedRect.cpp       |  0
 .../content/src => dom/svg}/SVGAnimatedRect.h |  0
 .../src => dom/svg}/SVGAnimatedString.cpp     |  0
 .../src => dom/svg}/SVGAnimatedString.h       |  0
 .../svg}/SVGAnimatedTransformList.cpp         |  0
 .../svg}/SVGAnimatedTransformList.h           |  0
 .../src => dom/svg}/SVGAnimationElement.cpp   |  0
 .../src => dom/svg}/SVGAnimationElement.h     |  0
 .../src => dom/svg}/SVGAttrValueWrapper.cpp   |  0
 .../src => dom/svg}/SVGAttrValueWrapper.h     |  0
 .../src => dom/svg}/SVGCircleElement.cpp      |  0
 .../src => dom/svg}/SVGCircleElement.h        |  0
 .../src => dom/svg}/SVGClipPathElement.cpp    |  0
 .../src => dom/svg}/SVGClipPathElement.h      |  0
 .../SVGComponentTransferFunctionElement.h     |  0
 .../src => dom/svg}/SVGContentUtils.cpp       |  0
 .../content/src => dom/svg}/SVGContentUtils.h |  0
 .../src => dom/svg}/SVGDefsElement.cpp        |  0
 .../content/src => dom/svg}/SVGDefsElement.h  |  0
 .../src => dom/svg}/SVGDescElement.cpp        |  0
 .../content/src => dom/svg}/SVGDescElement.h  |  0
 .../document/src => dom/svg}/SVGDocument.cpp  |  0
 .../document/src => dom/svg}/SVGDocument.h    |  0
 .../src => dom/svg}/SVGElementFactory.cpp     |  0
 .../src => dom/svg}/SVGElementFactory.h       |  0
 .../src => dom/svg}/SVGEllipseElement.cpp     |  0
 .../src => dom/svg}/SVGEllipseElement.h       |  0
 .../src => dom/svg}/SVGFEBlendElement.cpp     |  0
 .../src => dom/svg}/SVGFEBlendElement.h       |  0
 .../svg}/SVGFEColorMatrixElement.cpp          |  0
 .../src => dom/svg}/SVGFEColorMatrixElement.h |  0
 .../svg}/SVGFEComponentTransferElement.cpp    |  0
 .../svg}/SVGFEComponentTransferElement.h      |  0
 .../src => dom/svg}/SVGFECompositeElement.cpp |  0
 .../src => dom/svg}/SVGFECompositeElement.h   |  0
 .../svg}/SVGFEConvolveMatrixElement.cpp       |  0
 .../svg}/SVGFEConvolveMatrixElement.h         |  0
 .../svg}/SVGFEDiffuseLightingElement.cpp      |  0
 .../svg}/SVGFEDiffuseLightingElement.h        |  0
 .../svg}/SVGFEDisplacementMapElement.cpp      |  0
 .../svg}/SVGFEDisplacementMapElement.h        |  0
 .../svg}/SVGFEDistantLightElement.cpp         |  0
 .../svg}/SVGFEDistantLightElement.h           |  0
 .../svg}/SVGFEDropShadowElement.cpp           |  0
 .../src => dom/svg}/SVGFEDropShadowElement.h  |  0
 .../src => dom/svg}/SVGFEFloodElement.cpp     |  0
 .../src => dom/svg}/SVGFEFloodElement.h       |  0
 .../svg}/SVGFEGaussianBlurElement.cpp         |  0
 .../svg}/SVGFEGaussianBlurElement.h           |  0
 .../src => dom/svg}/SVGFEImageElement.cpp     |  0
 .../src => dom/svg}/SVGFEImageElement.h       |  0
 .../src => dom/svg}/SVGFEMergeElement.cpp     |  0
 .../src => dom/svg}/SVGFEMergeElement.h       |  0
 .../src => dom/svg}/SVGFEMergeNodeElement.cpp |  0
 .../src => dom/svg}/SVGFEMergeNodeElement.h   |  0
 .../svg}/SVGFEMorphologyElement.cpp           |  0
 .../src => dom/svg}/SVGFEMorphologyElement.h  |  0
 .../src => dom/svg}/SVGFEOffsetElement.cpp    |  0
 .../src => dom/svg}/SVGFEOffsetElement.h      |  0
 .../svg}/SVGFEPointLightElement.cpp           |  0
 .../src => dom/svg}/SVGFEPointLightElement.h  |  0
 .../svg}/SVGFESpecularLightingElement.cpp     |  0
 .../svg}/SVGFESpecularLightingElement.h       |  0
 .../src => dom/svg}/SVGFESpotLightElement.cpp |  0
 .../src => dom/svg}/SVGFESpotLightElement.h   |  0
 .../src => dom/svg}/SVGFETileElement.cpp      |  0
 .../src => dom/svg}/SVGFETileElement.h        |  0
 .../svg}/SVGFETurbulenceElement.cpp           |  0
 .../src => dom/svg}/SVGFETurbulenceElement.h  |  0
 .../src => dom/svg}/SVGFilterElement.cpp      |  0
 .../src => dom/svg}/SVGFilterElement.h        |  0
 .../svg}/SVGForeignObjectElement.cpp          |  0
 .../src => dom/svg}/SVGForeignObjectElement.h |  0
 .../src => dom/svg}/SVGFragmentIdentifier.cpp |  0
 .../src => dom/svg}/SVGFragmentIdentifier.h   |  0
 .../content/src => dom/svg}/SVGGElement.cpp   |  0
 .../svg/content/src => dom/svg}/SVGGElement.h |  0
 .../src => dom/svg}/SVGGradientElement.cpp    |  0
 .../src => dom/svg}/SVGGradientElement.h      |  0
 .../src => dom/svg}/SVGGraphicsElement.cpp    |  0
 .../src => dom/svg}/SVGGraphicsElement.h      |  0
 .../src => dom/svg}/SVGIFrameElement.cpp      |  0
 .../src => dom/svg}/SVGIFrameElement.h        |  0
 .../svg/content/src => dom/svg}/SVGIRect.h    |  0
 .../src => dom/svg}/SVGImageElement.cpp       |  0
 .../content/src => dom/svg}/SVGImageElement.h |  0
 .../svg}/SVGIntegerPairSMILType.cpp           |  0
 .../src => dom/svg}/SVGIntegerPairSMILType.h  |  0
 .../svg/content/src => dom/svg}/SVGLength.cpp |  0
 .../svg/content/src => dom/svg}/SVGLength.h   |  0
 .../content/src => dom/svg}/SVGLengthList.cpp |  0
 .../content/src => dom/svg}/SVGLengthList.h   |  0
 .../src => dom/svg}/SVGLengthListSMILType.cpp |  0
 .../src => dom/svg}/SVGLengthListSMILType.h   |  0
 .../src => dom/svg}/SVGLineElement.cpp        |  0
 .../content/src => dom/svg}/SVGLineElement.h  |  0
 .../src => dom/svg}/SVGMPathElement.cpp       |  0
 .../content/src => dom/svg}/SVGMPathElement.h |  0
 .../src => dom/svg}/SVGMarkerElement.cpp      |  0
 .../src => dom/svg}/SVGMarkerElement.h        |  0
 .../src => dom/svg}/SVGMaskElement.cpp        |  0
 .../content/src => dom/svg}/SVGMaskElement.h  |  0
 .../svg/content/src => dom/svg}/SVGMatrix.cpp |  0
 .../svg/content/src => dom/svg}/SVGMatrix.h   |  0
 .../src => dom/svg}/SVGMetadataElement.cpp    |  0
 .../src => dom/svg}/SVGMetadataElement.h      |  0
 .../svg}/SVGMotionSMILAnimationFunction.cpp   |  0
 .../svg}/SVGMotionSMILAnimationFunction.h     |  0
 .../src => dom/svg}/SVGMotionSMILAttr.cpp     |  0
 .../src => dom/svg}/SVGMotionSMILAttr.h       |  0
 .../svg}/SVGMotionSMILPathUtils.cpp           |  0
 .../src => dom/svg}/SVGMotionSMILPathUtils.h  |  0
 .../src => dom/svg}/SVGMotionSMILType.cpp     |  0
 .../src => dom/svg}/SVGMotionSMILType.h       |  0
 .../content/src => dom/svg}/SVGNumberList.cpp |  0
 .../content/src => dom/svg}/SVGNumberList.h   |  0
 .../src => dom/svg}/SVGNumberListSMILType.cpp |  0
 .../src => dom/svg}/SVGNumberListSMILType.h   |  0
 .../src => dom/svg}/SVGNumberPairSMILType.cpp |  0
 .../src => dom/svg}/SVGNumberPairSMILType.h   |  0
 .../src => dom/svg}/SVGOrientSMILType.cpp     |  0
 .../src => dom/svg}/SVGOrientSMILType.h       |  0
 .../content/src => dom/svg}/SVGPathData.cpp   |  0
 .../svg/content/src => dom/svg}/SVGPathData.h |  0
 .../src => dom/svg}/SVGPathElement.cpp        |  0
 .../content/src => dom/svg}/SVGPathElement.h  |  0
 .../svg}/SVGPathSegListSMILType.cpp           |  0
 .../src => dom/svg}/SVGPathSegListSMILType.h  |  0
 .../src => dom/svg}/SVGPathSegUtils.cpp       |  0
 .../content/src => dom/svg}/SVGPathSegUtils.h |  0
 .../src => dom/svg}/SVGPatternElement.cpp     |  0
 .../src => dom/svg}/SVGPatternElement.h       |  0
 .../svg/content/src => dom/svg}/SVGPoint.h    |  0
 .../content/src => dom/svg}/SVGPointList.cpp  |  0
 .../content/src => dom/svg}/SVGPointList.h    |  0
 .../src => dom/svg}/SVGPointListSMILType.cpp  |  0
 .../src => dom/svg}/SVGPointListSMILType.h    |  0
 .../src => dom/svg}/SVGPolygonElement.cpp     |  0
 .../src => dom/svg}/SVGPolygonElement.h       |  0
 .../src => dom/svg}/SVGPolylineElement.cpp    |  0
 .../src => dom/svg}/SVGPolylineElement.h      |  0
 .../svg}/SVGPreserveAspectRatio.cpp           |  0
 .../src => dom/svg}/SVGPreserveAspectRatio.h  |  0
 .../svg/content/src => dom/svg}/SVGRect.cpp   |  0
 .../svg/content/src => dom/svg}/SVGRect.h     |  0
 .../src => dom/svg}/SVGRectElement.cpp        |  0
 .../content/src => dom/svg}/SVGRectElement.h  |  0
 .../content/src => dom/svg}/SVGSVGElement.cpp |  0
 .../content/src => dom/svg}/SVGSVGElement.h   |  0
 .../src => dom/svg}/SVGScriptElement.cpp      |  0
 .../src => dom/svg}/SVGScriptElement.h        |  0
 .../content/src => dom/svg}/SVGSetElement.cpp |  0
 .../content/src => dom/svg}/SVGSetElement.h   |  0
 .../src => dom/svg}/SVGStopElement.cpp        |  0
 .../content/src => dom/svg}/SVGStopElement.h  |  0
 .../content/src => dom/svg}/SVGStringList.cpp |  0
 .../content/src => dom/svg}/SVGStringList.h   |  0
 .../src => dom/svg}/SVGStyleElement.cpp       |  0
 .../content/src => dom/svg}/SVGStyleElement.h |  0
 .../src => dom/svg}/SVGSwitchElement.cpp      |  0
 .../src => dom/svg}/SVGSwitchElement.h        |  0
 .../src => dom/svg}/SVGSymbolElement.cpp      |  0
 .../src => dom/svg}/SVGSymbolElement.h        |  0
 .../src => dom/svg}/SVGTSpanElement.cpp       |  0
 .../content/src => dom/svg}/SVGTSpanElement.h |  0
 .../svg/content/src => dom/svg}/SVGTagList.h  |  0
 .../svg/content/src => dom/svg}/SVGTests.cpp  |  0
 .../svg/content/src => dom/svg}/SVGTests.h    |  0
 .../src => dom/svg}/SVGTextContentElement.cpp |  0
 .../src => dom/svg}/SVGTextContentElement.h   |  0
 .../src => dom/svg}/SVGTextElement.cpp        |  0
 .../content/src => dom/svg}/SVGTextElement.h  |  0
 .../src => dom/svg}/SVGTextPathElement.cpp    |  0
 .../src => dom/svg}/SVGTextPathElement.h      |  0
 .../svg}/SVGTextPositioningElement.cpp        |  0
 .../svg}/SVGTextPositioningElement.h          |  0
 .../src => dom/svg}/SVGTitleElement.cpp       |  0
 .../content/src => dom/svg}/SVGTitleElement.h |  0
 .../content/src => dom/svg}/SVGTransform.cpp  |  0
 .../content/src => dom/svg}/SVGTransform.h    |  0
 .../src => dom/svg}/SVGTransformList.cpp      |  0
 .../src => dom/svg}/SVGTransformList.h        |  0
 .../svg}/SVGTransformListParser.cpp           |  0
 .../src => dom/svg}/SVGTransformListParser.h  |  0
 .../svg}/SVGTransformListSMILType.cpp         |  0
 .../svg}/SVGTransformListSMILType.h           |  0
 .../svg}/SVGTransformableElement.cpp          |  0
 .../src => dom/svg}/SVGTransformableElement.h |  0
 .../content/src => dom/svg}/SVGUseElement.cpp |  0
 .../content/src => dom/svg}/SVGUseElement.h   |  0
 .../src => dom/svg}/SVGViewBoxSMILType.cpp    |  0
 .../src => dom/svg}/SVGViewBoxSMILType.h      |  0
 .../src => dom/svg}/SVGViewElement.cpp        |  0
 .../content/src => dom/svg}/SVGViewElement.h  |  0
 .../content/src => dom/svg}/SVGZoomEvent.cpp  |  0
 .../content/src => dom/svg}/SVGZoomEvent.h    |  0
 .../src => dom/svg}/crashtests/307322-1.svg   |  0
 .../src => dom/svg}/crashtests/327705-1.svg   |  0
 .../src => dom/svg}/crashtests/336994-1.html  |  0
 .../src => dom/svg}/crashtests/344888-1.svg   |  0
 .../src => dom/svg}/crashtests/345445-1.svg   |  0
 .../src => dom/svg}/crashtests/360836-1.svg   |  0
 .../src => dom/svg}/crashtests/367357-1.xhtml |  0
 .../src => dom/svg}/crashtests/369051-1.svg   |  0
 .../src => dom/svg}/crashtests/369249-1.svg   |  0
 .../src => dom/svg}/crashtests/369291-1.svg   |  0
 .../src => dom/svg}/crashtests/369291-2.svg   |  0
 .../src => dom/svg}/crashtests/369568-1.svg   |  0
 .../src => dom/svg}/crashtests/372046-1.svg   |  0
 .../src => dom/svg}/crashtests/372046-2.svg   |  0
 .../src => dom/svg}/crashtests/374882-1.svg   |  0
 .../src => dom/svg}/crashtests/380101-1.svg   |  0
 .../src => dom/svg}/crashtests/381777-1.svg   |  0
 .../src => dom/svg}/crashtests/383685-1.svg   |  0
 .../src => dom/svg}/crashtests/385096.html    |  0
 .../src => dom/svg}/crashtests/385554-1.html  |  0
 .../src => dom/svg}/crashtests/385554-2.xul   |  0
 .../src => dom/svg}/crashtests/388712-1.svg   |  0
 .../src => dom/svg}/crashtests/395616-1.html  |  0
 .../src => dom/svg}/crashtests/396618-1.html  |  0
 .../src => dom/svg}/crashtests/397017-1.html  |  0
 .../src => dom/svg}/crashtests/397551-1.svg   |  0
 .../src => dom/svg}/crashtests/397704-1.svg   |  0
 .../svg}/crashtests/398926-both-different.svg |  0
 .../svg}/crashtests/398926-both-same.svg      |  0
 .../svg}/crashtests/398926-fill.svg           |  0
 .../svg}/crashtests/398926-stroke.svg         |  0
 .../src => dom/svg}/crashtests/405639-1.svg   |  0
 .../src => dom/svg}/crashtests/406361-1.html  |  0
 .../src => dom/svg}/crashtests/409811-1.html  |  0
 .../src => dom/svg}/crashtests/410659-1.svg   |  0
 .../src => dom/svg}/crashtests/410659-2.svg   |  0
 .../src => dom/svg}/crashtests/410659-3.svg   |  0
 .../src => dom/svg}/crashtests/412104-1.svg   |  0
 .../src => dom/svg}/crashtests/413174-1.svg   |  0
 .../src => dom/svg}/crashtests/414188-1.svg   |  0
 .../src => dom/svg}/crashtests/427325-1.svg   |  0
 .../src => dom/svg}/crashtests/428228-1.svg   |  0
 .../src => dom/svg}/crashtests/428841-1.svg   |  0
 .../src => dom/svg}/crashtests/435209-1.svg   |  0
 .../svg}/crashtests/436418-mpathRoot-1.svg    |  0
 .../src => dom/svg}/crashtests/448244-1.svg   |  0
 .../src => dom/svg}/crashtests/466576-1.xhtml |  0
 .../src => dom/svg}/crashtests/499879-1.svg   |  0
 .../src => dom/svg}/crashtests/535691-1.svg   |  0
 .../src => dom/svg}/crashtests/539167-1.svg   |  0
 .../src => dom/svg}/crashtests/573316-1.svg   |  0
 .../src => dom/svg}/crashtests/579356-1.svg   |  0
 .../src => dom/svg}/crashtests/579356-2.svg   |  0
 .../src => dom/svg}/crashtests/595608-1.svg   |  0
 .../src => dom/svg}/crashtests/601251-1.html  |  0
 .../src => dom/svg}/crashtests/601406-1.svg   |  0
 .../src => dom/svg}/crashtests/603145-1.svg   |  0
 .../src => dom/svg}/crashtests/613899-1.svg   |  0
 .../src => dom/svg}/crashtests/613899-2.svg   |  0
 .../src => dom/svg}/crashtests/719779-1.svg   |  0
 .../src => dom/svg}/crashtests/723441-1.html  |  0
 .../svg}/crashtests/723441-resource.svg       |  0
 .../src => dom/svg}/crashtests/751515-1.svg   |  0
 .../src => dom/svg}/crashtests/761507-1.svg   |  0
 .../src => dom/svg}/crashtests/831561.html    |  0
 .../src => dom/svg}/crashtests/837450-1.svg   |  0
 .../src => dom/svg}/crashtests/842463-1.html  |  0
 .../src => dom/svg}/crashtests/847138-1.svg   |  0
 .../src => dom/svg}/crashtests/864509.svg     |  0
 .../src => dom/svg}/crashtests/880544-1.svg   |  0
 .../src => dom/svg}/crashtests/880544-2.svg   |  0
 .../src => dom/svg}/crashtests/880544-3.svg   |  0
 .../src => dom/svg}/crashtests/880544-4.svg   |  0
 .../src => dom/svg}/crashtests/880544-5.svg   |  0
 .../src => dom/svg}/crashtests/898915-1.svg   |  0
 .../svg}/crashtests/crashtests.list           |  0
 .../svg}/crashtests/zero-size-image.svg       |  0
 .../svg/content/src => dom/svg}/moz.build     |  7 +++++-
 .../content/src => dom/svg}/nsISVGPoint.cpp   |  0
 .../svg/content/src => dom/svg}/nsISVGPoint.h |  0
 .../content/src => dom/svg}/nsSVGAngle.cpp    |  0
 .../svg/content/src => dom/svg}/nsSVGAngle.h  |  0
 .../svg}/nsSVGAnimatedTransformList.cpp       |  0
 .../svg}/nsSVGAnimatedTransformList.h         |  0
 .../src => dom/svg}/nsSVGAttrTearoffTable.h   |  0
 .../content/src => dom/svg}/nsSVGBoolean.cpp  |  0
 .../content/src => dom/svg}/nsSVGBoolean.h    |  0
 .../content/src => dom/svg}/nsSVGClass.cpp    |  0
 .../svg/content/src => dom/svg}/nsSVGClass.h  |  0
 .../src => dom/svg}/nsSVGDataParser.cpp       |  0
 .../content/src => dom/svg}/nsSVGDataParser.h |  0
 .../content/src => dom/svg}/nsSVGElement.cpp  |  0
 .../content/src => dom/svg}/nsSVGElement.h    |  0
 .../svg/content/src => dom/svg}/nsSVGEnum.cpp |  0
 .../svg/content/src => dom/svg}/nsSVGEnum.h   |  0
 .../content/src => dom/svg}/nsSVGFeatures.cpp |  0
 .../content/src => dom/svg}/nsSVGFeatures.h   |  0
 .../src => dom/svg}/nsSVGFeaturesList.h       |  0
 .../content/src => dom/svg}/nsSVGFilters.cpp  |  0
 .../content/src => dom/svg}/nsSVGFilters.h    |  0
 .../content/src => dom/svg}/nsSVGInteger.cpp  |  0
 .../content/src => dom/svg}/nsSVGInteger.h    |  0
 .../src => dom/svg}/nsSVGIntegerPair.cpp      |  0
 .../src => dom/svg}/nsSVGIntegerPair.h        |  0
 .../content/src => dom/svg}/nsSVGLength2.cpp  |  0
 .../content/src => dom/svg}/nsSVGLength2.h    |  0
 .../content/src => dom/svg}/nsSVGNumber2.cpp  |  0
 .../content/src => dom/svg}/nsSVGNumber2.h    |  0
 .../src => dom/svg}/nsSVGNumberPair.cpp       |  0
 .../content/src => dom/svg}/nsSVGNumberPair.h |  0
 .../src => dom/svg}/nsSVGPathDataParser.cpp   |  0
 .../src => dom/svg}/nsSVGPathDataParser.h     |  0
 .../svg}/nsSVGPathGeometryElement.cpp         |  0
 .../svg}/nsSVGPathGeometryElement.h           |  0
 .../src => dom/svg}/nsSVGPolyElement.cpp      |  0
 .../src => dom/svg}/nsSVGPolyElement.h        |  0
 .../content/src => dom/svg}/nsSVGString.cpp   |  0
 .../svg/content/src => dom/svg}/nsSVGString.h |  0
 .../src => dom/svg}/nsSVGTransform.cpp        |  0
 .../content/src => dom/svg}/nsSVGTransform.h  |  0
 .../content/src => dom/svg}/nsSVGViewBox.cpp  |  0
 .../content/src => dom/svg}/nsSVGViewBox.h    |  0
 .../svg}/test/MutationEventChecker.js         |  0
 .../svg}/test/a_href_destination.svg          |  0
 .../svg}/test/a_href_helper_01.svg            |  0
 .../svg}/test/a_href_helper_02_03.svg         |  0
 .../svg}/test/a_href_helper_04.svg            |  0
 .../svg}/test/animated-svg-image-helper.html  |  0
 .../svg}/test/animated-svg-image-helper.svg   |  0
 .../content => dom/svg}/test/bbox-helper.svg  |  0
 .../svg}/test/bounds-helper.svg               |  0
 .../svg}/test/dataTypes-helper.svg            |  0
 .../svg}/test/fragments-helper.svg            |  0
 .../svg}/test/getBBox-method-helper.svg       |  0
 .../svg}/test/getCTM-helper.svg               |  0
 .../svg}/test/getSubStringLength-helper.svg   |  0
 .../content => dom/svg}/test/matrixUtils.js   |  0
 .../content => dom/svg}/test/mochitest.ini    |  0
 .../test/object-delayed-intrinsic-size.sjs    |  0
 .../svg}/test/pointer-events.js               |  0
 .../svg}/test/scientific-helper.svg           |  0
 .../svg}/test/selectSubString-helper.svg      |  0
 .../svg}/test/switch-helper.svg               |  0
 .../svg}/test/test_SVGLengthList-2.xhtml      |  0
 .../svg}/test/test_SVGLengthList.xhtml        |  0
 .../svg}/test/test_SVGMatrix.xhtml            |  0
 .../svg}/test/test_SVGNumberList.xhtml        |  0
 .../svg}/test/test_SVGPathSegList.xhtml       |  0
 .../svg}/test/test_SVGPointList.xhtml         |  0
 .../svg}/test/test_SVGStringList.xhtml        |  0
 .../svg}/test/test_SVGStyleElement.xhtml      |  0
 .../svg}/test/test_SVGTransformList.xhtml     |  0
 .../test/test_SVGTransformListAddition.xhtml  |  0
 .../svg}/test/test_SVGUnitTypes.html          |  0
 .../svg}/test/test_SVG_namespace_ids.html     |  0
 .../svg}/test/test_SVGxxxList.xhtml           |  0
 .../svg}/test/test_SVGxxxListIndexing.xhtml   |  0
 .../svg}/test/test_a_href_01.xhtml            |  0
 .../svg}/test/test_a_href_02.xhtml            |  0
 .../test/test_animLengthObjectIdentity.xhtml  |  0
 .../svg}/test/test_animLengthReadonly.xhtml   |  0
 .../svg}/test/test_animLengthUnits.xhtml      |  0
 .../test/test_bbox-with-invalid-viewBox.xhtml |  0
 .../content => dom/svg}/test/test_bbox.xhtml  |  0
 .../content => dom/svg}/test/test_bounds.html |  0
 .../svg}/test/test_bug872812.html             |  0
 .../svg}/test/test_dataTypes.html             |  0
 .../svg}/test/test_dataTypesModEvents.html    |  0
 .../svg}/test/test_fragments.html             |  0
 .../svg}/test/test_getBBox-method.html        |  0
 .../content => dom/svg}/test/test_getCTM.html |  0
 .../svg}/test/test_getElementById.xhtml       |  0
 .../svg}/test/test_getSubStringLength.xhtml   |  0
 .../svg}/test/test_hasFeature.xhtml           |  2 +-
 .../content => dom/svg}/test/test_lang.xhtml  |  0
 .../svg}/test/test_length.xhtml               |  0
 .../svg}/test/test_lengthParsing.html         |  0
 .../svg}/test/test_non-scaling-stroke.html    |  0
 .../svg}/test/test_nonAnimStrings.xhtml       |  0
 .../test_object-delayed-intrinsic-size.html   |  0
 .../svg}/test/test_onerror.xhtml              |  0
 .../test/test_pathAnimInterpolation.xhtml     |  0
 .../svg}/test/test_pathLength.html            |  0
 .../svg}/test/test_pathSeg.xhtml              |  0
 .../svg}/test/test_pointAtLength.xhtml        |  0
 .../svg}/test/test_pointer-events-1a.xhtml    |  0
 .../svg}/test/test_pointer-events-1b.xhtml    |  0
 .../svg}/test/test_pointer-events-2.xhtml     |  0
 .../svg}/test/test_pointer-events-3.xhtml     |  0
 .../svg}/test/test_pointer-events-4.xhtml     |  0
 .../svg}/test/test_pointer-events-5.xhtml     |  0
 .../svg}/test/test_pointer-events-6.xhtml     |  0
 .../svg}/test/test_scientific.html            |  0
 .../svg}/test/test_selectSubString.xhtml      |  0
 .../test_stroke-linecap-hit-testing.xhtml     |  0
 .../svg}/test/test_switch.xhtml               |  0
 .../content => dom/svg}/test/test_text.html   |  0
 .../content => dom/svg}/test/test_text_2.html |  0
 .../svg}/test/test_text_dirty.html            |  0
 .../svg}/test/test_text_lengthAdjust.html     |  0
 .../svg}/test/test_text_scaled.html           |  0
 .../svg}/test/test_text_selection.html        |  0
 .../svg}/test/test_text_update.html           |  0
 .../svg}/test/test_transform.xhtml            |  0
 .../svg}/test/test_transformParsing.html      |  0
 .../svg}/test/test_valueAsString.xhtml        |  0
 .../svg}/test/test_valueLeaks.xhtml           |  0
 .../svg}/test/test_viewport.html              |  0
 .../content => dom/svg}/test/test_zoom.xhtml  |  0
 .../svg}/test/text-helper-scaled.svg          |  0
 .../svg}/test/text-helper-selection.svg       |  0
 .../content => dom/svg}/test/text-helper.svg  |  0
 .../svg}/test/viewport-helper.svg             |  0
 .../content => dom/svg}/test/zoom-helper.svg  |  0
 embedding/browser/moz.build                   |  2 +-
 image/src/moz.build                           |  2 +-
 js/xpconnect/src/moz.build                    |  2 +-
 layout/base/moz.build                         |  2 +-
 layout/build/moz.build                        |  2 +-
 layout/svg/moz.build                          |  2 +-
 testing/crashtest/crashtests.list             |  2 +-
 484 files changed, 19 insertions(+), 55 deletions(-)
 delete mode 100644 content/svg/content/moz.build
 delete mode 100644 content/svg/document/src/moz.build
 delete mode 100644 content/svg/moz.build
 rename {content/svg/content/src => dom/svg}/DOMSVGAnimatedLengthList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGAnimatedLengthList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGAnimatedNumberList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGAnimatedNumberList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGLength.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGLength.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGLengthList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGLengthList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGNumber.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGNumber.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGNumberList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGNumberList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPathSeg.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPathSeg.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPathSegList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPathSegList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPoint.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPoint.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPointList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGPointList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGStringList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGStringList.h (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGTransformList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/DOMSVGTransformList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAltGlyphElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAltGlyphElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAngle.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAngle.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateMotionElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateMotionElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateTransformElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimateTransformElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedAngle.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedAngle.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedBoolean.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedBoolean.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedEnumeration.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedEnumeration.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedInteger.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedInteger.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedLength.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedLength.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedLengthList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedLengthList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedNumber.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedNumber.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedNumberList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedNumberList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPathSegList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPathSegList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPointList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPointList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPreserveAspectRatio.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedPreserveAspectRatio.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedRect.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedRect.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedString.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedString.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedTransformList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimatedTransformList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimationElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAnimationElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGAttrValueWrapper.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGAttrValueWrapper.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGCircleElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGCircleElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGClipPathElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGClipPathElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGComponentTransferFunctionElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGContentUtils.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGContentUtils.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGDefsElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGDefsElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGDescElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGDescElement.h (100%)
 rename {content/svg/document/src => dom/svg}/SVGDocument.cpp (100%)
 rename {content/svg/document/src => dom/svg}/SVGDocument.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGElementFactory.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGElementFactory.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGEllipseElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGEllipseElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEBlendElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEBlendElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEColorMatrixElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEColorMatrixElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEComponentTransferElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEComponentTransferElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFECompositeElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFECompositeElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEConvolveMatrixElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEConvolveMatrixElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDiffuseLightingElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDiffuseLightingElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDisplacementMapElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDisplacementMapElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDistantLightElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDistantLightElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDropShadowElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEDropShadowElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEFloodElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEFloodElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEGaussianBlurElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEGaussianBlurElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEImageElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEImageElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMergeElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMergeElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMergeNodeElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMergeNodeElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMorphologyElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEMorphologyElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEOffsetElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEOffsetElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEPointLightElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFEPointLightElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFESpecularLightingElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFESpecularLightingElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFESpotLightElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFESpotLightElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFETileElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFETileElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFETurbulenceElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFETurbulenceElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFilterElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFilterElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGForeignObjectElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGForeignObjectElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGFragmentIdentifier.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGFragmentIdentifier.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGGElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGGElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGGradientElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGGradientElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGGraphicsElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGGraphicsElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGIFrameElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGIFrameElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGIRect.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGImageElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGImageElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGIntegerPairSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGIntegerPairSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGLength.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGLength.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGLengthList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGLengthList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGLengthListSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGLengthListSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGLineElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGLineElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMPathElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMPathElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMarkerElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMarkerElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMaskElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMaskElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMatrix.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMatrix.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMetadataElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMetadataElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILAnimationFunction.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILAnimationFunction.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILAttr.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILAttr.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILPathUtils.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILPathUtils.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGMotionSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberListSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberListSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberPairSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGNumberPairSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGOrientSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGOrientSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathData.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathData.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathSegListSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathSegListSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathSegUtils.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPathSegUtils.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPatternElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPatternElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPoint.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPointList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPointList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPointListSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPointListSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPolygonElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPolygonElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPolylineElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPolylineElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGPreserveAspectRatio.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGPreserveAspectRatio.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGRect.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGRect.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGRectElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGRectElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGSVGElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGSVGElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGScriptElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGScriptElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGSetElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGSetElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGStopElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGStopElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGStringList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGStringList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGStyleElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGStyleElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGSwitchElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGSwitchElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGSymbolElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGSymbolElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTSpanElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTSpanElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTagList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTests.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTests.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextContentElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextContentElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextPathElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextPathElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextPositioningElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTextPositioningElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTitleElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTitleElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransform.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransform.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformList.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformListParser.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformListParser.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformListSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformListSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformableElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGTransformableElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGUseElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGUseElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGViewBoxSMILType.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGViewBoxSMILType.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGViewElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGViewElement.h (100%)
 rename {content/svg/content/src => dom/svg}/SVGZoomEvent.cpp (100%)
 rename {content/svg/content/src => dom/svg}/SVGZoomEvent.h (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/307322-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/327705-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/336994-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/344888-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/345445-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/360836-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/367357-1.xhtml (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/369051-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/369249-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/369291-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/369291-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/369568-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/372046-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/372046-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/374882-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/380101-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/381777-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/383685-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/385096.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/385554-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/385554-2.xul (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/388712-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/395616-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/396618-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/397017-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/397551-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/397704-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/398926-both-different.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/398926-both-same.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/398926-fill.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/398926-stroke.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/405639-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/406361-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/409811-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/410659-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/410659-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/410659-3.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/412104-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/413174-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/414188-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/427325-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/428228-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/428841-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/435209-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/436418-mpathRoot-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/448244-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/466576-1.xhtml (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/499879-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/535691-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/539167-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/573316-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/579356-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/579356-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/595608-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/601251-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/601406-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/603145-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/613899-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/613899-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/719779-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/723441-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/723441-resource.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/751515-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/761507-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/831561.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/837450-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/842463-1.html (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/847138-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/864509.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/880544-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/880544-2.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/880544-3.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/880544-4.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/880544-5.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/898915-1.svg (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/crashtests.list (100%)
 rename {content/svg/content/src => dom/svg}/crashtests/zero-size-image.svg (100%)
 rename {content/svg/content/src => dom/svg}/moz.build (98%)
 rename {content/svg/content/src => dom/svg}/nsISVGPoint.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsISVGPoint.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGAngle.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGAngle.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGAnimatedTransformList.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGAnimatedTransformList.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGAttrTearoffTable.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGBoolean.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGBoolean.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGClass.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGClass.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGDataParser.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGDataParser.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGElement.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGEnum.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGEnum.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGFeatures.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGFeatures.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGFeaturesList.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGFilters.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGFilters.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGInteger.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGInteger.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGIntegerPair.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGIntegerPair.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGLength2.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGLength2.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGNumber2.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGNumber2.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGNumberPair.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGNumberPair.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPathDataParser.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPathDataParser.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPathGeometryElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPathGeometryElement.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPolyElement.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGPolyElement.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGString.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGString.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGTransform.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGTransform.h (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGViewBox.cpp (100%)
 rename {content/svg/content/src => dom/svg}/nsSVGViewBox.h (100%)
 rename {content/svg/content => dom/svg}/test/MutationEventChecker.js (100%)
 rename {content/svg/content => dom/svg}/test/a_href_destination.svg (100%)
 rename {content/svg/content => dom/svg}/test/a_href_helper_01.svg (100%)
 rename {content/svg/content => dom/svg}/test/a_href_helper_02_03.svg (100%)
 rename {content/svg/content => dom/svg}/test/a_href_helper_04.svg (100%)
 rename {content/svg/content => dom/svg}/test/animated-svg-image-helper.html (100%)
 rename {content/svg/content => dom/svg}/test/animated-svg-image-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/bbox-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/bounds-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/dataTypes-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/fragments-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/getBBox-method-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/getCTM-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/getSubStringLength-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/matrixUtils.js (100%)
 rename {content/svg/content => dom/svg}/test/mochitest.ini (100%)
 rename {content/svg/content => dom/svg}/test/object-delayed-intrinsic-size.sjs (100%)
 rename {content/svg/content => dom/svg}/test/pointer-events.js (100%)
 rename {content/svg/content => dom/svg}/test/scientific-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/selectSubString-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/switch-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGLengthList-2.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGLengthList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGMatrix.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGNumberList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGPathSegList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGPointList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGStringList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGStyleElement.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGTransformList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGTransformListAddition.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGUnitTypes.html (100%)
 rename {content/svg/content => dom/svg}/test/test_SVG_namespace_ids.html (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGxxxList.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_SVGxxxListIndexing.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_a_href_01.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_a_href_02.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_animLengthObjectIdentity.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_animLengthReadonly.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_animLengthUnits.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_bbox-with-invalid-viewBox.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_bbox.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_bounds.html (100%)
 rename {content/svg/content => dom/svg}/test/test_bug872812.html (100%)
 rename {content/svg/content => dom/svg}/test/test_dataTypes.html (100%)
 rename {content/svg/content => dom/svg}/test/test_dataTypesModEvents.html (100%)
 rename {content/svg/content => dom/svg}/test/test_fragments.html (100%)
 rename {content/svg/content => dom/svg}/test/test_getBBox-method.html (100%)
 rename {content/svg/content => dom/svg}/test/test_getCTM.html (100%)
 rename {content/svg/content => dom/svg}/test/test_getElementById.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_getSubStringLength.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_hasFeature.xhtml (99%)
 rename {content/svg/content => dom/svg}/test/test_lang.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_length.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_lengthParsing.html (100%)
 rename {content/svg/content => dom/svg}/test/test_non-scaling-stroke.html (100%)
 rename {content/svg/content => dom/svg}/test/test_nonAnimStrings.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_object-delayed-intrinsic-size.html (100%)
 rename {content/svg/content => dom/svg}/test/test_onerror.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pathAnimInterpolation.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pathLength.html (100%)
 rename {content/svg/content => dom/svg}/test/test_pathSeg.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointAtLength.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-1a.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-1b.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-2.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-3.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-4.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-5.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_pointer-events-6.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_scientific.html (100%)
 rename {content/svg/content => dom/svg}/test/test_selectSubString.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_stroke-linecap-hit-testing.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_switch.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_text.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_2.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_dirty.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_lengthAdjust.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_scaled.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_selection.html (100%)
 rename {content/svg/content => dom/svg}/test/test_text_update.html (100%)
 rename {content/svg/content => dom/svg}/test/test_transform.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_transformParsing.html (100%)
 rename {content/svg/content => dom/svg}/test/test_valueAsString.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_valueLeaks.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/test_viewport.html (100%)
 rename {content/svg/content => dom/svg}/test/test_zoom.xhtml (100%)
 rename {content/svg/content => dom/svg}/test/text-helper-scaled.svg (100%)
 rename {content/svg/content => dom/svg}/test/text-helper-selection.svg (100%)
 rename {content/svg/content => dom/svg}/test/text-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/viewport-helper.svg (100%)
 rename {content/svg/content => dom/svg}/test/zoom-helper.svg (100%)

diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 7de3efef2fc..50498603d0c 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -210,10 +210,10 @@ LOCAL_INCLUDES += [
     '/caps',
     '/content/html/content/src',
     '/content/html/document/src',
-    '/content/svg/content/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
+    '/dom/svg',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xml',
diff --git a/content/moz.build b/content/moz.build
index d3fb25d8753..4750fdad5ce 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -8,7 +8,6 @@ DIRS += [
     'base',
     'html',
     'media',
-    'svg',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/content/svg/content/moz.build b/content/svg/content/moz.build
deleted file mode 100644
index d7694feea73..00000000000
--- a/content/svg/content/moz.build
+++ /dev/null
@@ -1,9 +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 += ['src']
-
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build
deleted file mode 100644
index 6a8f823294e..00000000000
--- a/content/svg/document/src/moz.build
+++ /dev/null
@@ -1,25 +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/.
-
-EXPORTS.mozilla.dom += [
-    'SVGDocument.h',
-]
-
-SOURCES += [
-    'SVGDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/content/html/document/src',
-    '/content/svg/content/src',
-    '/dom/xml',
-    '/layout/style',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/content/svg/moz.build b/content/svg/moz.build
deleted file mode 100644
index dd57669525e..00000000000
--- a/content/svg/moz.build
+++ /dev/null
@@ -1,7 +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 += ['document/src', 'content']
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index b90f884dc7f..78fe9a654b5 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -46,7 +46,6 @@ LOCAL_INCLUDES += [
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
-    '/content/svg/content/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
@@ -54,6 +53,7 @@ LOCAL_INCLUDES += [
     '/dom/canvas',
     '/dom/geolocation',
     '/dom/indexedDB',
+    '/dom/svg',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xml',
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index ba9d73596e8..d6039b5481e 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -126,8 +126,8 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
-    '/content/svg/content/src',
     '/dom/base',
+    '/dom/svg',
     '/dom/xul',
     '/gfx/gl',
     '/image/src',
diff --git a/dom/moz.build b/dom/moz.build
index 81d9f5ed058..12110aca2aa 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -74,6 +74,7 @@ DIRS += [
     'quota',
     'settings',
     'storage',
+    'svg',
     'mobilemessage',
     'time',
     'locales',
diff --git a/dom/smil/moz.build b/dom/smil/moz.build
index 38d9463f5c8..365d99902b0 100644
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -66,7 +66,7 @@ FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/svg/content/src',
+    '/dom/svg',
     '/layout/style',
 ]
 
diff --git a/content/svg/content/src/DOMSVGAnimatedLengthList.cpp b/dom/svg/DOMSVGAnimatedLengthList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGAnimatedLengthList.cpp
rename to dom/svg/DOMSVGAnimatedLengthList.cpp
diff --git a/content/svg/content/src/DOMSVGAnimatedLengthList.h b/dom/svg/DOMSVGAnimatedLengthList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGAnimatedLengthList.h
rename to dom/svg/DOMSVGAnimatedLengthList.h
diff --git a/content/svg/content/src/DOMSVGAnimatedNumberList.cpp b/dom/svg/DOMSVGAnimatedNumberList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGAnimatedNumberList.cpp
rename to dom/svg/DOMSVGAnimatedNumberList.cpp
diff --git a/content/svg/content/src/DOMSVGAnimatedNumberList.h b/dom/svg/DOMSVGAnimatedNumberList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGAnimatedNumberList.h
rename to dom/svg/DOMSVGAnimatedNumberList.h
diff --git a/content/svg/content/src/DOMSVGLength.cpp b/dom/svg/DOMSVGLength.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGLength.cpp
rename to dom/svg/DOMSVGLength.cpp
diff --git a/content/svg/content/src/DOMSVGLength.h b/dom/svg/DOMSVGLength.h
similarity index 100%
rename from content/svg/content/src/DOMSVGLength.h
rename to dom/svg/DOMSVGLength.h
diff --git a/content/svg/content/src/DOMSVGLengthList.cpp b/dom/svg/DOMSVGLengthList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGLengthList.cpp
rename to dom/svg/DOMSVGLengthList.cpp
diff --git a/content/svg/content/src/DOMSVGLengthList.h b/dom/svg/DOMSVGLengthList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGLengthList.h
rename to dom/svg/DOMSVGLengthList.h
diff --git a/content/svg/content/src/DOMSVGNumber.cpp b/dom/svg/DOMSVGNumber.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGNumber.cpp
rename to dom/svg/DOMSVGNumber.cpp
diff --git a/content/svg/content/src/DOMSVGNumber.h b/dom/svg/DOMSVGNumber.h
similarity index 100%
rename from content/svg/content/src/DOMSVGNumber.h
rename to dom/svg/DOMSVGNumber.h
diff --git a/content/svg/content/src/DOMSVGNumberList.cpp b/dom/svg/DOMSVGNumberList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGNumberList.cpp
rename to dom/svg/DOMSVGNumberList.cpp
diff --git a/content/svg/content/src/DOMSVGNumberList.h b/dom/svg/DOMSVGNumberList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGNumberList.h
rename to dom/svg/DOMSVGNumberList.h
diff --git a/content/svg/content/src/DOMSVGPathSeg.cpp b/dom/svg/DOMSVGPathSeg.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGPathSeg.cpp
rename to dom/svg/DOMSVGPathSeg.cpp
diff --git a/content/svg/content/src/DOMSVGPathSeg.h b/dom/svg/DOMSVGPathSeg.h
similarity index 100%
rename from content/svg/content/src/DOMSVGPathSeg.h
rename to dom/svg/DOMSVGPathSeg.h
diff --git a/content/svg/content/src/DOMSVGPathSegList.cpp b/dom/svg/DOMSVGPathSegList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGPathSegList.cpp
rename to dom/svg/DOMSVGPathSegList.cpp
diff --git a/content/svg/content/src/DOMSVGPathSegList.h b/dom/svg/DOMSVGPathSegList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGPathSegList.h
rename to dom/svg/DOMSVGPathSegList.h
diff --git a/content/svg/content/src/DOMSVGPoint.cpp b/dom/svg/DOMSVGPoint.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGPoint.cpp
rename to dom/svg/DOMSVGPoint.cpp
diff --git a/content/svg/content/src/DOMSVGPoint.h b/dom/svg/DOMSVGPoint.h
similarity index 100%
rename from content/svg/content/src/DOMSVGPoint.h
rename to dom/svg/DOMSVGPoint.h
diff --git a/content/svg/content/src/DOMSVGPointList.cpp b/dom/svg/DOMSVGPointList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGPointList.cpp
rename to dom/svg/DOMSVGPointList.cpp
diff --git a/content/svg/content/src/DOMSVGPointList.h b/dom/svg/DOMSVGPointList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGPointList.h
rename to dom/svg/DOMSVGPointList.h
diff --git a/content/svg/content/src/DOMSVGStringList.cpp b/dom/svg/DOMSVGStringList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGStringList.cpp
rename to dom/svg/DOMSVGStringList.cpp
diff --git a/content/svg/content/src/DOMSVGStringList.h b/dom/svg/DOMSVGStringList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGStringList.h
rename to dom/svg/DOMSVGStringList.h
diff --git a/content/svg/content/src/DOMSVGTransformList.cpp b/dom/svg/DOMSVGTransformList.cpp
similarity index 100%
rename from content/svg/content/src/DOMSVGTransformList.cpp
rename to dom/svg/DOMSVGTransformList.cpp
diff --git a/content/svg/content/src/DOMSVGTransformList.h b/dom/svg/DOMSVGTransformList.h
similarity index 100%
rename from content/svg/content/src/DOMSVGTransformList.h
rename to dom/svg/DOMSVGTransformList.h
diff --git a/content/svg/content/src/SVGAElement.cpp b/dom/svg/SVGAElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAElement.cpp
rename to dom/svg/SVGAElement.cpp
diff --git a/content/svg/content/src/SVGAElement.h b/dom/svg/SVGAElement.h
similarity index 100%
rename from content/svg/content/src/SVGAElement.h
rename to dom/svg/SVGAElement.h
diff --git a/content/svg/content/src/SVGAltGlyphElement.cpp b/dom/svg/SVGAltGlyphElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAltGlyphElement.cpp
rename to dom/svg/SVGAltGlyphElement.cpp
diff --git a/content/svg/content/src/SVGAltGlyphElement.h b/dom/svg/SVGAltGlyphElement.h
similarity index 100%
rename from content/svg/content/src/SVGAltGlyphElement.h
rename to dom/svg/SVGAltGlyphElement.h
diff --git a/content/svg/content/src/SVGAngle.cpp b/dom/svg/SVGAngle.cpp
similarity index 100%
rename from content/svg/content/src/SVGAngle.cpp
rename to dom/svg/SVGAngle.cpp
diff --git a/content/svg/content/src/SVGAngle.h b/dom/svg/SVGAngle.h
similarity index 100%
rename from content/svg/content/src/SVGAngle.h
rename to dom/svg/SVGAngle.h
diff --git a/content/svg/content/src/SVGAnimateElement.cpp b/dom/svg/SVGAnimateElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimateElement.cpp
rename to dom/svg/SVGAnimateElement.cpp
diff --git a/content/svg/content/src/SVGAnimateElement.h b/dom/svg/SVGAnimateElement.h
similarity index 100%
rename from content/svg/content/src/SVGAnimateElement.h
rename to dom/svg/SVGAnimateElement.h
diff --git a/content/svg/content/src/SVGAnimateMotionElement.cpp b/dom/svg/SVGAnimateMotionElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimateMotionElement.cpp
rename to dom/svg/SVGAnimateMotionElement.cpp
diff --git a/content/svg/content/src/SVGAnimateMotionElement.h b/dom/svg/SVGAnimateMotionElement.h
similarity index 100%
rename from content/svg/content/src/SVGAnimateMotionElement.h
rename to dom/svg/SVGAnimateMotionElement.h
diff --git a/content/svg/content/src/SVGAnimateTransformElement.cpp b/dom/svg/SVGAnimateTransformElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimateTransformElement.cpp
rename to dom/svg/SVGAnimateTransformElement.cpp
diff --git a/content/svg/content/src/SVGAnimateTransformElement.h b/dom/svg/SVGAnimateTransformElement.h
similarity index 100%
rename from content/svg/content/src/SVGAnimateTransformElement.h
rename to dom/svg/SVGAnimateTransformElement.h
diff --git a/content/svg/content/src/SVGAnimatedAngle.cpp b/dom/svg/SVGAnimatedAngle.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedAngle.cpp
rename to dom/svg/SVGAnimatedAngle.cpp
diff --git a/content/svg/content/src/SVGAnimatedAngle.h b/dom/svg/SVGAnimatedAngle.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedAngle.h
rename to dom/svg/SVGAnimatedAngle.h
diff --git a/content/svg/content/src/SVGAnimatedBoolean.cpp b/dom/svg/SVGAnimatedBoolean.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedBoolean.cpp
rename to dom/svg/SVGAnimatedBoolean.cpp
diff --git a/content/svg/content/src/SVGAnimatedBoolean.h b/dom/svg/SVGAnimatedBoolean.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedBoolean.h
rename to dom/svg/SVGAnimatedBoolean.h
diff --git a/content/svg/content/src/SVGAnimatedEnumeration.cpp b/dom/svg/SVGAnimatedEnumeration.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedEnumeration.cpp
rename to dom/svg/SVGAnimatedEnumeration.cpp
diff --git a/content/svg/content/src/SVGAnimatedEnumeration.h b/dom/svg/SVGAnimatedEnumeration.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedEnumeration.h
rename to dom/svg/SVGAnimatedEnumeration.h
diff --git a/content/svg/content/src/SVGAnimatedInteger.cpp b/dom/svg/SVGAnimatedInteger.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedInteger.cpp
rename to dom/svg/SVGAnimatedInteger.cpp
diff --git a/content/svg/content/src/SVGAnimatedInteger.h b/dom/svg/SVGAnimatedInteger.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedInteger.h
rename to dom/svg/SVGAnimatedInteger.h
diff --git a/content/svg/content/src/SVGAnimatedLength.cpp b/dom/svg/SVGAnimatedLength.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedLength.cpp
rename to dom/svg/SVGAnimatedLength.cpp
diff --git a/content/svg/content/src/SVGAnimatedLength.h b/dom/svg/SVGAnimatedLength.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedLength.h
rename to dom/svg/SVGAnimatedLength.h
diff --git a/content/svg/content/src/SVGAnimatedLengthList.cpp b/dom/svg/SVGAnimatedLengthList.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedLengthList.cpp
rename to dom/svg/SVGAnimatedLengthList.cpp
diff --git a/content/svg/content/src/SVGAnimatedLengthList.h b/dom/svg/SVGAnimatedLengthList.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedLengthList.h
rename to dom/svg/SVGAnimatedLengthList.h
diff --git a/content/svg/content/src/SVGAnimatedNumber.cpp b/dom/svg/SVGAnimatedNumber.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedNumber.cpp
rename to dom/svg/SVGAnimatedNumber.cpp
diff --git a/content/svg/content/src/SVGAnimatedNumber.h b/dom/svg/SVGAnimatedNumber.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedNumber.h
rename to dom/svg/SVGAnimatedNumber.h
diff --git a/content/svg/content/src/SVGAnimatedNumberList.cpp b/dom/svg/SVGAnimatedNumberList.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedNumberList.cpp
rename to dom/svg/SVGAnimatedNumberList.cpp
diff --git a/content/svg/content/src/SVGAnimatedNumberList.h b/dom/svg/SVGAnimatedNumberList.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedNumberList.h
rename to dom/svg/SVGAnimatedNumberList.h
diff --git a/content/svg/content/src/SVGAnimatedPathSegList.cpp b/dom/svg/SVGAnimatedPathSegList.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPathSegList.cpp
rename to dom/svg/SVGAnimatedPathSegList.cpp
diff --git a/content/svg/content/src/SVGAnimatedPathSegList.h b/dom/svg/SVGAnimatedPathSegList.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPathSegList.h
rename to dom/svg/SVGAnimatedPathSegList.h
diff --git a/content/svg/content/src/SVGAnimatedPointList.cpp b/dom/svg/SVGAnimatedPointList.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPointList.cpp
rename to dom/svg/SVGAnimatedPointList.cpp
diff --git a/content/svg/content/src/SVGAnimatedPointList.h b/dom/svg/SVGAnimatedPointList.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPointList.h
rename to dom/svg/SVGAnimatedPointList.h
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp b/dom/svg/SVGAnimatedPreserveAspectRatio.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPreserveAspectRatio.cpp
rename to dom/svg/SVGAnimatedPreserveAspectRatio.cpp
diff --git a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h b/dom/svg/SVGAnimatedPreserveAspectRatio.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
rename to dom/svg/SVGAnimatedPreserveAspectRatio.h
diff --git a/content/svg/content/src/SVGAnimatedRect.cpp b/dom/svg/SVGAnimatedRect.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedRect.cpp
rename to dom/svg/SVGAnimatedRect.cpp
diff --git a/content/svg/content/src/SVGAnimatedRect.h b/dom/svg/SVGAnimatedRect.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedRect.h
rename to dom/svg/SVGAnimatedRect.h
diff --git a/content/svg/content/src/SVGAnimatedString.cpp b/dom/svg/SVGAnimatedString.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedString.cpp
rename to dom/svg/SVGAnimatedString.cpp
diff --git a/content/svg/content/src/SVGAnimatedString.h b/dom/svg/SVGAnimatedString.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedString.h
rename to dom/svg/SVGAnimatedString.h
diff --git a/content/svg/content/src/SVGAnimatedTransformList.cpp b/dom/svg/SVGAnimatedTransformList.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimatedTransformList.cpp
rename to dom/svg/SVGAnimatedTransformList.cpp
diff --git a/content/svg/content/src/SVGAnimatedTransformList.h b/dom/svg/SVGAnimatedTransformList.h
similarity index 100%
rename from content/svg/content/src/SVGAnimatedTransformList.h
rename to dom/svg/SVGAnimatedTransformList.h
diff --git a/content/svg/content/src/SVGAnimationElement.cpp b/dom/svg/SVGAnimationElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGAnimationElement.cpp
rename to dom/svg/SVGAnimationElement.cpp
diff --git a/content/svg/content/src/SVGAnimationElement.h b/dom/svg/SVGAnimationElement.h
similarity index 100%
rename from content/svg/content/src/SVGAnimationElement.h
rename to dom/svg/SVGAnimationElement.h
diff --git a/content/svg/content/src/SVGAttrValueWrapper.cpp b/dom/svg/SVGAttrValueWrapper.cpp
similarity index 100%
rename from content/svg/content/src/SVGAttrValueWrapper.cpp
rename to dom/svg/SVGAttrValueWrapper.cpp
diff --git a/content/svg/content/src/SVGAttrValueWrapper.h b/dom/svg/SVGAttrValueWrapper.h
similarity index 100%
rename from content/svg/content/src/SVGAttrValueWrapper.h
rename to dom/svg/SVGAttrValueWrapper.h
diff --git a/content/svg/content/src/SVGCircleElement.cpp b/dom/svg/SVGCircleElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGCircleElement.cpp
rename to dom/svg/SVGCircleElement.cpp
diff --git a/content/svg/content/src/SVGCircleElement.h b/dom/svg/SVGCircleElement.h
similarity index 100%
rename from content/svg/content/src/SVGCircleElement.h
rename to dom/svg/SVGCircleElement.h
diff --git a/content/svg/content/src/SVGClipPathElement.cpp b/dom/svg/SVGClipPathElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGClipPathElement.cpp
rename to dom/svg/SVGClipPathElement.cpp
diff --git a/content/svg/content/src/SVGClipPathElement.h b/dom/svg/SVGClipPathElement.h
similarity index 100%
rename from content/svg/content/src/SVGClipPathElement.h
rename to dom/svg/SVGClipPathElement.h
diff --git a/content/svg/content/src/SVGComponentTransferFunctionElement.h b/dom/svg/SVGComponentTransferFunctionElement.h
similarity index 100%
rename from content/svg/content/src/SVGComponentTransferFunctionElement.h
rename to dom/svg/SVGComponentTransferFunctionElement.h
diff --git a/content/svg/content/src/SVGContentUtils.cpp b/dom/svg/SVGContentUtils.cpp
similarity index 100%
rename from content/svg/content/src/SVGContentUtils.cpp
rename to dom/svg/SVGContentUtils.cpp
diff --git a/content/svg/content/src/SVGContentUtils.h b/dom/svg/SVGContentUtils.h
similarity index 100%
rename from content/svg/content/src/SVGContentUtils.h
rename to dom/svg/SVGContentUtils.h
diff --git a/content/svg/content/src/SVGDefsElement.cpp b/dom/svg/SVGDefsElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGDefsElement.cpp
rename to dom/svg/SVGDefsElement.cpp
diff --git a/content/svg/content/src/SVGDefsElement.h b/dom/svg/SVGDefsElement.h
similarity index 100%
rename from content/svg/content/src/SVGDefsElement.h
rename to dom/svg/SVGDefsElement.h
diff --git a/content/svg/content/src/SVGDescElement.cpp b/dom/svg/SVGDescElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGDescElement.cpp
rename to dom/svg/SVGDescElement.cpp
diff --git a/content/svg/content/src/SVGDescElement.h b/dom/svg/SVGDescElement.h
similarity index 100%
rename from content/svg/content/src/SVGDescElement.h
rename to dom/svg/SVGDescElement.h
diff --git a/content/svg/document/src/SVGDocument.cpp b/dom/svg/SVGDocument.cpp
similarity index 100%
rename from content/svg/document/src/SVGDocument.cpp
rename to dom/svg/SVGDocument.cpp
diff --git a/content/svg/document/src/SVGDocument.h b/dom/svg/SVGDocument.h
similarity index 100%
rename from content/svg/document/src/SVGDocument.h
rename to dom/svg/SVGDocument.h
diff --git a/content/svg/content/src/SVGElementFactory.cpp b/dom/svg/SVGElementFactory.cpp
similarity index 100%
rename from content/svg/content/src/SVGElementFactory.cpp
rename to dom/svg/SVGElementFactory.cpp
diff --git a/content/svg/content/src/SVGElementFactory.h b/dom/svg/SVGElementFactory.h
similarity index 100%
rename from content/svg/content/src/SVGElementFactory.h
rename to dom/svg/SVGElementFactory.h
diff --git a/content/svg/content/src/SVGEllipseElement.cpp b/dom/svg/SVGEllipseElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGEllipseElement.cpp
rename to dom/svg/SVGEllipseElement.cpp
diff --git a/content/svg/content/src/SVGEllipseElement.h b/dom/svg/SVGEllipseElement.h
similarity index 100%
rename from content/svg/content/src/SVGEllipseElement.h
rename to dom/svg/SVGEllipseElement.h
diff --git a/content/svg/content/src/SVGFEBlendElement.cpp b/dom/svg/SVGFEBlendElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEBlendElement.cpp
rename to dom/svg/SVGFEBlendElement.cpp
diff --git a/content/svg/content/src/SVGFEBlendElement.h b/dom/svg/SVGFEBlendElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEBlendElement.h
rename to dom/svg/SVGFEBlendElement.h
diff --git a/content/svg/content/src/SVGFEColorMatrixElement.cpp b/dom/svg/SVGFEColorMatrixElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEColorMatrixElement.cpp
rename to dom/svg/SVGFEColorMatrixElement.cpp
diff --git a/content/svg/content/src/SVGFEColorMatrixElement.h b/dom/svg/SVGFEColorMatrixElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEColorMatrixElement.h
rename to dom/svg/SVGFEColorMatrixElement.h
diff --git a/content/svg/content/src/SVGFEComponentTransferElement.cpp b/dom/svg/SVGFEComponentTransferElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEComponentTransferElement.cpp
rename to dom/svg/SVGFEComponentTransferElement.cpp
diff --git a/content/svg/content/src/SVGFEComponentTransferElement.h b/dom/svg/SVGFEComponentTransferElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEComponentTransferElement.h
rename to dom/svg/SVGFEComponentTransferElement.h
diff --git a/content/svg/content/src/SVGFECompositeElement.cpp b/dom/svg/SVGFECompositeElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFECompositeElement.cpp
rename to dom/svg/SVGFECompositeElement.cpp
diff --git a/content/svg/content/src/SVGFECompositeElement.h b/dom/svg/SVGFECompositeElement.h
similarity index 100%
rename from content/svg/content/src/SVGFECompositeElement.h
rename to dom/svg/SVGFECompositeElement.h
diff --git a/content/svg/content/src/SVGFEConvolveMatrixElement.cpp b/dom/svg/SVGFEConvolveMatrixElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEConvolveMatrixElement.cpp
rename to dom/svg/SVGFEConvolveMatrixElement.cpp
diff --git a/content/svg/content/src/SVGFEConvolveMatrixElement.h b/dom/svg/SVGFEConvolveMatrixElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEConvolveMatrixElement.h
rename to dom/svg/SVGFEConvolveMatrixElement.h
diff --git a/content/svg/content/src/SVGFEDiffuseLightingElement.cpp b/dom/svg/SVGFEDiffuseLightingElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEDiffuseLightingElement.cpp
rename to dom/svg/SVGFEDiffuseLightingElement.cpp
diff --git a/content/svg/content/src/SVGFEDiffuseLightingElement.h b/dom/svg/SVGFEDiffuseLightingElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEDiffuseLightingElement.h
rename to dom/svg/SVGFEDiffuseLightingElement.h
diff --git a/content/svg/content/src/SVGFEDisplacementMapElement.cpp b/dom/svg/SVGFEDisplacementMapElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEDisplacementMapElement.cpp
rename to dom/svg/SVGFEDisplacementMapElement.cpp
diff --git a/content/svg/content/src/SVGFEDisplacementMapElement.h b/dom/svg/SVGFEDisplacementMapElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEDisplacementMapElement.h
rename to dom/svg/SVGFEDisplacementMapElement.h
diff --git a/content/svg/content/src/SVGFEDistantLightElement.cpp b/dom/svg/SVGFEDistantLightElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEDistantLightElement.cpp
rename to dom/svg/SVGFEDistantLightElement.cpp
diff --git a/content/svg/content/src/SVGFEDistantLightElement.h b/dom/svg/SVGFEDistantLightElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEDistantLightElement.h
rename to dom/svg/SVGFEDistantLightElement.h
diff --git a/content/svg/content/src/SVGFEDropShadowElement.cpp b/dom/svg/SVGFEDropShadowElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEDropShadowElement.cpp
rename to dom/svg/SVGFEDropShadowElement.cpp
diff --git a/content/svg/content/src/SVGFEDropShadowElement.h b/dom/svg/SVGFEDropShadowElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEDropShadowElement.h
rename to dom/svg/SVGFEDropShadowElement.h
diff --git a/content/svg/content/src/SVGFEFloodElement.cpp b/dom/svg/SVGFEFloodElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEFloodElement.cpp
rename to dom/svg/SVGFEFloodElement.cpp
diff --git a/content/svg/content/src/SVGFEFloodElement.h b/dom/svg/SVGFEFloodElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEFloodElement.h
rename to dom/svg/SVGFEFloodElement.h
diff --git a/content/svg/content/src/SVGFEGaussianBlurElement.cpp b/dom/svg/SVGFEGaussianBlurElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEGaussianBlurElement.cpp
rename to dom/svg/SVGFEGaussianBlurElement.cpp
diff --git a/content/svg/content/src/SVGFEGaussianBlurElement.h b/dom/svg/SVGFEGaussianBlurElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEGaussianBlurElement.h
rename to dom/svg/SVGFEGaussianBlurElement.h
diff --git a/content/svg/content/src/SVGFEImageElement.cpp b/dom/svg/SVGFEImageElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEImageElement.cpp
rename to dom/svg/SVGFEImageElement.cpp
diff --git a/content/svg/content/src/SVGFEImageElement.h b/dom/svg/SVGFEImageElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEImageElement.h
rename to dom/svg/SVGFEImageElement.h
diff --git a/content/svg/content/src/SVGFEMergeElement.cpp b/dom/svg/SVGFEMergeElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEMergeElement.cpp
rename to dom/svg/SVGFEMergeElement.cpp
diff --git a/content/svg/content/src/SVGFEMergeElement.h b/dom/svg/SVGFEMergeElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEMergeElement.h
rename to dom/svg/SVGFEMergeElement.h
diff --git a/content/svg/content/src/SVGFEMergeNodeElement.cpp b/dom/svg/SVGFEMergeNodeElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEMergeNodeElement.cpp
rename to dom/svg/SVGFEMergeNodeElement.cpp
diff --git a/content/svg/content/src/SVGFEMergeNodeElement.h b/dom/svg/SVGFEMergeNodeElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEMergeNodeElement.h
rename to dom/svg/SVGFEMergeNodeElement.h
diff --git a/content/svg/content/src/SVGFEMorphologyElement.cpp b/dom/svg/SVGFEMorphologyElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEMorphologyElement.cpp
rename to dom/svg/SVGFEMorphologyElement.cpp
diff --git a/content/svg/content/src/SVGFEMorphologyElement.h b/dom/svg/SVGFEMorphologyElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEMorphologyElement.h
rename to dom/svg/SVGFEMorphologyElement.h
diff --git a/content/svg/content/src/SVGFEOffsetElement.cpp b/dom/svg/SVGFEOffsetElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEOffsetElement.cpp
rename to dom/svg/SVGFEOffsetElement.cpp
diff --git a/content/svg/content/src/SVGFEOffsetElement.h b/dom/svg/SVGFEOffsetElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEOffsetElement.h
rename to dom/svg/SVGFEOffsetElement.h
diff --git a/content/svg/content/src/SVGFEPointLightElement.cpp b/dom/svg/SVGFEPointLightElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFEPointLightElement.cpp
rename to dom/svg/SVGFEPointLightElement.cpp
diff --git a/content/svg/content/src/SVGFEPointLightElement.h b/dom/svg/SVGFEPointLightElement.h
similarity index 100%
rename from content/svg/content/src/SVGFEPointLightElement.h
rename to dom/svg/SVGFEPointLightElement.h
diff --git a/content/svg/content/src/SVGFESpecularLightingElement.cpp b/dom/svg/SVGFESpecularLightingElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFESpecularLightingElement.cpp
rename to dom/svg/SVGFESpecularLightingElement.cpp
diff --git a/content/svg/content/src/SVGFESpecularLightingElement.h b/dom/svg/SVGFESpecularLightingElement.h
similarity index 100%
rename from content/svg/content/src/SVGFESpecularLightingElement.h
rename to dom/svg/SVGFESpecularLightingElement.h
diff --git a/content/svg/content/src/SVGFESpotLightElement.cpp b/dom/svg/SVGFESpotLightElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFESpotLightElement.cpp
rename to dom/svg/SVGFESpotLightElement.cpp
diff --git a/content/svg/content/src/SVGFESpotLightElement.h b/dom/svg/SVGFESpotLightElement.h
similarity index 100%
rename from content/svg/content/src/SVGFESpotLightElement.h
rename to dom/svg/SVGFESpotLightElement.h
diff --git a/content/svg/content/src/SVGFETileElement.cpp b/dom/svg/SVGFETileElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFETileElement.cpp
rename to dom/svg/SVGFETileElement.cpp
diff --git a/content/svg/content/src/SVGFETileElement.h b/dom/svg/SVGFETileElement.h
similarity index 100%
rename from content/svg/content/src/SVGFETileElement.h
rename to dom/svg/SVGFETileElement.h
diff --git a/content/svg/content/src/SVGFETurbulenceElement.cpp b/dom/svg/SVGFETurbulenceElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFETurbulenceElement.cpp
rename to dom/svg/SVGFETurbulenceElement.cpp
diff --git a/content/svg/content/src/SVGFETurbulenceElement.h b/dom/svg/SVGFETurbulenceElement.h
similarity index 100%
rename from content/svg/content/src/SVGFETurbulenceElement.h
rename to dom/svg/SVGFETurbulenceElement.h
diff --git a/content/svg/content/src/SVGFilterElement.cpp b/dom/svg/SVGFilterElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGFilterElement.cpp
rename to dom/svg/SVGFilterElement.cpp
diff --git a/content/svg/content/src/SVGFilterElement.h b/dom/svg/SVGFilterElement.h
similarity index 100%
rename from content/svg/content/src/SVGFilterElement.h
rename to dom/svg/SVGFilterElement.h
diff --git a/content/svg/content/src/SVGForeignObjectElement.cpp b/dom/svg/SVGForeignObjectElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGForeignObjectElement.cpp
rename to dom/svg/SVGForeignObjectElement.cpp
diff --git a/content/svg/content/src/SVGForeignObjectElement.h b/dom/svg/SVGForeignObjectElement.h
similarity index 100%
rename from content/svg/content/src/SVGForeignObjectElement.h
rename to dom/svg/SVGForeignObjectElement.h
diff --git a/content/svg/content/src/SVGFragmentIdentifier.cpp b/dom/svg/SVGFragmentIdentifier.cpp
similarity index 100%
rename from content/svg/content/src/SVGFragmentIdentifier.cpp
rename to dom/svg/SVGFragmentIdentifier.cpp
diff --git a/content/svg/content/src/SVGFragmentIdentifier.h b/dom/svg/SVGFragmentIdentifier.h
similarity index 100%
rename from content/svg/content/src/SVGFragmentIdentifier.h
rename to dom/svg/SVGFragmentIdentifier.h
diff --git a/content/svg/content/src/SVGGElement.cpp b/dom/svg/SVGGElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGGElement.cpp
rename to dom/svg/SVGGElement.cpp
diff --git a/content/svg/content/src/SVGGElement.h b/dom/svg/SVGGElement.h
similarity index 100%
rename from content/svg/content/src/SVGGElement.h
rename to dom/svg/SVGGElement.h
diff --git a/content/svg/content/src/SVGGradientElement.cpp b/dom/svg/SVGGradientElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGGradientElement.cpp
rename to dom/svg/SVGGradientElement.cpp
diff --git a/content/svg/content/src/SVGGradientElement.h b/dom/svg/SVGGradientElement.h
similarity index 100%
rename from content/svg/content/src/SVGGradientElement.h
rename to dom/svg/SVGGradientElement.h
diff --git a/content/svg/content/src/SVGGraphicsElement.cpp b/dom/svg/SVGGraphicsElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGGraphicsElement.cpp
rename to dom/svg/SVGGraphicsElement.cpp
diff --git a/content/svg/content/src/SVGGraphicsElement.h b/dom/svg/SVGGraphicsElement.h
similarity index 100%
rename from content/svg/content/src/SVGGraphicsElement.h
rename to dom/svg/SVGGraphicsElement.h
diff --git a/content/svg/content/src/SVGIFrameElement.cpp b/dom/svg/SVGIFrameElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGIFrameElement.cpp
rename to dom/svg/SVGIFrameElement.cpp
diff --git a/content/svg/content/src/SVGIFrameElement.h b/dom/svg/SVGIFrameElement.h
similarity index 100%
rename from content/svg/content/src/SVGIFrameElement.h
rename to dom/svg/SVGIFrameElement.h
diff --git a/content/svg/content/src/SVGIRect.h b/dom/svg/SVGIRect.h
similarity index 100%
rename from content/svg/content/src/SVGIRect.h
rename to dom/svg/SVGIRect.h
diff --git a/content/svg/content/src/SVGImageElement.cpp b/dom/svg/SVGImageElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGImageElement.cpp
rename to dom/svg/SVGImageElement.cpp
diff --git a/content/svg/content/src/SVGImageElement.h b/dom/svg/SVGImageElement.h
similarity index 100%
rename from content/svg/content/src/SVGImageElement.h
rename to dom/svg/SVGImageElement.h
diff --git a/content/svg/content/src/SVGIntegerPairSMILType.cpp b/dom/svg/SVGIntegerPairSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGIntegerPairSMILType.cpp
rename to dom/svg/SVGIntegerPairSMILType.cpp
diff --git a/content/svg/content/src/SVGIntegerPairSMILType.h b/dom/svg/SVGIntegerPairSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGIntegerPairSMILType.h
rename to dom/svg/SVGIntegerPairSMILType.h
diff --git a/content/svg/content/src/SVGLength.cpp b/dom/svg/SVGLength.cpp
similarity index 100%
rename from content/svg/content/src/SVGLength.cpp
rename to dom/svg/SVGLength.cpp
diff --git a/content/svg/content/src/SVGLength.h b/dom/svg/SVGLength.h
similarity index 100%
rename from content/svg/content/src/SVGLength.h
rename to dom/svg/SVGLength.h
diff --git a/content/svg/content/src/SVGLengthList.cpp b/dom/svg/SVGLengthList.cpp
similarity index 100%
rename from content/svg/content/src/SVGLengthList.cpp
rename to dom/svg/SVGLengthList.cpp
diff --git a/content/svg/content/src/SVGLengthList.h b/dom/svg/SVGLengthList.h
similarity index 100%
rename from content/svg/content/src/SVGLengthList.h
rename to dom/svg/SVGLengthList.h
diff --git a/content/svg/content/src/SVGLengthListSMILType.cpp b/dom/svg/SVGLengthListSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGLengthListSMILType.cpp
rename to dom/svg/SVGLengthListSMILType.cpp
diff --git a/content/svg/content/src/SVGLengthListSMILType.h b/dom/svg/SVGLengthListSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGLengthListSMILType.h
rename to dom/svg/SVGLengthListSMILType.h
diff --git a/content/svg/content/src/SVGLineElement.cpp b/dom/svg/SVGLineElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGLineElement.cpp
rename to dom/svg/SVGLineElement.cpp
diff --git a/content/svg/content/src/SVGLineElement.h b/dom/svg/SVGLineElement.h
similarity index 100%
rename from content/svg/content/src/SVGLineElement.h
rename to dom/svg/SVGLineElement.h
diff --git a/content/svg/content/src/SVGMPathElement.cpp b/dom/svg/SVGMPathElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGMPathElement.cpp
rename to dom/svg/SVGMPathElement.cpp
diff --git a/content/svg/content/src/SVGMPathElement.h b/dom/svg/SVGMPathElement.h
similarity index 100%
rename from content/svg/content/src/SVGMPathElement.h
rename to dom/svg/SVGMPathElement.h
diff --git a/content/svg/content/src/SVGMarkerElement.cpp b/dom/svg/SVGMarkerElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGMarkerElement.cpp
rename to dom/svg/SVGMarkerElement.cpp
diff --git a/content/svg/content/src/SVGMarkerElement.h b/dom/svg/SVGMarkerElement.h
similarity index 100%
rename from content/svg/content/src/SVGMarkerElement.h
rename to dom/svg/SVGMarkerElement.h
diff --git a/content/svg/content/src/SVGMaskElement.cpp b/dom/svg/SVGMaskElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGMaskElement.cpp
rename to dom/svg/SVGMaskElement.cpp
diff --git a/content/svg/content/src/SVGMaskElement.h b/dom/svg/SVGMaskElement.h
similarity index 100%
rename from content/svg/content/src/SVGMaskElement.h
rename to dom/svg/SVGMaskElement.h
diff --git a/content/svg/content/src/SVGMatrix.cpp b/dom/svg/SVGMatrix.cpp
similarity index 100%
rename from content/svg/content/src/SVGMatrix.cpp
rename to dom/svg/SVGMatrix.cpp
diff --git a/content/svg/content/src/SVGMatrix.h b/dom/svg/SVGMatrix.h
similarity index 100%
rename from content/svg/content/src/SVGMatrix.h
rename to dom/svg/SVGMatrix.h
diff --git a/content/svg/content/src/SVGMetadataElement.cpp b/dom/svg/SVGMetadataElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGMetadataElement.cpp
rename to dom/svg/SVGMetadataElement.cpp
diff --git a/content/svg/content/src/SVGMetadataElement.h b/dom/svg/SVGMetadataElement.h
similarity index 100%
rename from content/svg/content/src/SVGMetadataElement.h
rename to dom/svg/SVGMetadataElement.h
diff --git a/content/svg/content/src/SVGMotionSMILAnimationFunction.cpp b/dom/svg/SVGMotionSMILAnimationFunction.cpp
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILAnimationFunction.cpp
rename to dom/svg/SVGMotionSMILAnimationFunction.cpp
diff --git a/content/svg/content/src/SVGMotionSMILAnimationFunction.h b/dom/svg/SVGMotionSMILAnimationFunction.h
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILAnimationFunction.h
rename to dom/svg/SVGMotionSMILAnimationFunction.h
diff --git a/content/svg/content/src/SVGMotionSMILAttr.cpp b/dom/svg/SVGMotionSMILAttr.cpp
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILAttr.cpp
rename to dom/svg/SVGMotionSMILAttr.cpp
diff --git a/content/svg/content/src/SVGMotionSMILAttr.h b/dom/svg/SVGMotionSMILAttr.h
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILAttr.h
rename to dom/svg/SVGMotionSMILAttr.h
diff --git a/content/svg/content/src/SVGMotionSMILPathUtils.cpp b/dom/svg/SVGMotionSMILPathUtils.cpp
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILPathUtils.cpp
rename to dom/svg/SVGMotionSMILPathUtils.cpp
diff --git a/content/svg/content/src/SVGMotionSMILPathUtils.h b/dom/svg/SVGMotionSMILPathUtils.h
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILPathUtils.h
rename to dom/svg/SVGMotionSMILPathUtils.h
diff --git a/content/svg/content/src/SVGMotionSMILType.cpp b/dom/svg/SVGMotionSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILType.cpp
rename to dom/svg/SVGMotionSMILType.cpp
diff --git a/content/svg/content/src/SVGMotionSMILType.h b/dom/svg/SVGMotionSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGMotionSMILType.h
rename to dom/svg/SVGMotionSMILType.h
diff --git a/content/svg/content/src/SVGNumberList.cpp b/dom/svg/SVGNumberList.cpp
similarity index 100%
rename from content/svg/content/src/SVGNumberList.cpp
rename to dom/svg/SVGNumberList.cpp
diff --git a/content/svg/content/src/SVGNumberList.h b/dom/svg/SVGNumberList.h
similarity index 100%
rename from content/svg/content/src/SVGNumberList.h
rename to dom/svg/SVGNumberList.h
diff --git a/content/svg/content/src/SVGNumberListSMILType.cpp b/dom/svg/SVGNumberListSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGNumberListSMILType.cpp
rename to dom/svg/SVGNumberListSMILType.cpp
diff --git a/content/svg/content/src/SVGNumberListSMILType.h b/dom/svg/SVGNumberListSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGNumberListSMILType.h
rename to dom/svg/SVGNumberListSMILType.h
diff --git a/content/svg/content/src/SVGNumberPairSMILType.cpp b/dom/svg/SVGNumberPairSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGNumberPairSMILType.cpp
rename to dom/svg/SVGNumberPairSMILType.cpp
diff --git a/content/svg/content/src/SVGNumberPairSMILType.h b/dom/svg/SVGNumberPairSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGNumberPairSMILType.h
rename to dom/svg/SVGNumberPairSMILType.h
diff --git a/content/svg/content/src/SVGOrientSMILType.cpp b/dom/svg/SVGOrientSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGOrientSMILType.cpp
rename to dom/svg/SVGOrientSMILType.cpp
diff --git a/content/svg/content/src/SVGOrientSMILType.h b/dom/svg/SVGOrientSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGOrientSMILType.h
rename to dom/svg/SVGOrientSMILType.h
diff --git a/content/svg/content/src/SVGPathData.cpp b/dom/svg/SVGPathData.cpp
similarity index 100%
rename from content/svg/content/src/SVGPathData.cpp
rename to dom/svg/SVGPathData.cpp
diff --git a/content/svg/content/src/SVGPathData.h b/dom/svg/SVGPathData.h
similarity index 100%
rename from content/svg/content/src/SVGPathData.h
rename to dom/svg/SVGPathData.h
diff --git a/content/svg/content/src/SVGPathElement.cpp b/dom/svg/SVGPathElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGPathElement.cpp
rename to dom/svg/SVGPathElement.cpp
diff --git a/content/svg/content/src/SVGPathElement.h b/dom/svg/SVGPathElement.h
similarity index 100%
rename from content/svg/content/src/SVGPathElement.h
rename to dom/svg/SVGPathElement.h
diff --git a/content/svg/content/src/SVGPathSegListSMILType.cpp b/dom/svg/SVGPathSegListSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGPathSegListSMILType.cpp
rename to dom/svg/SVGPathSegListSMILType.cpp
diff --git a/content/svg/content/src/SVGPathSegListSMILType.h b/dom/svg/SVGPathSegListSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGPathSegListSMILType.h
rename to dom/svg/SVGPathSegListSMILType.h
diff --git a/content/svg/content/src/SVGPathSegUtils.cpp b/dom/svg/SVGPathSegUtils.cpp
similarity index 100%
rename from content/svg/content/src/SVGPathSegUtils.cpp
rename to dom/svg/SVGPathSegUtils.cpp
diff --git a/content/svg/content/src/SVGPathSegUtils.h b/dom/svg/SVGPathSegUtils.h
similarity index 100%
rename from content/svg/content/src/SVGPathSegUtils.h
rename to dom/svg/SVGPathSegUtils.h
diff --git a/content/svg/content/src/SVGPatternElement.cpp b/dom/svg/SVGPatternElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGPatternElement.cpp
rename to dom/svg/SVGPatternElement.cpp
diff --git a/content/svg/content/src/SVGPatternElement.h b/dom/svg/SVGPatternElement.h
similarity index 100%
rename from content/svg/content/src/SVGPatternElement.h
rename to dom/svg/SVGPatternElement.h
diff --git a/content/svg/content/src/SVGPoint.h b/dom/svg/SVGPoint.h
similarity index 100%
rename from content/svg/content/src/SVGPoint.h
rename to dom/svg/SVGPoint.h
diff --git a/content/svg/content/src/SVGPointList.cpp b/dom/svg/SVGPointList.cpp
similarity index 100%
rename from content/svg/content/src/SVGPointList.cpp
rename to dom/svg/SVGPointList.cpp
diff --git a/content/svg/content/src/SVGPointList.h b/dom/svg/SVGPointList.h
similarity index 100%
rename from content/svg/content/src/SVGPointList.h
rename to dom/svg/SVGPointList.h
diff --git a/content/svg/content/src/SVGPointListSMILType.cpp b/dom/svg/SVGPointListSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGPointListSMILType.cpp
rename to dom/svg/SVGPointListSMILType.cpp
diff --git a/content/svg/content/src/SVGPointListSMILType.h b/dom/svg/SVGPointListSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGPointListSMILType.h
rename to dom/svg/SVGPointListSMILType.h
diff --git a/content/svg/content/src/SVGPolygonElement.cpp b/dom/svg/SVGPolygonElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGPolygonElement.cpp
rename to dom/svg/SVGPolygonElement.cpp
diff --git a/content/svg/content/src/SVGPolygonElement.h b/dom/svg/SVGPolygonElement.h
similarity index 100%
rename from content/svg/content/src/SVGPolygonElement.h
rename to dom/svg/SVGPolygonElement.h
diff --git a/content/svg/content/src/SVGPolylineElement.cpp b/dom/svg/SVGPolylineElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGPolylineElement.cpp
rename to dom/svg/SVGPolylineElement.cpp
diff --git a/content/svg/content/src/SVGPolylineElement.h b/dom/svg/SVGPolylineElement.h
similarity index 100%
rename from content/svg/content/src/SVGPolylineElement.h
rename to dom/svg/SVGPolylineElement.h
diff --git a/content/svg/content/src/SVGPreserveAspectRatio.cpp b/dom/svg/SVGPreserveAspectRatio.cpp
similarity index 100%
rename from content/svg/content/src/SVGPreserveAspectRatio.cpp
rename to dom/svg/SVGPreserveAspectRatio.cpp
diff --git a/content/svg/content/src/SVGPreserveAspectRatio.h b/dom/svg/SVGPreserveAspectRatio.h
similarity index 100%
rename from content/svg/content/src/SVGPreserveAspectRatio.h
rename to dom/svg/SVGPreserveAspectRatio.h
diff --git a/content/svg/content/src/SVGRect.cpp b/dom/svg/SVGRect.cpp
similarity index 100%
rename from content/svg/content/src/SVGRect.cpp
rename to dom/svg/SVGRect.cpp
diff --git a/content/svg/content/src/SVGRect.h b/dom/svg/SVGRect.h
similarity index 100%
rename from content/svg/content/src/SVGRect.h
rename to dom/svg/SVGRect.h
diff --git a/content/svg/content/src/SVGRectElement.cpp b/dom/svg/SVGRectElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGRectElement.cpp
rename to dom/svg/SVGRectElement.cpp
diff --git a/content/svg/content/src/SVGRectElement.h b/dom/svg/SVGRectElement.h
similarity index 100%
rename from content/svg/content/src/SVGRectElement.h
rename to dom/svg/SVGRectElement.h
diff --git a/content/svg/content/src/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGSVGElement.cpp
rename to dom/svg/SVGSVGElement.cpp
diff --git a/content/svg/content/src/SVGSVGElement.h b/dom/svg/SVGSVGElement.h
similarity index 100%
rename from content/svg/content/src/SVGSVGElement.h
rename to dom/svg/SVGSVGElement.h
diff --git a/content/svg/content/src/SVGScriptElement.cpp b/dom/svg/SVGScriptElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGScriptElement.cpp
rename to dom/svg/SVGScriptElement.cpp
diff --git a/content/svg/content/src/SVGScriptElement.h b/dom/svg/SVGScriptElement.h
similarity index 100%
rename from content/svg/content/src/SVGScriptElement.h
rename to dom/svg/SVGScriptElement.h
diff --git a/content/svg/content/src/SVGSetElement.cpp b/dom/svg/SVGSetElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGSetElement.cpp
rename to dom/svg/SVGSetElement.cpp
diff --git a/content/svg/content/src/SVGSetElement.h b/dom/svg/SVGSetElement.h
similarity index 100%
rename from content/svg/content/src/SVGSetElement.h
rename to dom/svg/SVGSetElement.h
diff --git a/content/svg/content/src/SVGStopElement.cpp b/dom/svg/SVGStopElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGStopElement.cpp
rename to dom/svg/SVGStopElement.cpp
diff --git a/content/svg/content/src/SVGStopElement.h b/dom/svg/SVGStopElement.h
similarity index 100%
rename from content/svg/content/src/SVGStopElement.h
rename to dom/svg/SVGStopElement.h
diff --git a/content/svg/content/src/SVGStringList.cpp b/dom/svg/SVGStringList.cpp
similarity index 100%
rename from content/svg/content/src/SVGStringList.cpp
rename to dom/svg/SVGStringList.cpp
diff --git a/content/svg/content/src/SVGStringList.h b/dom/svg/SVGStringList.h
similarity index 100%
rename from content/svg/content/src/SVGStringList.h
rename to dom/svg/SVGStringList.h
diff --git a/content/svg/content/src/SVGStyleElement.cpp b/dom/svg/SVGStyleElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGStyleElement.cpp
rename to dom/svg/SVGStyleElement.cpp
diff --git a/content/svg/content/src/SVGStyleElement.h b/dom/svg/SVGStyleElement.h
similarity index 100%
rename from content/svg/content/src/SVGStyleElement.h
rename to dom/svg/SVGStyleElement.h
diff --git a/content/svg/content/src/SVGSwitchElement.cpp b/dom/svg/SVGSwitchElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGSwitchElement.cpp
rename to dom/svg/SVGSwitchElement.cpp
diff --git a/content/svg/content/src/SVGSwitchElement.h b/dom/svg/SVGSwitchElement.h
similarity index 100%
rename from content/svg/content/src/SVGSwitchElement.h
rename to dom/svg/SVGSwitchElement.h
diff --git a/content/svg/content/src/SVGSymbolElement.cpp b/dom/svg/SVGSymbolElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGSymbolElement.cpp
rename to dom/svg/SVGSymbolElement.cpp
diff --git a/content/svg/content/src/SVGSymbolElement.h b/dom/svg/SVGSymbolElement.h
similarity index 100%
rename from content/svg/content/src/SVGSymbolElement.h
rename to dom/svg/SVGSymbolElement.h
diff --git a/content/svg/content/src/SVGTSpanElement.cpp b/dom/svg/SVGTSpanElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTSpanElement.cpp
rename to dom/svg/SVGTSpanElement.cpp
diff --git a/content/svg/content/src/SVGTSpanElement.h b/dom/svg/SVGTSpanElement.h
similarity index 100%
rename from content/svg/content/src/SVGTSpanElement.h
rename to dom/svg/SVGTSpanElement.h
diff --git a/content/svg/content/src/SVGTagList.h b/dom/svg/SVGTagList.h
similarity index 100%
rename from content/svg/content/src/SVGTagList.h
rename to dom/svg/SVGTagList.h
diff --git a/content/svg/content/src/SVGTests.cpp b/dom/svg/SVGTests.cpp
similarity index 100%
rename from content/svg/content/src/SVGTests.cpp
rename to dom/svg/SVGTests.cpp
diff --git a/content/svg/content/src/SVGTests.h b/dom/svg/SVGTests.h
similarity index 100%
rename from content/svg/content/src/SVGTests.h
rename to dom/svg/SVGTests.h
diff --git a/content/svg/content/src/SVGTextContentElement.cpp b/dom/svg/SVGTextContentElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTextContentElement.cpp
rename to dom/svg/SVGTextContentElement.cpp
diff --git a/content/svg/content/src/SVGTextContentElement.h b/dom/svg/SVGTextContentElement.h
similarity index 100%
rename from content/svg/content/src/SVGTextContentElement.h
rename to dom/svg/SVGTextContentElement.h
diff --git a/content/svg/content/src/SVGTextElement.cpp b/dom/svg/SVGTextElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTextElement.cpp
rename to dom/svg/SVGTextElement.cpp
diff --git a/content/svg/content/src/SVGTextElement.h b/dom/svg/SVGTextElement.h
similarity index 100%
rename from content/svg/content/src/SVGTextElement.h
rename to dom/svg/SVGTextElement.h
diff --git a/content/svg/content/src/SVGTextPathElement.cpp b/dom/svg/SVGTextPathElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTextPathElement.cpp
rename to dom/svg/SVGTextPathElement.cpp
diff --git a/content/svg/content/src/SVGTextPathElement.h b/dom/svg/SVGTextPathElement.h
similarity index 100%
rename from content/svg/content/src/SVGTextPathElement.h
rename to dom/svg/SVGTextPathElement.h
diff --git a/content/svg/content/src/SVGTextPositioningElement.cpp b/dom/svg/SVGTextPositioningElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTextPositioningElement.cpp
rename to dom/svg/SVGTextPositioningElement.cpp
diff --git a/content/svg/content/src/SVGTextPositioningElement.h b/dom/svg/SVGTextPositioningElement.h
similarity index 100%
rename from content/svg/content/src/SVGTextPositioningElement.h
rename to dom/svg/SVGTextPositioningElement.h
diff --git a/content/svg/content/src/SVGTitleElement.cpp b/dom/svg/SVGTitleElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTitleElement.cpp
rename to dom/svg/SVGTitleElement.cpp
diff --git a/content/svg/content/src/SVGTitleElement.h b/dom/svg/SVGTitleElement.h
similarity index 100%
rename from content/svg/content/src/SVGTitleElement.h
rename to dom/svg/SVGTitleElement.h
diff --git a/content/svg/content/src/SVGTransform.cpp b/dom/svg/SVGTransform.cpp
similarity index 100%
rename from content/svg/content/src/SVGTransform.cpp
rename to dom/svg/SVGTransform.cpp
diff --git a/content/svg/content/src/SVGTransform.h b/dom/svg/SVGTransform.h
similarity index 100%
rename from content/svg/content/src/SVGTransform.h
rename to dom/svg/SVGTransform.h
diff --git a/content/svg/content/src/SVGTransformList.cpp b/dom/svg/SVGTransformList.cpp
similarity index 100%
rename from content/svg/content/src/SVGTransformList.cpp
rename to dom/svg/SVGTransformList.cpp
diff --git a/content/svg/content/src/SVGTransformList.h b/dom/svg/SVGTransformList.h
similarity index 100%
rename from content/svg/content/src/SVGTransformList.h
rename to dom/svg/SVGTransformList.h
diff --git a/content/svg/content/src/SVGTransformListParser.cpp b/dom/svg/SVGTransformListParser.cpp
similarity index 100%
rename from content/svg/content/src/SVGTransformListParser.cpp
rename to dom/svg/SVGTransformListParser.cpp
diff --git a/content/svg/content/src/SVGTransformListParser.h b/dom/svg/SVGTransformListParser.h
similarity index 100%
rename from content/svg/content/src/SVGTransformListParser.h
rename to dom/svg/SVGTransformListParser.h
diff --git a/content/svg/content/src/SVGTransformListSMILType.cpp b/dom/svg/SVGTransformListSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGTransformListSMILType.cpp
rename to dom/svg/SVGTransformListSMILType.cpp
diff --git a/content/svg/content/src/SVGTransformListSMILType.h b/dom/svg/SVGTransformListSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGTransformListSMILType.h
rename to dom/svg/SVGTransformListSMILType.h
diff --git a/content/svg/content/src/SVGTransformableElement.cpp b/dom/svg/SVGTransformableElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGTransformableElement.cpp
rename to dom/svg/SVGTransformableElement.cpp
diff --git a/content/svg/content/src/SVGTransformableElement.h b/dom/svg/SVGTransformableElement.h
similarity index 100%
rename from content/svg/content/src/SVGTransformableElement.h
rename to dom/svg/SVGTransformableElement.h
diff --git a/content/svg/content/src/SVGUseElement.cpp b/dom/svg/SVGUseElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGUseElement.cpp
rename to dom/svg/SVGUseElement.cpp
diff --git a/content/svg/content/src/SVGUseElement.h b/dom/svg/SVGUseElement.h
similarity index 100%
rename from content/svg/content/src/SVGUseElement.h
rename to dom/svg/SVGUseElement.h
diff --git a/content/svg/content/src/SVGViewBoxSMILType.cpp b/dom/svg/SVGViewBoxSMILType.cpp
similarity index 100%
rename from content/svg/content/src/SVGViewBoxSMILType.cpp
rename to dom/svg/SVGViewBoxSMILType.cpp
diff --git a/content/svg/content/src/SVGViewBoxSMILType.h b/dom/svg/SVGViewBoxSMILType.h
similarity index 100%
rename from content/svg/content/src/SVGViewBoxSMILType.h
rename to dom/svg/SVGViewBoxSMILType.h
diff --git a/content/svg/content/src/SVGViewElement.cpp b/dom/svg/SVGViewElement.cpp
similarity index 100%
rename from content/svg/content/src/SVGViewElement.cpp
rename to dom/svg/SVGViewElement.cpp
diff --git a/content/svg/content/src/SVGViewElement.h b/dom/svg/SVGViewElement.h
similarity index 100%
rename from content/svg/content/src/SVGViewElement.h
rename to dom/svg/SVGViewElement.h
diff --git a/content/svg/content/src/SVGZoomEvent.cpp b/dom/svg/SVGZoomEvent.cpp
similarity index 100%
rename from content/svg/content/src/SVGZoomEvent.cpp
rename to dom/svg/SVGZoomEvent.cpp
diff --git a/content/svg/content/src/SVGZoomEvent.h b/dom/svg/SVGZoomEvent.h
similarity index 100%
rename from content/svg/content/src/SVGZoomEvent.h
rename to dom/svg/SVGZoomEvent.h
diff --git a/content/svg/content/src/crashtests/307322-1.svg b/dom/svg/crashtests/307322-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/307322-1.svg
rename to dom/svg/crashtests/307322-1.svg
diff --git a/content/svg/content/src/crashtests/327705-1.svg b/dom/svg/crashtests/327705-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/327705-1.svg
rename to dom/svg/crashtests/327705-1.svg
diff --git a/content/svg/content/src/crashtests/336994-1.html b/dom/svg/crashtests/336994-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/336994-1.html
rename to dom/svg/crashtests/336994-1.html
diff --git a/content/svg/content/src/crashtests/344888-1.svg b/dom/svg/crashtests/344888-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/344888-1.svg
rename to dom/svg/crashtests/344888-1.svg
diff --git a/content/svg/content/src/crashtests/345445-1.svg b/dom/svg/crashtests/345445-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/345445-1.svg
rename to dom/svg/crashtests/345445-1.svg
diff --git a/content/svg/content/src/crashtests/360836-1.svg b/dom/svg/crashtests/360836-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/360836-1.svg
rename to dom/svg/crashtests/360836-1.svg
diff --git a/content/svg/content/src/crashtests/367357-1.xhtml b/dom/svg/crashtests/367357-1.xhtml
similarity index 100%
rename from content/svg/content/src/crashtests/367357-1.xhtml
rename to dom/svg/crashtests/367357-1.xhtml
diff --git a/content/svg/content/src/crashtests/369051-1.svg b/dom/svg/crashtests/369051-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/369051-1.svg
rename to dom/svg/crashtests/369051-1.svg
diff --git a/content/svg/content/src/crashtests/369249-1.svg b/dom/svg/crashtests/369249-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/369249-1.svg
rename to dom/svg/crashtests/369249-1.svg
diff --git a/content/svg/content/src/crashtests/369291-1.svg b/dom/svg/crashtests/369291-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/369291-1.svg
rename to dom/svg/crashtests/369291-1.svg
diff --git a/content/svg/content/src/crashtests/369291-2.svg b/dom/svg/crashtests/369291-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/369291-2.svg
rename to dom/svg/crashtests/369291-2.svg
diff --git a/content/svg/content/src/crashtests/369568-1.svg b/dom/svg/crashtests/369568-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/369568-1.svg
rename to dom/svg/crashtests/369568-1.svg
diff --git a/content/svg/content/src/crashtests/372046-1.svg b/dom/svg/crashtests/372046-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/372046-1.svg
rename to dom/svg/crashtests/372046-1.svg
diff --git a/content/svg/content/src/crashtests/372046-2.svg b/dom/svg/crashtests/372046-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/372046-2.svg
rename to dom/svg/crashtests/372046-2.svg
diff --git a/content/svg/content/src/crashtests/374882-1.svg b/dom/svg/crashtests/374882-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/374882-1.svg
rename to dom/svg/crashtests/374882-1.svg
diff --git a/content/svg/content/src/crashtests/380101-1.svg b/dom/svg/crashtests/380101-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/380101-1.svg
rename to dom/svg/crashtests/380101-1.svg
diff --git a/content/svg/content/src/crashtests/381777-1.svg b/dom/svg/crashtests/381777-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/381777-1.svg
rename to dom/svg/crashtests/381777-1.svg
diff --git a/content/svg/content/src/crashtests/383685-1.svg b/dom/svg/crashtests/383685-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/383685-1.svg
rename to dom/svg/crashtests/383685-1.svg
diff --git a/content/svg/content/src/crashtests/385096.html b/dom/svg/crashtests/385096.html
similarity index 100%
rename from content/svg/content/src/crashtests/385096.html
rename to dom/svg/crashtests/385096.html
diff --git a/content/svg/content/src/crashtests/385554-1.html b/dom/svg/crashtests/385554-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/385554-1.html
rename to dom/svg/crashtests/385554-1.html
diff --git a/content/svg/content/src/crashtests/385554-2.xul b/dom/svg/crashtests/385554-2.xul
similarity index 100%
rename from content/svg/content/src/crashtests/385554-2.xul
rename to dom/svg/crashtests/385554-2.xul
diff --git a/content/svg/content/src/crashtests/388712-1.svg b/dom/svg/crashtests/388712-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/388712-1.svg
rename to dom/svg/crashtests/388712-1.svg
diff --git a/content/svg/content/src/crashtests/395616-1.html b/dom/svg/crashtests/395616-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/395616-1.html
rename to dom/svg/crashtests/395616-1.html
diff --git a/content/svg/content/src/crashtests/396618-1.html b/dom/svg/crashtests/396618-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/396618-1.html
rename to dom/svg/crashtests/396618-1.html
diff --git a/content/svg/content/src/crashtests/397017-1.html b/dom/svg/crashtests/397017-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/397017-1.html
rename to dom/svg/crashtests/397017-1.html
diff --git a/content/svg/content/src/crashtests/397551-1.svg b/dom/svg/crashtests/397551-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/397551-1.svg
rename to dom/svg/crashtests/397551-1.svg
diff --git a/content/svg/content/src/crashtests/397704-1.svg b/dom/svg/crashtests/397704-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/397704-1.svg
rename to dom/svg/crashtests/397704-1.svg
diff --git a/content/svg/content/src/crashtests/398926-both-different.svg b/dom/svg/crashtests/398926-both-different.svg
similarity index 100%
rename from content/svg/content/src/crashtests/398926-both-different.svg
rename to dom/svg/crashtests/398926-both-different.svg
diff --git a/content/svg/content/src/crashtests/398926-both-same.svg b/dom/svg/crashtests/398926-both-same.svg
similarity index 100%
rename from content/svg/content/src/crashtests/398926-both-same.svg
rename to dom/svg/crashtests/398926-both-same.svg
diff --git a/content/svg/content/src/crashtests/398926-fill.svg b/dom/svg/crashtests/398926-fill.svg
similarity index 100%
rename from content/svg/content/src/crashtests/398926-fill.svg
rename to dom/svg/crashtests/398926-fill.svg
diff --git a/content/svg/content/src/crashtests/398926-stroke.svg b/dom/svg/crashtests/398926-stroke.svg
similarity index 100%
rename from content/svg/content/src/crashtests/398926-stroke.svg
rename to dom/svg/crashtests/398926-stroke.svg
diff --git a/content/svg/content/src/crashtests/405639-1.svg b/dom/svg/crashtests/405639-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/405639-1.svg
rename to dom/svg/crashtests/405639-1.svg
diff --git a/content/svg/content/src/crashtests/406361-1.html b/dom/svg/crashtests/406361-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/406361-1.html
rename to dom/svg/crashtests/406361-1.html
diff --git a/content/svg/content/src/crashtests/409811-1.html b/dom/svg/crashtests/409811-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/409811-1.html
rename to dom/svg/crashtests/409811-1.html
diff --git a/content/svg/content/src/crashtests/410659-1.svg b/dom/svg/crashtests/410659-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/410659-1.svg
rename to dom/svg/crashtests/410659-1.svg
diff --git a/content/svg/content/src/crashtests/410659-2.svg b/dom/svg/crashtests/410659-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/410659-2.svg
rename to dom/svg/crashtests/410659-2.svg
diff --git a/content/svg/content/src/crashtests/410659-3.svg b/dom/svg/crashtests/410659-3.svg
similarity index 100%
rename from content/svg/content/src/crashtests/410659-3.svg
rename to dom/svg/crashtests/410659-3.svg
diff --git a/content/svg/content/src/crashtests/412104-1.svg b/dom/svg/crashtests/412104-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/412104-1.svg
rename to dom/svg/crashtests/412104-1.svg
diff --git a/content/svg/content/src/crashtests/413174-1.svg b/dom/svg/crashtests/413174-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/413174-1.svg
rename to dom/svg/crashtests/413174-1.svg
diff --git a/content/svg/content/src/crashtests/414188-1.svg b/dom/svg/crashtests/414188-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/414188-1.svg
rename to dom/svg/crashtests/414188-1.svg
diff --git a/content/svg/content/src/crashtests/427325-1.svg b/dom/svg/crashtests/427325-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/427325-1.svg
rename to dom/svg/crashtests/427325-1.svg
diff --git a/content/svg/content/src/crashtests/428228-1.svg b/dom/svg/crashtests/428228-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/428228-1.svg
rename to dom/svg/crashtests/428228-1.svg
diff --git a/content/svg/content/src/crashtests/428841-1.svg b/dom/svg/crashtests/428841-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/428841-1.svg
rename to dom/svg/crashtests/428841-1.svg
diff --git a/content/svg/content/src/crashtests/435209-1.svg b/dom/svg/crashtests/435209-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/435209-1.svg
rename to dom/svg/crashtests/435209-1.svg
diff --git a/content/svg/content/src/crashtests/436418-mpathRoot-1.svg b/dom/svg/crashtests/436418-mpathRoot-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/436418-mpathRoot-1.svg
rename to dom/svg/crashtests/436418-mpathRoot-1.svg
diff --git a/content/svg/content/src/crashtests/448244-1.svg b/dom/svg/crashtests/448244-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/448244-1.svg
rename to dom/svg/crashtests/448244-1.svg
diff --git a/content/svg/content/src/crashtests/466576-1.xhtml b/dom/svg/crashtests/466576-1.xhtml
similarity index 100%
rename from content/svg/content/src/crashtests/466576-1.xhtml
rename to dom/svg/crashtests/466576-1.xhtml
diff --git a/content/svg/content/src/crashtests/499879-1.svg b/dom/svg/crashtests/499879-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/499879-1.svg
rename to dom/svg/crashtests/499879-1.svg
diff --git a/content/svg/content/src/crashtests/535691-1.svg b/dom/svg/crashtests/535691-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/535691-1.svg
rename to dom/svg/crashtests/535691-1.svg
diff --git a/content/svg/content/src/crashtests/539167-1.svg b/dom/svg/crashtests/539167-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/539167-1.svg
rename to dom/svg/crashtests/539167-1.svg
diff --git a/content/svg/content/src/crashtests/573316-1.svg b/dom/svg/crashtests/573316-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/573316-1.svg
rename to dom/svg/crashtests/573316-1.svg
diff --git a/content/svg/content/src/crashtests/579356-1.svg b/dom/svg/crashtests/579356-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/579356-1.svg
rename to dom/svg/crashtests/579356-1.svg
diff --git a/content/svg/content/src/crashtests/579356-2.svg b/dom/svg/crashtests/579356-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/579356-2.svg
rename to dom/svg/crashtests/579356-2.svg
diff --git a/content/svg/content/src/crashtests/595608-1.svg b/dom/svg/crashtests/595608-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/595608-1.svg
rename to dom/svg/crashtests/595608-1.svg
diff --git a/content/svg/content/src/crashtests/601251-1.html b/dom/svg/crashtests/601251-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/601251-1.html
rename to dom/svg/crashtests/601251-1.html
diff --git a/content/svg/content/src/crashtests/601406-1.svg b/dom/svg/crashtests/601406-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/601406-1.svg
rename to dom/svg/crashtests/601406-1.svg
diff --git a/content/svg/content/src/crashtests/603145-1.svg b/dom/svg/crashtests/603145-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/603145-1.svg
rename to dom/svg/crashtests/603145-1.svg
diff --git a/content/svg/content/src/crashtests/613899-1.svg b/dom/svg/crashtests/613899-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/613899-1.svg
rename to dom/svg/crashtests/613899-1.svg
diff --git a/content/svg/content/src/crashtests/613899-2.svg b/dom/svg/crashtests/613899-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/613899-2.svg
rename to dom/svg/crashtests/613899-2.svg
diff --git a/content/svg/content/src/crashtests/719779-1.svg b/dom/svg/crashtests/719779-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/719779-1.svg
rename to dom/svg/crashtests/719779-1.svg
diff --git a/content/svg/content/src/crashtests/723441-1.html b/dom/svg/crashtests/723441-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/723441-1.html
rename to dom/svg/crashtests/723441-1.html
diff --git a/content/svg/content/src/crashtests/723441-resource.svg b/dom/svg/crashtests/723441-resource.svg
similarity index 100%
rename from content/svg/content/src/crashtests/723441-resource.svg
rename to dom/svg/crashtests/723441-resource.svg
diff --git a/content/svg/content/src/crashtests/751515-1.svg b/dom/svg/crashtests/751515-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/751515-1.svg
rename to dom/svg/crashtests/751515-1.svg
diff --git a/content/svg/content/src/crashtests/761507-1.svg b/dom/svg/crashtests/761507-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/761507-1.svg
rename to dom/svg/crashtests/761507-1.svg
diff --git a/content/svg/content/src/crashtests/831561.html b/dom/svg/crashtests/831561.html
similarity index 100%
rename from content/svg/content/src/crashtests/831561.html
rename to dom/svg/crashtests/831561.html
diff --git a/content/svg/content/src/crashtests/837450-1.svg b/dom/svg/crashtests/837450-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/837450-1.svg
rename to dom/svg/crashtests/837450-1.svg
diff --git a/content/svg/content/src/crashtests/842463-1.html b/dom/svg/crashtests/842463-1.html
similarity index 100%
rename from content/svg/content/src/crashtests/842463-1.html
rename to dom/svg/crashtests/842463-1.html
diff --git a/content/svg/content/src/crashtests/847138-1.svg b/dom/svg/crashtests/847138-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/847138-1.svg
rename to dom/svg/crashtests/847138-1.svg
diff --git a/content/svg/content/src/crashtests/864509.svg b/dom/svg/crashtests/864509.svg
similarity index 100%
rename from content/svg/content/src/crashtests/864509.svg
rename to dom/svg/crashtests/864509.svg
diff --git a/content/svg/content/src/crashtests/880544-1.svg b/dom/svg/crashtests/880544-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/880544-1.svg
rename to dom/svg/crashtests/880544-1.svg
diff --git a/content/svg/content/src/crashtests/880544-2.svg b/dom/svg/crashtests/880544-2.svg
similarity index 100%
rename from content/svg/content/src/crashtests/880544-2.svg
rename to dom/svg/crashtests/880544-2.svg
diff --git a/content/svg/content/src/crashtests/880544-3.svg b/dom/svg/crashtests/880544-3.svg
similarity index 100%
rename from content/svg/content/src/crashtests/880544-3.svg
rename to dom/svg/crashtests/880544-3.svg
diff --git a/content/svg/content/src/crashtests/880544-4.svg b/dom/svg/crashtests/880544-4.svg
similarity index 100%
rename from content/svg/content/src/crashtests/880544-4.svg
rename to dom/svg/crashtests/880544-4.svg
diff --git a/content/svg/content/src/crashtests/880544-5.svg b/dom/svg/crashtests/880544-5.svg
similarity index 100%
rename from content/svg/content/src/crashtests/880544-5.svg
rename to dom/svg/crashtests/880544-5.svg
diff --git a/content/svg/content/src/crashtests/898915-1.svg b/dom/svg/crashtests/898915-1.svg
similarity index 100%
rename from content/svg/content/src/crashtests/898915-1.svg
rename to dom/svg/crashtests/898915-1.svg
diff --git a/content/svg/content/src/crashtests/crashtests.list b/dom/svg/crashtests/crashtests.list
similarity index 100%
rename from content/svg/content/src/crashtests/crashtests.list
rename to dom/svg/crashtests/crashtests.list
diff --git a/content/svg/content/src/crashtests/zero-size-image.svg b/dom/svg/crashtests/zero-size-image.svg
similarity index 100%
rename from content/svg/content/src/crashtests/zero-size-image.svg
rename to dom/svg/crashtests/zero-size-image.svg
diff --git a/content/svg/content/src/moz.build b/dom/svg/moz.build
similarity index 98%
rename from content/svg/content/src/moz.build
rename to dom/svg/moz.build
index ef69053ae00..b3f6eaa419a 100644
--- a/content/svg/content/src/moz.build
+++ b/dom/svg/moz.build
@@ -4,6 +4,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+
 EXPORTS += [
     'nsSVGClass.h',
     'nsSVGElement.h',
@@ -36,6 +38,7 @@ EXPORTS.mozilla.dom += [
     'SVGComponentTransferFunctionElement.h',
     'SVGDefsElement.h',
     'SVGDescElement.h',
+    'SVGDocument.h',
     'SVGEllipseElement.h',
     'SVGFEBlendElement.h',
     'SVGFEColorMatrixElement.h',
@@ -160,6 +163,7 @@ UNIFIED_SOURCES += [
     'SVGContentUtils.cpp',
     'SVGDefsElement.cpp',
     'SVGDescElement.cpp',
+    'SVGDocument.cpp',
     'SVGElementFactory.cpp',
     'SVGEllipseElement.cpp',
     'SVGFEBlendElement.cpp',
@@ -255,8 +259,10 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
+    '/content/html/document/src',
     '/dom',
     '/dom/smil',
+    '/dom/svg',
     '/dom/xbl',
     '/dom/xml',
     '/layout/base',
@@ -265,4 +271,3 @@ LOCAL_INCLUDES += [
     '/layout/svg',
     '/layout/xul',
 ]
-
diff --git a/content/svg/content/src/nsISVGPoint.cpp b/dom/svg/nsISVGPoint.cpp
similarity index 100%
rename from content/svg/content/src/nsISVGPoint.cpp
rename to dom/svg/nsISVGPoint.cpp
diff --git a/content/svg/content/src/nsISVGPoint.h b/dom/svg/nsISVGPoint.h
similarity index 100%
rename from content/svg/content/src/nsISVGPoint.h
rename to dom/svg/nsISVGPoint.h
diff --git a/content/svg/content/src/nsSVGAngle.cpp b/dom/svg/nsSVGAngle.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGAngle.cpp
rename to dom/svg/nsSVGAngle.cpp
diff --git a/content/svg/content/src/nsSVGAngle.h b/dom/svg/nsSVGAngle.h
similarity index 100%
rename from content/svg/content/src/nsSVGAngle.h
rename to dom/svg/nsSVGAngle.h
diff --git a/content/svg/content/src/nsSVGAnimatedTransformList.cpp b/dom/svg/nsSVGAnimatedTransformList.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGAnimatedTransformList.cpp
rename to dom/svg/nsSVGAnimatedTransformList.cpp
diff --git a/content/svg/content/src/nsSVGAnimatedTransformList.h b/dom/svg/nsSVGAnimatedTransformList.h
similarity index 100%
rename from content/svg/content/src/nsSVGAnimatedTransformList.h
rename to dom/svg/nsSVGAnimatedTransformList.h
diff --git a/content/svg/content/src/nsSVGAttrTearoffTable.h b/dom/svg/nsSVGAttrTearoffTable.h
similarity index 100%
rename from content/svg/content/src/nsSVGAttrTearoffTable.h
rename to dom/svg/nsSVGAttrTearoffTable.h
diff --git a/content/svg/content/src/nsSVGBoolean.cpp b/dom/svg/nsSVGBoolean.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGBoolean.cpp
rename to dom/svg/nsSVGBoolean.cpp
diff --git a/content/svg/content/src/nsSVGBoolean.h b/dom/svg/nsSVGBoolean.h
similarity index 100%
rename from content/svg/content/src/nsSVGBoolean.h
rename to dom/svg/nsSVGBoolean.h
diff --git a/content/svg/content/src/nsSVGClass.cpp b/dom/svg/nsSVGClass.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGClass.cpp
rename to dom/svg/nsSVGClass.cpp
diff --git a/content/svg/content/src/nsSVGClass.h b/dom/svg/nsSVGClass.h
similarity index 100%
rename from content/svg/content/src/nsSVGClass.h
rename to dom/svg/nsSVGClass.h
diff --git a/content/svg/content/src/nsSVGDataParser.cpp b/dom/svg/nsSVGDataParser.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGDataParser.cpp
rename to dom/svg/nsSVGDataParser.cpp
diff --git a/content/svg/content/src/nsSVGDataParser.h b/dom/svg/nsSVGDataParser.h
similarity index 100%
rename from content/svg/content/src/nsSVGDataParser.h
rename to dom/svg/nsSVGDataParser.h
diff --git a/content/svg/content/src/nsSVGElement.cpp b/dom/svg/nsSVGElement.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGElement.cpp
rename to dom/svg/nsSVGElement.cpp
diff --git a/content/svg/content/src/nsSVGElement.h b/dom/svg/nsSVGElement.h
similarity index 100%
rename from content/svg/content/src/nsSVGElement.h
rename to dom/svg/nsSVGElement.h
diff --git a/content/svg/content/src/nsSVGEnum.cpp b/dom/svg/nsSVGEnum.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGEnum.cpp
rename to dom/svg/nsSVGEnum.cpp
diff --git a/content/svg/content/src/nsSVGEnum.h b/dom/svg/nsSVGEnum.h
similarity index 100%
rename from content/svg/content/src/nsSVGEnum.h
rename to dom/svg/nsSVGEnum.h
diff --git a/content/svg/content/src/nsSVGFeatures.cpp b/dom/svg/nsSVGFeatures.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGFeatures.cpp
rename to dom/svg/nsSVGFeatures.cpp
diff --git a/content/svg/content/src/nsSVGFeatures.h b/dom/svg/nsSVGFeatures.h
similarity index 100%
rename from content/svg/content/src/nsSVGFeatures.h
rename to dom/svg/nsSVGFeatures.h
diff --git a/content/svg/content/src/nsSVGFeaturesList.h b/dom/svg/nsSVGFeaturesList.h
similarity index 100%
rename from content/svg/content/src/nsSVGFeaturesList.h
rename to dom/svg/nsSVGFeaturesList.h
diff --git a/content/svg/content/src/nsSVGFilters.cpp b/dom/svg/nsSVGFilters.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGFilters.cpp
rename to dom/svg/nsSVGFilters.cpp
diff --git a/content/svg/content/src/nsSVGFilters.h b/dom/svg/nsSVGFilters.h
similarity index 100%
rename from content/svg/content/src/nsSVGFilters.h
rename to dom/svg/nsSVGFilters.h
diff --git a/content/svg/content/src/nsSVGInteger.cpp b/dom/svg/nsSVGInteger.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGInteger.cpp
rename to dom/svg/nsSVGInteger.cpp
diff --git a/content/svg/content/src/nsSVGInteger.h b/dom/svg/nsSVGInteger.h
similarity index 100%
rename from content/svg/content/src/nsSVGInteger.h
rename to dom/svg/nsSVGInteger.h
diff --git a/content/svg/content/src/nsSVGIntegerPair.cpp b/dom/svg/nsSVGIntegerPair.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGIntegerPair.cpp
rename to dom/svg/nsSVGIntegerPair.cpp
diff --git a/content/svg/content/src/nsSVGIntegerPair.h b/dom/svg/nsSVGIntegerPair.h
similarity index 100%
rename from content/svg/content/src/nsSVGIntegerPair.h
rename to dom/svg/nsSVGIntegerPair.h
diff --git a/content/svg/content/src/nsSVGLength2.cpp b/dom/svg/nsSVGLength2.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGLength2.cpp
rename to dom/svg/nsSVGLength2.cpp
diff --git a/content/svg/content/src/nsSVGLength2.h b/dom/svg/nsSVGLength2.h
similarity index 100%
rename from content/svg/content/src/nsSVGLength2.h
rename to dom/svg/nsSVGLength2.h
diff --git a/content/svg/content/src/nsSVGNumber2.cpp b/dom/svg/nsSVGNumber2.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGNumber2.cpp
rename to dom/svg/nsSVGNumber2.cpp
diff --git a/content/svg/content/src/nsSVGNumber2.h b/dom/svg/nsSVGNumber2.h
similarity index 100%
rename from content/svg/content/src/nsSVGNumber2.h
rename to dom/svg/nsSVGNumber2.h
diff --git a/content/svg/content/src/nsSVGNumberPair.cpp b/dom/svg/nsSVGNumberPair.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGNumberPair.cpp
rename to dom/svg/nsSVGNumberPair.cpp
diff --git a/content/svg/content/src/nsSVGNumberPair.h b/dom/svg/nsSVGNumberPair.h
similarity index 100%
rename from content/svg/content/src/nsSVGNumberPair.h
rename to dom/svg/nsSVGNumberPair.h
diff --git a/content/svg/content/src/nsSVGPathDataParser.cpp b/dom/svg/nsSVGPathDataParser.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGPathDataParser.cpp
rename to dom/svg/nsSVGPathDataParser.cpp
diff --git a/content/svg/content/src/nsSVGPathDataParser.h b/dom/svg/nsSVGPathDataParser.h
similarity index 100%
rename from content/svg/content/src/nsSVGPathDataParser.h
rename to dom/svg/nsSVGPathDataParser.h
diff --git a/content/svg/content/src/nsSVGPathGeometryElement.cpp b/dom/svg/nsSVGPathGeometryElement.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGPathGeometryElement.cpp
rename to dom/svg/nsSVGPathGeometryElement.cpp
diff --git a/content/svg/content/src/nsSVGPathGeometryElement.h b/dom/svg/nsSVGPathGeometryElement.h
similarity index 100%
rename from content/svg/content/src/nsSVGPathGeometryElement.h
rename to dom/svg/nsSVGPathGeometryElement.h
diff --git a/content/svg/content/src/nsSVGPolyElement.cpp b/dom/svg/nsSVGPolyElement.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGPolyElement.cpp
rename to dom/svg/nsSVGPolyElement.cpp
diff --git a/content/svg/content/src/nsSVGPolyElement.h b/dom/svg/nsSVGPolyElement.h
similarity index 100%
rename from content/svg/content/src/nsSVGPolyElement.h
rename to dom/svg/nsSVGPolyElement.h
diff --git a/content/svg/content/src/nsSVGString.cpp b/dom/svg/nsSVGString.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGString.cpp
rename to dom/svg/nsSVGString.cpp
diff --git a/content/svg/content/src/nsSVGString.h b/dom/svg/nsSVGString.h
similarity index 100%
rename from content/svg/content/src/nsSVGString.h
rename to dom/svg/nsSVGString.h
diff --git a/content/svg/content/src/nsSVGTransform.cpp b/dom/svg/nsSVGTransform.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGTransform.cpp
rename to dom/svg/nsSVGTransform.cpp
diff --git a/content/svg/content/src/nsSVGTransform.h b/dom/svg/nsSVGTransform.h
similarity index 100%
rename from content/svg/content/src/nsSVGTransform.h
rename to dom/svg/nsSVGTransform.h
diff --git a/content/svg/content/src/nsSVGViewBox.cpp b/dom/svg/nsSVGViewBox.cpp
similarity index 100%
rename from content/svg/content/src/nsSVGViewBox.cpp
rename to dom/svg/nsSVGViewBox.cpp
diff --git a/content/svg/content/src/nsSVGViewBox.h b/dom/svg/nsSVGViewBox.h
similarity index 100%
rename from content/svg/content/src/nsSVGViewBox.h
rename to dom/svg/nsSVGViewBox.h
diff --git a/content/svg/content/test/MutationEventChecker.js b/dom/svg/test/MutationEventChecker.js
similarity index 100%
rename from content/svg/content/test/MutationEventChecker.js
rename to dom/svg/test/MutationEventChecker.js
diff --git a/content/svg/content/test/a_href_destination.svg b/dom/svg/test/a_href_destination.svg
similarity index 100%
rename from content/svg/content/test/a_href_destination.svg
rename to dom/svg/test/a_href_destination.svg
diff --git a/content/svg/content/test/a_href_helper_01.svg b/dom/svg/test/a_href_helper_01.svg
similarity index 100%
rename from content/svg/content/test/a_href_helper_01.svg
rename to dom/svg/test/a_href_helper_01.svg
diff --git a/content/svg/content/test/a_href_helper_02_03.svg b/dom/svg/test/a_href_helper_02_03.svg
similarity index 100%
rename from content/svg/content/test/a_href_helper_02_03.svg
rename to dom/svg/test/a_href_helper_02_03.svg
diff --git a/content/svg/content/test/a_href_helper_04.svg b/dom/svg/test/a_href_helper_04.svg
similarity index 100%
rename from content/svg/content/test/a_href_helper_04.svg
rename to dom/svg/test/a_href_helper_04.svg
diff --git a/content/svg/content/test/animated-svg-image-helper.html b/dom/svg/test/animated-svg-image-helper.html
similarity index 100%
rename from content/svg/content/test/animated-svg-image-helper.html
rename to dom/svg/test/animated-svg-image-helper.html
diff --git a/content/svg/content/test/animated-svg-image-helper.svg b/dom/svg/test/animated-svg-image-helper.svg
similarity index 100%
rename from content/svg/content/test/animated-svg-image-helper.svg
rename to dom/svg/test/animated-svg-image-helper.svg
diff --git a/content/svg/content/test/bbox-helper.svg b/dom/svg/test/bbox-helper.svg
similarity index 100%
rename from content/svg/content/test/bbox-helper.svg
rename to dom/svg/test/bbox-helper.svg
diff --git a/content/svg/content/test/bounds-helper.svg b/dom/svg/test/bounds-helper.svg
similarity index 100%
rename from content/svg/content/test/bounds-helper.svg
rename to dom/svg/test/bounds-helper.svg
diff --git a/content/svg/content/test/dataTypes-helper.svg b/dom/svg/test/dataTypes-helper.svg
similarity index 100%
rename from content/svg/content/test/dataTypes-helper.svg
rename to dom/svg/test/dataTypes-helper.svg
diff --git a/content/svg/content/test/fragments-helper.svg b/dom/svg/test/fragments-helper.svg
similarity index 100%
rename from content/svg/content/test/fragments-helper.svg
rename to dom/svg/test/fragments-helper.svg
diff --git a/content/svg/content/test/getBBox-method-helper.svg b/dom/svg/test/getBBox-method-helper.svg
similarity index 100%
rename from content/svg/content/test/getBBox-method-helper.svg
rename to dom/svg/test/getBBox-method-helper.svg
diff --git a/content/svg/content/test/getCTM-helper.svg b/dom/svg/test/getCTM-helper.svg
similarity index 100%
rename from content/svg/content/test/getCTM-helper.svg
rename to dom/svg/test/getCTM-helper.svg
diff --git a/content/svg/content/test/getSubStringLength-helper.svg b/dom/svg/test/getSubStringLength-helper.svg
similarity index 100%
rename from content/svg/content/test/getSubStringLength-helper.svg
rename to dom/svg/test/getSubStringLength-helper.svg
diff --git a/content/svg/content/test/matrixUtils.js b/dom/svg/test/matrixUtils.js
similarity index 100%
rename from content/svg/content/test/matrixUtils.js
rename to dom/svg/test/matrixUtils.js
diff --git a/content/svg/content/test/mochitest.ini b/dom/svg/test/mochitest.ini
similarity index 100%
rename from content/svg/content/test/mochitest.ini
rename to dom/svg/test/mochitest.ini
diff --git a/content/svg/content/test/object-delayed-intrinsic-size.sjs b/dom/svg/test/object-delayed-intrinsic-size.sjs
similarity index 100%
rename from content/svg/content/test/object-delayed-intrinsic-size.sjs
rename to dom/svg/test/object-delayed-intrinsic-size.sjs
diff --git a/content/svg/content/test/pointer-events.js b/dom/svg/test/pointer-events.js
similarity index 100%
rename from content/svg/content/test/pointer-events.js
rename to dom/svg/test/pointer-events.js
diff --git a/content/svg/content/test/scientific-helper.svg b/dom/svg/test/scientific-helper.svg
similarity index 100%
rename from content/svg/content/test/scientific-helper.svg
rename to dom/svg/test/scientific-helper.svg
diff --git a/content/svg/content/test/selectSubString-helper.svg b/dom/svg/test/selectSubString-helper.svg
similarity index 100%
rename from content/svg/content/test/selectSubString-helper.svg
rename to dom/svg/test/selectSubString-helper.svg
diff --git a/content/svg/content/test/switch-helper.svg b/dom/svg/test/switch-helper.svg
similarity index 100%
rename from content/svg/content/test/switch-helper.svg
rename to dom/svg/test/switch-helper.svg
diff --git a/content/svg/content/test/test_SVGLengthList-2.xhtml b/dom/svg/test/test_SVGLengthList-2.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGLengthList-2.xhtml
rename to dom/svg/test/test_SVGLengthList-2.xhtml
diff --git a/content/svg/content/test/test_SVGLengthList.xhtml b/dom/svg/test/test_SVGLengthList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGLengthList.xhtml
rename to dom/svg/test/test_SVGLengthList.xhtml
diff --git a/content/svg/content/test/test_SVGMatrix.xhtml b/dom/svg/test/test_SVGMatrix.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGMatrix.xhtml
rename to dom/svg/test/test_SVGMatrix.xhtml
diff --git a/content/svg/content/test/test_SVGNumberList.xhtml b/dom/svg/test/test_SVGNumberList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGNumberList.xhtml
rename to dom/svg/test/test_SVGNumberList.xhtml
diff --git a/content/svg/content/test/test_SVGPathSegList.xhtml b/dom/svg/test/test_SVGPathSegList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGPathSegList.xhtml
rename to dom/svg/test/test_SVGPathSegList.xhtml
diff --git a/content/svg/content/test/test_SVGPointList.xhtml b/dom/svg/test/test_SVGPointList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGPointList.xhtml
rename to dom/svg/test/test_SVGPointList.xhtml
diff --git a/content/svg/content/test/test_SVGStringList.xhtml b/dom/svg/test/test_SVGStringList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGStringList.xhtml
rename to dom/svg/test/test_SVGStringList.xhtml
diff --git a/content/svg/content/test/test_SVGStyleElement.xhtml b/dom/svg/test/test_SVGStyleElement.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGStyleElement.xhtml
rename to dom/svg/test/test_SVGStyleElement.xhtml
diff --git a/content/svg/content/test/test_SVGTransformList.xhtml b/dom/svg/test/test_SVGTransformList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGTransformList.xhtml
rename to dom/svg/test/test_SVGTransformList.xhtml
diff --git a/content/svg/content/test/test_SVGTransformListAddition.xhtml b/dom/svg/test/test_SVGTransformListAddition.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGTransformListAddition.xhtml
rename to dom/svg/test/test_SVGTransformListAddition.xhtml
diff --git a/content/svg/content/test/test_SVGUnitTypes.html b/dom/svg/test/test_SVGUnitTypes.html
similarity index 100%
rename from content/svg/content/test/test_SVGUnitTypes.html
rename to dom/svg/test/test_SVGUnitTypes.html
diff --git a/content/svg/content/test/test_SVG_namespace_ids.html b/dom/svg/test/test_SVG_namespace_ids.html
similarity index 100%
rename from content/svg/content/test/test_SVG_namespace_ids.html
rename to dom/svg/test/test_SVG_namespace_ids.html
diff --git a/content/svg/content/test/test_SVGxxxList.xhtml b/dom/svg/test/test_SVGxxxList.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGxxxList.xhtml
rename to dom/svg/test/test_SVGxxxList.xhtml
diff --git a/content/svg/content/test/test_SVGxxxListIndexing.xhtml b/dom/svg/test/test_SVGxxxListIndexing.xhtml
similarity index 100%
rename from content/svg/content/test/test_SVGxxxListIndexing.xhtml
rename to dom/svg/test/test_SVGxxxListIndexing.xhtml
diff --git a/content/svg/content/test/test_a_href_01.xhtml b/dom/svg/test/test_a_href_01.xhtml
similarity index 100%
rename from content/svg/content/test/test_a_href_01.xhtml
rename to dom/svg/test/test_a_href_01.xhtml
diff --git a/content/svg/content/test/test_a_href_02.xhtml b/dom/svg/test/test_a_href_02.xhtml
similarity index 100%
rename from content/svg/content/test/test_a_href_02.xhtml
rename to dom/svg/test/test_a_href_02.xhtml
diff --git a/content/svg/content/test/test_animLengthObjectIdentity.xhtml b/dom/svg/test/test_animLengthObjectIdentity.xhtml
similarity index 100%
rename from content/svg/content/test/test_animLengthObjectIdentity.xhtml
rename to dom/svg/test/test_animLengthObjectIdentity.xhtml
diff --git a/content/svg/content/test/test_animLengthReadonly.xhtml b/dom/svg/test/test_animLengthReadonly.xhtml
similarity index 100%
rename from content/svg/content/test/test_animLengthReadonly.xhtml
rename to dom/svg/test/test_animLengthReadonly.xhtml
diff --git a/content/svg/content/test/test_animLengthUnits.xhtml b/dom/svg/test/test_animLengthUnits.xhtml
similarity index 100%
rename from content/svg/content/test/test_animLengthUnits.xhtml
rename to dom/svg/test/test_animLengthUnits.xhtml
diff --git a/content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml b/dom/svg/test/test_bbox-with-invalid-viewBox.xhtml
similarity index 100%
rename from content/svg/content/test/test_bbox-with-invalid-viewBox.xhtml
rename to dom/svg/test/test_bbox-with-invalid-viewBox.xhtml
diff --git a/content/svg/content/test/test_bbox.xhtml b/dom/svg/test/test_bbox.xhtml
similarity index 100%
rename from content/svg/content/test/test_bbox.xhtml
rename to dom/svg/test/test_bbox.xhtml
diff --git a/content/svg/content/test/test_bounds.html b/dom/svg/test/test_bounds.html
similarity index 100%
rename from content/svg/content/test/test_bounds.html
rename to dom/svg/test/test_bounds.html
diff --git a/content/svg/content/test/test_bug872812.html b/dom/svg/test/test_bug872812.html
similarity index 100%
rename from content/svg/content/test/test_bug872812.html
rename to dom/svg/test/test_bug872812.html
diff --git a/content/svg/content/test/test_dataTypes.html b/dom/svg/test/test_dataTypes.html
similarity index 100%
rename from content/svg/content/test/test_dataTypes.html
rename to dom/svg/test/test_dataTypes.html
diff --git a/content/svg/content/test/test_dataTypesModEvents.html b/dom/svg/test/test_dataTypesModEvents.html
similarity index 100%
rename from content/svg/content/test/test_dataTypesModEvents.html
rename to dom/svg/test/test_dataTypesModEvents.html
diff --git a/content/svg/content/test/test_fragments.html b/dom/svg/test/test_fragments.html
similarity index 100%
rename from content/svg/content/test/test_fragments.html
rename to dom/svg/test/test_fragments.html
diff --git a/content/svg/content/test/test_getBBox-method.html b/dom/svg/test/test_getBBox-method.html
similarity index 100%
rename from content/svg/content/test/test_getBBox-method.html
rename to dom/svg/test/test_getBBox-method.html
diff --git a/content/svg/content/test/test_getCTM.html b/dom/svg/test/test_getCTM.html
similarity index 100%
rename from content/svg/content/test/test_getCTM.html
rename to dom/svg/test/test_getCTM.html
diff --git a/content/svg/content/test/test_getElementById.xhtml b/dom/svg/test/test_getElementById.xhtml
similarity index 100%
rename from content/svg/content/test/test_getElementById.xhtml
rename to dom/svg/test/test_getElementById.xhtml
diff --git a/content/svg/content/test/test_getSubStringLength.xhtml b/dom/svg/test/test_getSubStringLength.xhtml
similarity index 100%
rename from content/svg/content/test/test_getSubStringLength.xhtml
rename to dom/svg/test/test_getSubStringLength.xhtml
diff --git a/content/svg/content/test/test_hasFeature.xhtml b/dom/svg/test/test_hasFeature.xhtml
similarity index 99%
rename from content/svg/content/test/test_hasFeature.xhtml
rename to dom/svg/test/test_hasFeature.xhtml
index 03e1dba5354..aa64e999eb0 100644
--- a/content/svg/content/test/test_hasFeature.xhtml
+++ b/dom/svg/test/test_hasFeature.xhtml
@@ -64,7 +64,7 @@ var features = [
   ["XPath", "3.0", "true"],
 
   // current SVG feature string support status:
-  //   content/svg/content/src/nsSVGFeaturesList.h
+  //   dom/svg/nsSVGFeaturesList.h
   // SVG 1.1
   // Static festures
   ["http://www.w3.org/TR/SVG11/feature#CoreAttribute", "1.1", true],
diff --git a/content/svg/content/test/test_lang.xhtml b/dom/svg/test/test_lang.xhtml
similarity index 100%
rename from content/svg/content/test/test_lang.xhtml
rename to dom/svg/test/test_lang.xhtml
diff --git a/content/svg/content/test/test_length.xhtml b/dom/svg/test/test_length.xhtml
similarity index 100%
rename from content/svg/content/test/test_length.xhtml
rename to dom/svg/test/test_length.xhtml
diff --git a/content/svg/content/test/test_lengthParsing.html b/dom/svg/test/test_lengthParsing.html
similarity index 100%
rename from content/svg/content/test/test_lengthParsing.html
rename to dom/svg/test/test_lengthParsing.html
diff --git a/content/svg/content/test/test_non-scaling-stroke.html b/dom/svg/test/test_non-scaling-stroke.html
similarity index 100%
rename from content/svg/content/test/test_non-scaling-stroke.html
rename to dom/svg/test/test_non-scaling-stroke.html
diff --git a/content/svg/content/test/test_nonAnimStrings.xhtml b/dom/svg/test/test_nonAnimStrings.xhtml
similarity index 100%
rename from content/svg/content/test/test_nonAnimStrings.xhtml
rename to dom/svg/test/test_nonAnimStrings.xhtml
diff --git a/content/svg/content/test/test_object-delayed-intrinsic-size.html b/dom/svg/test/test_object-delayed-intrinsic-size.html
similarity index 100%
rename from content/svg/content/test/test_object-delayed-intrinsic-size.html
rename to dom/svg/test/test_object-delayed-intrinsic-size.html
diff --git a/content/svg/content/test/test_onerror.xhtml b/dom/svg/test/test_onerror.xhtml
similarity index 100%
rename from content/svg/content/test/test_onerror.xhtml
rename to dom/svg/test/test_onerror.xhtml
diff --git a/content/svg/content/test/test_pathAnimInterpolation.xhtml b/dom/svg/test/test_pathAnimInterpolation.xhtml
similarity index 100%
rename from content/svg/content/test/test_pathAnimInterpolation.xhtml
rename to dom/svg/test/test_pathAnimInterpolation.xhtml
diff --git a/content/svg/content/test/test_pathLength.html b/dom/svg/test/test_pathLength.html
similarity index 100%
rename from content/svg/content/test/test_pathLength.html
rename to dom/svg/test/test_pathLength.html
diff --git a/content/svg/content/test/test_pathSeg.xhtml b/dom/svg/test/test_pathSeg.xhtml
similarity index 100%
rename from content/svg/content/test/test_pathSeg.xhtml
rename to dom/svg/test/test_pathSeg.xhtml
diff --git a/content/svg/content/test/test_pointAtLength.xhtml b/dom/svg/test/test_pointAtLength.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointAtLength.xhtml
rename to dom/svg/test/test_pointAtLength.xhtml
diff --git a/content/svg/content/test/test_pointer-events-1a.xhtml b/dom/svg/test/test_pointer-events-1a.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-1a.xhtml
rename to dom/svg/test/test_pointer-events-1a.xhtml
diff --git a/content/svg/content/test/test_pointer-events-1b.xhtml b/dom/svg/test/test_pointer-events-1b.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-1b.xhtml
rename to dom/svg/test/test_pointer-events-1b.xhtml
diff --git a/content/svg/content/test/test_pointer-events-2.xhtml b/dom/svg/test/test_pointer-events-2.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-2.xhtml
rename to dom/svg/test/test_pointer-events-2.xhtml
diff --git a/content/svg/content/test/test_pointer-events-3.xhtml b/dom/svg/test/test_pointer-events-3.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-3.xhtml
rename to dom/svg/test/test_pointer-events-3.xhtml
diff --git a/content/svg/content/test/test_pointer-events-4.xhtml b/dom/svg/test/test_pointer-events-4.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-4.xhtml
rename to dom/svg/test/test_pointer-events-4.xhtml
diff --git a/content/svg/content/test/test_pointer-events-5.xhtml b/dom/svg/test/test_pointer-events-5.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-5.xhtml
rename to dom/svg/test/test_pointer-events-5.xhtml
diff --git a/content/svg/content/test/test_pointer-events-6.xhtml b/dom/svg/test/test_pointer-events-6.xhtml
similarity index 100%
rename from content/svg/content/test/test_pointer-events-6.xhtml
rename to dom/svg/test/test_pointer-events-6.xhtml
diff --git a/content/svg/content/test/test_scientific.html b/dom/svg/test/test_scientific.html
similarity index 100%
rename from content/svg/content/test/test_scientific.html
rename to dom/svg/test/test_scientific.html
diff --git a/content/svg/content/test/test_selectSubString.xhtml b/dom/svg/test/test_selectSubString.xhtml
similarity index 100%
rename from content/svg/content/test/test_selectSubString.xhtml
rename to dom/svg/test/test_selectSubString.xhtml
diff --git a/content/svg/content/test/test_stroke-linecap-hit-testing.xhtml b/dom/svg/test/test_stroke-linecap-hit-testing.xhtml
similarity index 100%
rename from content/svg/content/test/test_stroke-linecap-hit-testing.xhtml
rename to dom/svg/test/test_stroke-linecap-hit-testing.xhtml
diff --git a/content/svg/content/test/test_switch.xhtml b/dom/svg/test/test_switch.xhtml
similarity index 100%
rename from content/svg/content/test/test_switch.xhtml
rename to dom/svg/test/test_switch.xhtml
diff --git a/content/svg/content/test/test_text.html b/dom/svg/test/test_text.html
similarity index 100%
rename from content/svg/content/test/test_text.html
rename to dom/svg/test/test_text.html
diff --git a/content/svg/content/test/test_text_2.html b/dom/svg/test/test_text_2.html
similarity index 100%
rename from content/svg/content/test/test_text_2.html
rename to dom/svg/test/test_text_2.html
diff --git a/content/svg/content/test/test_text_dirty.html b/dom/svg/test/test_text_dirty.html
similarity index 100%
rename from content/svg/content/test/test_text_dirty.html
rename to dom/svg/test/test_text_dirty.html
diff --git a/content/svg/content/test/test_text_lengthAdjust.html b/dom/svg/test/test_text_lengthAdjust.html
similarity index 100%
rename from content/svg/content/test/test_text_lengthAdjust.html
rename to dom/svg/test/test_text_lengthAdjust.html
diff --git a/content/svg/content/test/test_text_scaled.html b/dom/svg/test/test_text_scaled.html
similarity index 100%
rename from content/svg/content/test/test_text_scaled.html
rename to dom/svg/test/test_text_scaled.html
diff --git a/content/svg/content/test/test_text_selection.html b/dom/svg/test/test_text_selection.html
similarity index 100%
rename from content/svg/content/test/test_text_selection.html
rename to dom/svg/test/test_text_selection.html
diff --git a/content/svg/content/test/test_text_update.html b/dom/svg/test/test_text_update.html
similarity index 100%
rename from content/svg/content/test/test_text_update.html
rename to dom/svg/test/test_text_update.html
diff --git a/content/svg/content/test/test_transform.xhtml b/dom/svg/test/test_transform.xhtml
similarity index 100%
rename from content/svg/content/test/test_transform.xhtml
rename to dom/svg/test/test_transform.xhtml
diff --git a/content/svg/content/test/test_transformParsing.html b/dom/svg/test/test_transformParsing.html
similarity index 100%
rename from content/svg/content/test/test_transformParsing.html
rename to dom/svg/test/test_transformParsing.html
diff --git a/content/svg/content/test/test_valueAsString.xhtml b/dom/svg/test/test_valueAsString.xhtml
similarity index 100%
rename from content/svg/content/test/test_valueAsString.xhtml
rename to dom/svg/test/test_valueAsString.xhtml
diff --git a/content/svg/content/test/test_valueLeaks.xhtml b/dom/svg/test/test_valueLeaks.xhtml
similarity index 100%
rename from content/svg/content/test/test_valueLeaks.xhtml
rename to dom/svg/test/test_valueLeaks.xhtml
diff --git a/content/svg/content/test/test_viewport.html b/dom/svg/test/test_viewport.html
similarity index 100%
rename from content/svg/content/test/test_viewport.html
rename to dom/svg/test/test_viewport.html
diff --git a/content/svg/content/test/test_zoom.xhtml b/dom/svg/test/test_zoom.xhtml
similarity index 100%
rename from content/svg/content/test/test_zoom.xhtml
rename to dom/svg/test/test_zoom.xhtml
diff --git a/content/svg/content/test/text-helper-scaled.svg b/dom/svg/test/text-helper-scaled.svg
similarity index 100%
rename from content/svg/content/test/text-helper-scaled.svg
rename to dom/svg/test/text-helper-scaled.svg
diff --git a/content/svg/content/test/text-helper-selection.svg b/dom/svg/test/text-helper-selection.svg
similarity index 100%
rename from content/svg/content/test/text-helper-selection.svg
rename to dom/svg/test/text-helper-selection.svg
diff --git a/content/svg/content/test/text-helper.svg b/dom/svg/test/text-helper.svg
similarity index 100%
rename from content/svg/content/test/text-helper.svg
rename to dom/svg/test/text-helper.svg
diff --git a/content/svg/content/test/viewport-helper.svg b/dom/svg/test/viewport-helper.svg
similarity index 100%
rename from content/svg/content/test/viewport-helper.svg
rename to dom/svg/test/viewport-helper.svg
diff --git a/content/svg/content/test/zoom-helper.svg b/dom/svg/test/zoom-helper.svg
similarity index 100%
rename from content/svg/content/test/zoom-helper.svg
rename to dom/svg/test/zoom-helper.svg
diff --git a/embedding/browser/moz.build b/embedding/browser/moz.build
index 4dc2b7d2afe..077395037df 100644
--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -51,5 +51,5 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/svg/content/src',
+    '/dom/svg',
 ]
diff --git a/image/src/moz.build b/image/src/moz.build
index 1ea581711a7..5bf4c08349a 100644
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -56,7 +56,7 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
     '/content/base/src',
-    '/content/svg/content/src',
+    '/dom/svg',
     # We need to instantiate the decoders
     '/image/decoders',
     # Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index cd609f2647e..cb8dd16fd97 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -66,8 +66,8 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
-    '/content/svg/content/src',
     '/dom/base',
+    '/dom/svg',
     '/dom/workers',
     '/js/ipc',
     '/layout/base',
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 6690fcadd69..176b6f0686b 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -117,7 +117,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
-    '../../content/svg/content/src',
     '../forms',
     '../generic',
     '../mathml',
@@ -129,6 +128,7 @@ LOCAL_INCLUDES += [
     '../xul/tree/',
     '/docshell/base',
     '/dom/base',
+    '/dom/svg',
     '/dom/xbl',
     '/view',
 ]
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 9c83178b0b9..9b6c42a7888 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -40,7 +40,6 @@ LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/html/document/src',
-    '/content/svg/content/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
@@ -54,6 +53,7 @@ LOCAL_INCLUDES += [
     '/dom/offline',
     '/dom/speakermanager',
     '/dom/storage',
+    '/dom/svg',
     '/dom/telephony',
     '/dom/xbl',
     '/dom/xslt/base',
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 11583c864a9..bfbbced81dc 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -53,12 +53,12 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/svg/content/src',
     '../../widget',
     '../base',
     '../generic',
     '../style',
     '../xul',
+    '/dom/svg',
 ]
 
 RESOURCE_FILES += [
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 06dcc89f77e..cd6e2004a3d 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -9,7 +9,6 @@ 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 ../../content/svg/content/src/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
@@ -23,6 +22,7 @@ include ../../dom/mathml/crashtests/crashtests.list
 include ../../dom/offline/crashtests/crashtests.list
 include ../../dom/plugins/test/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
+include ../../dom/svg/crashtests/crashtests.list
 include ../../dom/workers/test/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xml/crashtests/crashtests.list

From 26729a6ed442d324e84a9a46b27e3b40481b7b7a Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:24:36 +0300
Subject: [PATCH 21/37] Bug 946065 - Part 10: Move content/media/ to dom/.
 r=peterv

--HG--
rename : content/media/AbstractMediaDecoder.h => dom/media/AbstractMediaDecoder.h
rename : content/media/AudioBufferUtils.h => dom/media/AudioBufferUtils.h
rename : content/media/AudioChannelFormat.cpp => dom/media/AudioChannelFormat.cpp
rename : content/media/AudioChannelFormat.h => dom/media/AudioChannelFormat.h
rename : content/media/AudioCompactor.cpp => dom/media/AudioCompactor.cpp
rename : content/media/AudioCompactor.h => dom/media/AudioCompactor.h
rename : content/media/AudioMixer.h => dom/media/AudioMixer.h
rename : content/media/AudioSampleFormat.h => dom/media/AudioSampleFormat.h
rename : content/media/AudioSegment.cpp => dom/media/AudioSegment.cpp
rename : content/media/AudioSegment.h => dom/media/AudioSegment.h
rename : content/media/AudioSink.cpp => dom/media/AudioSink.cpp
rename : content/media/AudioSink.h => dom/media/AudioSink.h
rename : content/media/AudioStream.cpp => dom/media/AudioStream.cpp
rename : content/media/AudioStream.h => dom/media/AudioStream.h
rename : content/media/AudioStreamTrack.cpp => dom/media/AudioStreamTrack.cpp
rename : content/media/AudioStreamTrack.h => dom/media/AudioStreamTrack.h
rename : content/media/AudioTrack.cpp => dom/media/AudioTrack.cpp
rename : content/media/AudioTrack.h => dom/media/AudioTrack.h
rename : content/media/AudioTrackList.cpp => dom/media/AudioTrackList.cpp
rename : content/media/AudioTrackList.h => dom/media/AudioTrackList.h
rename : content/media/BufferMediaResource.h => dom/media/BufferMediaResource.h
rename : content/media/CubebUtils.cpp => dom/media/CubebUtils.cpp
rename : content/media/CubebUtils.h => dom/media/CubebUtils.h
rename : content/media/DOMMediaStream.cpp => dom/media/DOMMediaStream.cpp
rename : content/media/DOMMediaStream.h => dom/media/DOMMediaStream.h
rename : content/media/DecoderTraits.cpp => dom/media/DecoderTraits.cpp
rename : content/media/DecoderTraits.h => dom/media/DecoderTraits.h
rename : content/media/EncodedBufferCache.cpp => dom/media/EncodedBufferCache.cpp
rename : content/media/EncodedBufferCache.h => dom/media/EncodedBufferCache.h
rename : content/media/FileBlockCache.cpp => dom/media/FileBlockCache.cpp
rename : content/media/FileBlockCache.h => dom/media/FileBlockCache.h
rename : content/media/GraphDriver.cpp => dom/media/GraphDriver.cpp
rename : content/media/GraphDriver.h => dom/media/GraphDriver.h
rename : content/media/Latency.cpp => dom/media/Latency.cpp
rename : content/media/Latency.h => dom/media/Latency.h
rename : content/media/MP3FrameParser.cpp => dom/media/MP3FrameParser.cpp
rename : content/media/MP3FrameParser.h => dom/media/MP3FrameParser.h
rename : content/media/MediaCache.cpp => dom/media/MediaCache.cpp
rename : content/media/MediaCache.h => dom/media/MediaCache.h
rename : content/media/MediaData.cpp => dom/media/MediaData.cpp
rename : content/media/MediaData.h => dom/media/MediaData.h
rename : content/media/MediaDataDecodedListener.h => dom/media/MediaDataDecodedListener.h
rename : content/media/MediaDecoder.cpp => dom/media/MediaDecoder.cpp
rename : content/media/MediaDecoder.h => dom/media/MediaDecoder.h
rename : content/media/MediaDecoderOwner.h => dom/media/MediaDecoderOwner.h
rename : content/media/MediaDecoderReader.cpp => dom/media/MediaDecoderReader.cpp
rename : content/media/MediaDecoderReader.h => dom/media/MediaDecoderReader.h
rename : content/media/MediaDecoderStateMachine.cpp => dom/media/MediaDecoderStateMachine.cpp
rename : content/media/MediaDecoderStateMachine.h => dom/media/MediaDecoderStateMachine.h
rename : content/media/MediaDecoderStateMachineScheduler.cpp => dom/media/MediaDecoderStateMachineScheduler.cpp
rename : content/media/MediaDecoderStateMachineScheduler.h => dom/media/MediaDecoderStateMachineScheduler.h
rename : content/media/MediaInfo.h => dom/media/MediaInfo.h
rename : content/media/MediaMetadataManager.h => dom/media/MediaMetadataManager.h
rename : content/media/MediaQueue.h => dom/media/MediaQueue.h
rename : content/media/MediaRecorder.cpp => dom/media/MediaRecorder.cpp
rename : content/media/MediaRecorder.h => dom/media/MediaRecorder.h
rename : content/media/MediaResource.cpp => dom/media/MediaResource.cpp
rename : content/media/MediaResource.h => dom/media/MediaResource.h
rename : content/media/MediaSegment.h => dom/media/MediaSegment.h
rename : content/media/MediaShutdownManager.cpp => dom/media/MediaShutdownManager.cpp
rename : content/media/MediaShutdownManager.h => dom/media/MediaShutdownManager.h
rename : content/media/MediaStreamGraph.cpp => dom/media/MediaStreamGraph.cpp
rename : content/media/MediaStreamGraph.h => dom/media/MediaStreamGraph.h
rename : content/media/MediaStreamGraphImpl.h => dom/media/MediaStreamGraphImpl.h
rename : content/media/MediaStreamTrack.cpp => dom/media/MediaStreamTrack.cpp
rename : content/media/MediaStreamTrack.h => dom/media/MediaStreamTrack.h
rename : content/media/MediaTaskQueue.cpp => dom/media/MediaTaskQueue.cpp
rename : content/media/MediaTaskQueue.h => dom/media/MediaTaskQueue.h
rename : content/media/MediaTrack.cpp => dom/media/MediaTrack.cpp
rename : content/media/MediaTrack.h => dom/media/MediaTrack.h
rename : content/media/MediaTrackList.cpp => dom/media/MediaTrackList.cpp
rename : content/media/MediaTrackList.h => dom/media/MediaTrackList.h
rename : content/media/RtspMediaResource.cpp => dom/media/RtspMediaResource.cpp
rename : content/media/RtspMediaResource.h => dom/media/RtspMediaResource.h
rename : content/media/SharedBuffer.h => dom/media/SharedBuffer.h
rename : content/media/SharedThreadPool.cpp => dom/media/SharedThreadPool.cpp
rename : content/media/SharedThreadPool.h => dom/media/SharedThreadPool.h
rename : content/media/StreamBuffer.cpp => dom/media/StreamBuffer.cpp
rename : content/media/StreamBuffer.h => dom/media/StreamBuffer.h
rename : content/media/TextTrack.cpp => dom/media/TextTrack.cpp
rename : content/media/TextTrack.h => dom/media/TextTrack.h
rename : content/media/TextTrackCue.cpp => dom/media/TextTrackCue.cpp
rename : content/media/TextTrackCue.h => dom/media/TextTrackCue.h
rename : content/media/TextTrackCueList.cpp => dom/media/TextTrackCueList.cpp
rename : content/media/TextTrackCueList.h => dom/media/TextTrackCueList.h
rename : content/media/TextTrackList.cpp => dom/media/TextTrackList.cpp
rename : content/media/TextTrackList.h => dom/media/TextTrackList.h
rename : content/media/TextTrackRegion.cpp => dom/media/TextTrackRegion.cpp
rename : content/media/TextTrackRegion.h => dom/media/TextTrackRegion.h
rename : content/media/ThreadPoolCOMListener.cpp => dom/media/ThreadPoolCOMListener.cpp
rename : content/media/ThreadPoolCOMListener.h => dom/media/ThreadPoolCOMListener.h
rename : content/media/TimeVarying.h => dom/media/TimeVarying.h
rename : content/media/TrackUnionStream.cpp => dom/media/TrackUnionStream.cpp
rename : content/media/TrackUnionStream.h => dom/media/TrackUnionStream.h
rename : content/media/VideoFrameContainer.cpp => dom/media/VideoFrameContainer.cpp
rename : content/media/VideoFrameContainer.h => dom/media/VideoFrameContainer.h
rename : content/media/VideoPlaybackQuality.cpp => dom/media/VideoPlaybackQuality.cpp
rename : content/media/VideoPlaybackQuality.h => dom/media/VideoPlaybackQuality.h
rename : content/media/VideoSegment.cpp => dom/media/VideoSegment.cpp
rename : content/media/VideoSegment.h => dom/media/VideoSegment.h
rename : content/media/VideoStreamTrack.cpp => dom/media/VideoStreamTrack.cpp
rename : content/media/VideoStreamTrack.h => dom/media/VideoStreamTrack.h
rename : content/media/VideoTrack.cpp => dom/media/VideoTrack.cpp
rename : content/media/VideoTrack.h => dom/media/VideoTrack.h
rename : content/media/VideoTrackList.cpp => dom/media/VideoTrackList.cpp
rename : content/media/VideoTrackList.h => dom/media/VideoTrackList.h
rename : content/media/VideoUtils.cpp => dom/media/VideoUtils.cpp
rename : content/media/VideoUtils.h => dom/media/VideoUtils.h
rename : content/media/VorbisUtils.h => dom/media/VorbisUtils.h
rename : content/media/WebVTTListener.cpp => dom/media/WebVTTListener.cpp
rename : content/media/WebVTTListener.h => dom/media/WebVTTListener.h
rename : content/media/android/AndroidMediaDecoder.cpp => dom/media/android/AndroidMediaDecoder.cpp
rename : content/media/android/AndroidMediaDecoder.h => dom/media/android/AndroidMediaDecoder.h
rename : content/media/android/AndroidMediaPluginHost.cpp => dom/media/android/AndroidMediaPluginHost.cpp
rename : content/media/android/AndroidMediaPluginHost.h => dom/media/android/AndroidMediaPluginHost.h
rename : content/media/android/AndroidMediaReader.cpp => dom/media/android/AndroidMediaReader.cpp
rename : content/media/android/AndroidMediaReader.h => dom/media/android/AndroidMediaReader.h
rename : content/media/android/AndroidMediaResourceServer.cpp => dom/media/android/AndroidMediaResourceServer.cpp
rename : content/media/android/AndroidMediaResourceServer.h => dom/media/android/AndroidMediaResourceServer.h
rename : content/media/android/MPAPI.h => dom/media/android/MPAPI.h
rename : content/media/android/moz.build => dom/media/android/moz.build
rename : content/media/apple/AppleDecoder.cpp => dom/media/apple/AppleDecoder.cpp
rename : content/media/apple/AppleDecoder.h => dom/media/apple/AppleDecoder.h
rename : content/media/apple/AppleMP3Reader.cpp => dom/media/apple/AppleMP3Reader.cpp
rename : content/media/apple/AppleMP3Reader.h => dom/media/apple/AppleMP3Reader.h
rename : content/media/apple/moz.build => dom/media/apple/moz.build
rename : content/media/compiledtest/TestAudioBuffers.cpp => dom/media/compiledtest/TestAudioBuffers.cpp
rename : content/media/compiledtest/TestAudioMixer.cpp => dom/media/compiledtest/TestAudioMixer.cpp
rename : content/media/compiledtest/moz.build => dom/media/compiledtest/moz.build
rename : content/media/directshow/AudioSinkFilter.cpp => dom/media/directshow/AudioSinkFilter.cpp
rename : content/media/directshow/AudioSinkFilter.h => dom/media/directshow/AudioSinkFilter.h
rename : content/media/directshow/AudioSinkInputPin.cpp => dom/media/directshow/AudioSinkInputPin.cpp
rename : content/media/directshow/AudioSinkInputPin.h => dom/media/directshow/AudioSinkInputPin.h
rename : content/media/directshow/DirectShowDecoder.cpp => dom/media/directshow/DirectShowDecoder.cpp
rename : content/media/directshow/DirectShowDecoder.h => dom/media/directshow/DirectShowDecoder.h
rename : content/media/directshow/DirectShowReader.cpp => dom/media/directshow/DirectShowReader.cpp
rename : content/media/directshow/DirectShowReader.h => dom/media/directshow/DirectShowReader.h
rename : content/media/directshow/DirectShowUtils.cpp => dom/media/directshow/DirectShowUtils.cpp
rename : content/media/directshow/DirectShowUtils.h => dom/media/directshow/DirectShowUtils.h
rename : content/media/directshow/SampleSink.cpp => dom/media/directshow/SampleSink.cpp
rename : content/media/directshow/SampleSink.h => dom/media/directshow/SampleSink.h
rename : content/media/directshow/SourceFilter.cpp => dom/media/directshow/SourceFilter.cpp
rename : content/media/directshow/SourceFilter.h => dom/media/directshow/SourceFilter.h
rename : content/media/directshow/moz.build => dom/media/directshow/moz.build
rename : content/media/eme/CDMCallbackProxy.cpp => dom/media/eme/CDMCallbackProxy.cpp
rename : content/media/eme/CDMCallbackProxy.h => dom/media/eme/CDMCallbackProxy.h
rename : content/media/eme/CDMCaps.cpp => dom/media/eme/CDMCaps.cpp
rename : content/media/eme/CDMCaps.h => dom/media/eme/CDMCaps.h
rename : content/media/eme/CDMProxy.cpp => dom/media/eme/CDMProxy.cpp
rename : content/media/eme/CDMProxy.h => dom/media/eme/CDMProxy.h
rename : content/media/eme/EMELog.cpp => dom/media/eme/EMELog.cpp
rename : content/media/eme/EMELog.h => dom/media/eme/EMELog.h
rename : content/media/eme/MediaEncryptedEvent.cpp => dom/media/eme/MediaEncryptedEvent.cpp
rename : content/media/eme/MediaEncryptedEvent.h => dom/media/eme/MediaEncryptedEvent.h
rename : content/media/eme/MediaKeyError.cpp => dom/media/eme/MediaKeyError.cpp
rename : content/media/eme/MediaKeyError.h => dom/media/eme/MediaKeyError.h
rename : content/media/eme/MediaKeyMessageEvent.cpp => dom/media/eme/MediaKeyMessageEvent.cpp
rename : content/media/eme/MediaKeyMessageEvent.h => dom/media/eme/MediaKeyMessageEvent.h
rename : content/media/eme/MediaKeySession.cpp => dom/media/eme/MediaKeySession.cpp
rename : content/media/eme/MediaKeySession.h => dom/media/eme/MediaKeySession.h
rename : content/media/eme/MediaKeys.cpp => dom/media/eme/MediaKeys.cpp
rename : content/media/eme/MediaKeys.h => dom/media/eme/MediaKeys.h
rename : content/media/eme/moz.build => dom/media/eme/moz.build
rename : content/media/encoder/ContainerWriter.h => dom/media/encoder/ContainerWriter.h
rename : content/media/encoder/EncodedFrameContainer.h => dom/media/encoder/EncodedFrameContainer.h
rename : content/media/encoder/MediaEncoder.cpp => dom/media/encoder/MediaEncoder.cpp
rename : content/media/encoder/MediaEncoder.h => dom/media/encoder/MediaEncoder.h
rename : content/media/encoder/OmxTrackEncoder.cpp => dom/media/encoder/OmxTrackEncoder.cpp
rename : content/media/encoder/OmxTrackEncoder.h => dom/media/encoder/OmxTrackEncoder.h
rename : content/media/encoder/OpusTrackEncoder.cpp => dom/media/encoder/OpusTrackEncoder.cpp
rename : content/media/encoder/OpusTrackEncoder.h => dom/media/encoder/OpusTrackEncoder.h
rename : content/media/encoder/TrackEncoder.cpp => dom/media/encoder/TrackEncoder.cpp
rename : content/media/encoder/TrackEncoder.h => dom/media/encoder/TrackEncoder.h
rename : content/media/encoder/TrackMetadataBase.h => dom/media/encoder/TrackMetadataBase.h
rename : content/media/encoder/VP8TrackEncoder.cpp => dom/media/encoder/VP8TrackEncoder.cpp
rename : content/media/encoder/VP8TrackEncoder.h => dom/media/encoder/VP8TrackEncoder.h
rename : content/media/encoder/VorbisTrackEncoder.cpp => dom/media/encoder/VorbisTrackEncoder.cpp
rename : content/media/encoder/VorbisTrackEncoder.h => dom/media/encoder/VorbisTrackEncoder.h
rename : content/media/encoder/fmp4_muxer/AMRBox.cpp => dom/media/encoder/fmp4_muxer/AMRBox.cpp
rename : content/media/encoder/fmp4_muxer/AMRBox.h => dom/media/encoder/fmp4_muxer/AMRBox.h
rename : content/media/encoder/fmp4_muxer/AVCBox.cpp => dom/media/encoder/fmp4_muxer/AVCBox.cpp
rename : content/media/encoder/fmp4_muxer/AVCBox.h => dom/media/encoder/fmp4_muxer/AVCBox.h
rename : content/media/encoder/fmp4_muxer/ISOControl.cpp => dom/media/encoder/fmp4_muxer/ISOControl.cpp
rename : content/media/encoder/fmp4_muxer/ISOControl.h => dom/media/encoder/fmp4_muxer/ISOControl.h
rename : content/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp => dom/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp
rename : content/media/encoder/fmp4_muxer/ISOMediaBoxes.h => dom/media/encoder/fmp4_muxer/ISOMediaBoxes.h
rename : content/media/encoder/fmp4_muxer/ISOMediaWriter.cpp => dom/media/encoder/fmp4_muxer/ISOMediaWriter.cpp
rename : content/media/encoder/fmp4_muxer/ISOMediaWriter.h => dom/media/encoder/fmp4_muxer/ISOMediaWriter.h
rename : content/media/encoder/fmp4_muxer/ISOTrackMetadata.h => dom/media/encoder/fmp4_muxer/ISOTrackMetadata.h
rename : content/media/encoder/fmp4_muxer/MP4ESDS.cpp => dom/media/encoder/fmp4_muxer/MP4ESDS.cpp
rename : content/media/encoder/fmp4_muxer/MP4ESDS.h => dom/media/encoder/fmp4_muxer/MP4ESDS.h
rename : content/media/encoder/fmp4_muxer/MuxerOperation.h => dom/media/encoder/fmp4_muxer/MuxerOperation.h
rename : content/media/encoder/fmp4_muxer/moz.build => dom/media/encoder/fmp4_muxer/moz.build
rename : content/media/encoder/moz.build => dom/media/encoder/moz.build
rename : content/media/fmp4/BlankDecoderModule.cpp => dom/media/fmp4/BlankDecoderModule.cpp
rename : content/media/fmp4/MP4Decoder.cpp => dom/media/fmp4/MP4Decoder.cpp
rename : content/media/fmp4/MP4Decoder.h => dom/media/fmp4/MP4Decoder.h
rename : content/media/fmp4/MP4Reader.cpp => dom/media/fmp4/MP4Reader.cpp
rename : content/media/fmp4/MP4Reader.h => dom/media/fmp4/MP4Reader.h
rename : content/media/fmp4/PlatformDecoderModule.cpp => dom/media/fmp4/PlatformDecoderModule.cpp
rename : content/media/fmp4/PlatformDecoderModule.h => dom/media/fmp4/PlatformDecoderModule.h
rename : content/media/fmp4/android/AndroidDecoderModule.cpp => dom/media/fmp4/android/AndroidDecoderModule.cpp
rename : content/media/fmp4/android/AndroidDecoderModule.h => dom/media/fmp4/android/AndroidDecoderModule.h
rename : content/media/fmp4/apple/AppleATDecoder.cpp => dom/media/fmp4/apple/AppleATDecoder.cpp
rename : content/media/fmp4/apple/AppleATDecoder.h => dom/media/fmp4/apple/AppleATDecoder.h
rename : content/media/fmp4/apple/AppleCMFunctions.h => dom/media/fmp4/apple/AppleCMFunctions.h
rename : content/media/fmp4/apple/AppleCMLinker.cpp => dom/media/fmp4/apple/AppleCMLinker.cpp
rename : content/media/fmp4/apple/AppleCMLinker.h => dom/media/fmp4/apple/AppleCMLinker.h
rename : content/media/fmp4/apple/AppleDecoderModule.cpp => dom/media/fmp4/apple/AppleDecoderModule.cpp
rename : content/media/fmp4/apple/AppleDecoderModule.h => dom/media/fmp4/apple/AppleDecoderModule.h
rename : content/media/fmp4/apple/AppleUtils.cpp => dom/media/fmp4/apple/AppleUtils.cpp
rename : content/media/fmp4/apple/AppleUtils.h => dom/media/fmp4/apple/AppleUtils.h
rename : content/media/fmp4/apple/AppleVDADecoder.cpp => dom/media/fmp4/apple/AppleVDADecoder.cpp
rename : content/media/fmp4/apple/AppleVDADecoder.h => dom/media/fmp4/apple/AppleVDADecoder.h
rename : content/media/fmp4/apple/AppleVDAFunctions.h => dom/media/fmp4/apple/AppleVDAFunctions.h
rename : content/media/fmp4/apple/AppleVDALinker.cpp => dom/media/fmp4/apple/AppleVDALinker.cpp
rename : content/media/fmp4/apple/AppleVDALinker.h => dom/media/fmp4/apple/AppleVDALinker.h
rename : content/media/fmp4/apple/AppleVTDecoder.cpp => dom/media/fmp4/apple/AppleVTDecoder.cpp
rename : content/media/fmp4/apple/AppleVTDecoder.h => dom/media/fmp4/apple/AppleVTDecoder.h
rename : content/media/fmp4/apple/AppleVTFunctions.h => dom/media/fmp4/apple/AppleVTFunctions.h
rename : content/media/fmp4/apple/AppleVTLinker.cpp => dom/media/fmp4/apple/AppleVTLinker.cpp
rename : content/media/fmp4/apple/AppleVTLinker.h => dom/media/fmp4/apple/AppleVTLinker.h
rename : content/media/fmp4/apple/ReorderQueue.h => dom/media/fmp4/apple/ReorderQueue.h
rename : content/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h => dom/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h
rename : content/media/fmp4/apple/VideoToolbox/VideoToolbox.h => dom/media/fmp4/apple/VideoToolbox/VideoToolbox.h
rename : content/media/fmp4/eme/EMEAudioDecoder.cpp => dom/media/fmp4/eme/EMEAudioDecoder.cpp
rename : content/media/fmp4/eme/EMEAudioDecoder.h => dom/media/fmp4/eme/EMEAudioDecoder.h
rename : content/media/fmp4/eme/EMEDecoderModule.cpp => dom/media/fmp4/eme/EMEDecoderModule.cpp
rename : content/media/fmp4/eme/EMEDecoderModule.h => dom/media/fmp4/eme/EMEDecoderModule.h
rename : content/media/fmp4/eme/EMEH264Decoder.cpp => dom/media/fmp4/eme/EMEH264Decoder.cpp
rename : content/media/fmp4/eme/EMEH264Decoder.h => dom/media/fmp4/eme/EMEH264Decoder.h
rename : content/media/fmp4/eme/moz.build => dom/media/fmp4/eme/moz.build
rename : content/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp => dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp
rename : content/media/fmp4/ffmpeg/FFmpegAudioDecoder.h => dom/media/fmp4/ffmpeg/FFmpegAudioDecoder.h
rename : content/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp => dom/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp
rename : content/media/fmp4/ffmpeg/FFmpegDataDecoder.h => dom/media/fmp4/ffmpeg/FFmpegDataDecoder.h
rename : content/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp => dom/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp
rename : content/media/fmp4/ffmpeg/FFmpegDecoderModule.h => dom/media/fmp4/ffmpeg/FFmpegDecoderModule.h
rename : content/media/fmp4/ffmpeg/FFmpegFunctionList.h => dom/media/fmp4/ffmpeg/FFmpegFunctionList.h
rename : content/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp => dom/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp
rename : content/media/fmp4/ffmpeg/FFmpegH264Decoder.h => dom/media/fmp4/ffmpeg/FFmpegH264Decoder.h
rename : content/media/fmp4/ffmpeg/FFmpegLibs.h => dom/media/fmp4/ffmpeg/FFmpegLibs.h
rename : content/media/fmp4/ffmpeg/FFmpegLog.cpp => dom/media/fmp4/ffmpeg/FFmpegLog.cpp
rename : content/media/fmp4/ffmpeg/FFmpegLog.h => dom/media/fmp4/ffmpeg/FFmpegLog.h
rename : content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp => dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp
rename : content/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h => dom/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h
rename : content/media/fmp4/ffmpeg/README_mozilla => dom/media/fmp4/ffmpeg/README_mozilla
rename : content/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1 => dom/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h => dom/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h => dom/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h => dom/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavformat/version.h => dom/media/fmp4/ffmpeg/libav53/include/libavformat/version.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/common.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/common.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/error.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/error.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/file.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/file.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/log.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/log.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/time.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/time.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/version.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/version.h
rename : content/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h => dom/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h
rename : content/media/fmp4/ffmpeg/libav53/moz.build => dom/media/fmp4/ffmpeg/libav53/moz.build
rename : content/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1 => dom/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h => dom/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h => dom/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h => dom/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavformat/version.h => dom/media/fmp4/ffmpeg/libav54/include/libavformat/version.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/common.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/common.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/error.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/error.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/file.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/file.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/log.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/log.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/time.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/time.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/version.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/version.h
rename : content/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h => dom/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h
rename : content/media/fmp4/ffmpeg/libav54/moz.build => dom/media/fmp4/ffmpeg/libav54/moz.build
rename : content/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1 => dom/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h => dom/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h => dom/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h => dom/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavformat/version.h => dom/media/fmp4/ffmpeg/libav55/include/libavformat/version.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/common.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/common.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/error.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/error.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/file.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/file.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/log.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/log.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/time.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/time.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/version.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/version.h
rename : content/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h => dom/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h
rename : content/media/fmp4/ffmpeg/libav55/moz.build => dom/media/fmp4/ffmpeg/libav55/moz.build
rename : content/media/fmp4/gonk/GonkAudioDecoderManager.cpp => dom/media/fmp4/gonk/GonkAudioDecoderManager.cpp
rename : content/media/fmp4/gonk/GonkAudioDecoderManager.h => dom/media/fmp4/gonk/GonkAudioDecoderManager.h
rename : content/media/fmp4/gonk/GonkDecoderModule.cpp => dom/media/fmp4/gonk/GonkDecoderModule.cpp
rename : content/media/fmp4/gonk/GonkDecoderModule.h => dom/media/fmp4/gonk/GonkDecoderModule.h
rename : content/media/fmp4/gonk/GonkMediaDataDecoder.cpp => dom/media/fmp4/gonk/GonkMediaDataDecoder.cpp
rename : content/media/fmp4/gonk/GonkMediaDataDecoder.h => dom/media/fmp4/gonk/GonkMediaDataDecoder.h
rename : content/media/fmp4/gonk/GonkVideoDecoderManager.cpp => dom/media/fmp4/gonk/GonkVideoDecoderManager.cpp
rename : content/media/fmp4/gonk/GonkVideoDecoderManager.h => dom/media/fmp4/gonk/GonkVideoDecoderManager.h
rename : content/media/fmp4/gonk/moz.build => dom/media/fmp4/gonk/moz.build
rename : content/media/fmp4/moz.build => dom/media/fmp4/moz.build
rename : content/media/fmp4/wmf/MFTDecoder.cpp => dom/media/fmp4/wmf/MFTDecoder.cpp
rename : content/media/fmp4/wmf/MFTDecoder.h => dom/media/fmp4/wmf/MFTDecoder.h
rename : content/media/fmp4/wmf/WMFAudioMFTManager.cpp => dom/media/fmp4/wmf/WMFAudioMFTManager.cpp
rename : content/media/fmp4/wmf/WMFAudioMFTManager.h => dom/media/fmp4/wmf/WMFAudioMFTManager.h
rename : content/media/fmp4/wmf/WMFDecoderModule.cpp => dom/media/fmp4/wmf/WMFDecoderModule.cpp
rename : content/media/fmp4/wmf/WMFDecoderModule.h => dom/media/fmp4/wmf/WMFDecoderModule.h
rename : content/media/fmp4/wmf/WMFMediaDataDecoder.cpp => dom/media/fmp4/wmf/WMFMediaDataDecoder.cpp
rename : content/media/fmp4/wmf/WMFMediaDataDecoder.h => dom/media/fmp4/wmf/WMFMediaDataDecoder.h
rename : content/media/fmp4/wmf/WMFVideoMFTManager.cpp => dom/media/fmp4/wmf/WMFVideoMFTManager.cpp
rename : content/media/fmp4/wmf/WMFVideoMFTManager.h => dom/media/fmp4/wmf/WMFVideoMFTManager.h
rename : content/media/fmp4/wmf/moz.build => dom/media/fmp4/wmf/moz.build
rename : content/media/gmp/GMPAudioDecoderChild.cpp => dom/media/gmp/GMPAudioDecoderChild.cpp
rename : content/media/gmp/GMPAudioDecoderChild.h => dom/media/gmp/GMPAudioDecoderChild.h
rename : content/media/gmp/GMPAudioDecoderParent.cpp => dom/media/gmp/GMPAudioDecoderParent.cpp
rename : content/media/gmp/GMPAudioDecoderParent.h => dom/media/gmp/GMPAudioDecoderParent.h
rename : content/media/gmp/GMPAudioDecoderProxy.h => dom/media/gmp/GMPAudioDecoderProxy.h
rename : content/media/gmp/GMPAudioHost.cpp => dom/media/gmp/GMPAudioHost.cpp
rename : content/media/gmp/GMPAudioHost.h => dom/media/gmp/GMPAudioHost.h
rename : content/media/gmp/GMPCallbackBase.h => dom/media/gmp/GMPCallbackBase.h
rename : content/media/gmp/GMPChild.cpp => dom/media/gmp/GMPChild.cpp
rename : content/media/gmp/GMPChild.h => dom/media/gmp/GMPChild.h
rename : content/media/gmp/GMPDecryptorChild.cpp => dom/media/gmp/GMPDecryptorChild.cpp
rename : content/media/gmp/GMPDecryptorChild.h => dom/media/gmp/GMPDecryptorChild.h
rename : content/media/gmp/GMPDecryptorParent.cpp => dom/media/gmp/GMPDecryptorParent.cpp
rename : content/media/gmp/GMPDecryptorParent.h => dom/media/gmp/GMPDecryptorParent.h
rename : content/media/gmp/GMPDecryptorProxy.h => dom/media/gmp/GMPDecryptorProxy.h
rename : content/media/gmp/GMPEncryptedBufferDataImpl.cpp => dom/media/gmp/GMPEncryptedBufferDataImpl.cpp
rename : content/media/gmp/GMPEncryptedBufferDataImpl.h => dom/media/gmp/GMPEncryptedBufferDataImpl.h
rename : content/media/gmp/GMPMessageUtils.h => dom/media/gmp/GMPMessageUtils.h
rename : content/media/gmp/GMPParent.cpp => dom/media/gmp/GMPParent.cpp
rename : content/media/gmp/GMPParent.h => dom/media/gmp/GMPParent.h
rename : content/media/gmp/GMPPlatform.cpp => dom/media/gmp/GMPPlatform.cpp
rename : content/media/gmp/GMPPlatform.h => dom/media/gmp/GMPPlatform.h
rename : content/media/gmp/GMPProcessChild.cpp => dom/media/gmp/GMPProcessChild.cpp
rename : content/media/gmp/GMPProcessChild.h => dom/media/gmp/GMPProcessChild.h
rename : content/media/gmp/GMPProcessParent.cpp => dom/media/gmp/GMPProcessParent.cpp
rename : content/media/gmp/GMPProcessParent.h => dom/media/gmp/GMPProcessParent.h
rename : content/media/gmp/GMPService.cpp => dom/media/gmp/GMPService.cpp
rename : content/media/gmp/GMPService.h => dom/media/gmp/GMPService.h
rename : content/media/gmp/GMPSharedMemManager.cpp => dom/media/gmp/GMPSharedMemManager.cpp
rename : content/media/gmp/GMPSharedMemManager.h => dom/media/gmp/GMPSharedMemManager.h
rename : content/media/gmp/GMPStorageChild.cpp => dom/media/gmp/GMPStorageChild.cpp
rename : content/media/gmp/GMPStorageChild.h => dom/media/gmp/GMPStorageChild.h
rename : content/media/gmp/GMPStorageParent.cpp => dom/media/gmp/GMPStorageParent.cpp
rename : content/media/gmp/GMPStorageParent.h => dom/media/gmp/GMPStorageParent.h
rename : content/media/gmp/GMPTimerChild.cpp => dom/media/gmp/GMPTimerChild.cpp
rename : content/media/gmp/GMPTimerChild.h => dom/media/gmp/GMPTimerChild.h
rename : content/media/gmp/GMPTimerParent.cpp => dom/media/gmp/GMPTimerParent.cpp
rename : content/media/gmp/GMPTimerParent.h => dom/media/gmp/GMPTimerParent.h
rename : content/media/gmp/GMPTypes.ipdlh => dom/media/gmp/GMPTypes.ipdlh
rename : content/media/gmp/GMPVideoDecoderChild.cpp => dom/media/gmp/GMPVideoDecoderChild.cpp
rename : content/media/gmp/GMPVideoDecoderChild.h => dom/media/gmp/GMPVideoDecoderChild.h
rename : content/media/gmp/GMPVideoDecoderParent.cpp => dom/media/gmp/GMPVideoDecoderParent.cpp
rename : content/media/gmp/GMPVideoDecoderParent.h => dom/media/gmp/GMPVideoDecoderParent.h
rename : content/media/gmp/GMPVideoDecoderProxy.h => dom/media/gmp/GMPVideoDecoderProxy.h
rename : content/media/gmp/GMPVideoEncodedFrameImpl.cpp => dom/media/gmp/GMPVideoEncodedFrameImpl.cpp
rename : content/media/gmp/GMPVideoEncodedFrameImpl.h => dom/media/gmp/GMPVideoEncodedFrameImpl.h
rename : content/media/gmp/GMPVideoEncoderChild.cpp => dom/media/gmp/GMPVideoEncoderChild.cpp
rename : content/media/gmp/GMPVideoEncoderChild.h => dom/media/gmp/GMPVideoEncoderChild.h
rename : content/media/gmp/GMPVideoEncoderParent.cpp => dom/media/gmp/GMPVideoEncoderParent.cpp
rename : content/media/gmp/GMPVideoEncoderParent.h => dom/media/gmp/GMPVideoEncoderParent.h
rename : content/media/gmp/GMPVideoEncoderProxy.h => dom/media/gmp/GMPVideoEncoderProxy.h
rename : content/media/gmp/GMPVideoHost.cpp => dom/media/gmp/GMPVideoHost.cpp
rename : content/media/gmp/GMPVideoHost.h => dom/media/gmp/GMPVideoHost.h
rename : content/media/gmp/GMPVideoPlaneImpl.cpp => dom/media/gmp/GMPVideoPlaneImpl.cpp
rename : content/media/gmp/GMPVideoPlaneImpl.h => dom/media/gmp/GMPVideoPlaneImpl.h
rename : content/media/gmp/GMPVideoi420FrameImpl.cpp => dom/media/gmp/GMPVideoi420FrameImpl.cpp
rename : content/media/gmp/GMPVideoi420FrameImpl.h => dom/media/gmp/GMPVideoi420FrameImpl.h
rename : content/media/gmp/PGMP.ipdl => dom/media/gmp/PGMP.ipdl
rename : content/media/gmp/PGMPAudioDecoder.ipdl => dom/media/gmp/PGMPAudioDecoder.ipdl
rename : content/media/gmp/PGMPDecryptor.ipdl => dom/media/gmp/PGMPDecryptor.ipdl
rename : content/media/gmp/PGMPStorage.ipdl => dom/media/gmp/PGMPStorage.ipdl
rename : content/media/gmp/PGMPTimer.ipdl => dom/media/gmp/PGMPTimer.ipdl
rename : content/media/gmp/PGMPVideoDecoder.ipdl => dom/media/gmp/PGMPVideoDecoder.ipdl
rename : content/media/gmp/PGMPVideoEncoder.ipdl => dom/media/gmp/PGMPVideoEncoder.ipdl
rename : content/media/gmp/README.txt => dom/media/gmp/README.txt
rename : content/media/gmp/gmp-api/gmp-async-shutdown.h => dom/media/gmp/gmp-api/gmp-async-shutdown.h
rename : content/media/gmp/gmp-api/gmp-audio-codec.h => dom/media/gmp/gmp-api/gmp-audio-codec.h
rename : content/media/gmp/gmp-api/gmp-audio-decode.h => dom/media/gmp/gmp-api/gmp-audio-decode.h
rename : content/media/gmp/gmp-api/gmp-audio-host.h => dom/media/gmp/gmp-api/gmp-audio-host.h
rename : content/media/gmp/gmp-api/gmp-audio-samples.h => dom/media/gmp/gmp-api/gmp-audio-samples.h
rename : content/media/gmp/gmp-api/gmp-decryption.h => dom/media/gmp/gmp-api/gmp-decryption.h
rename : content/media/gmp/gmp-api/gmp-entrypoints.h => dom/media/gmp/gmp-api/gmp-entrypoints.h
rename : content/media/gmp/gmp-api/gmp-errors.h => dom/media/gmp/gmp-api/gmp-errors.h
rename : content/media/gmp/gmp-api/gmp-platform.h => dom/media/gmp/gmp-api/gmp-platform.h
rename : content/media/gmp/gmp-api/gmp-storage.h => dom/media/gmp/gmp-api/gmp-storage.h
rename : content/media/gmp/gmp-api/gmp-video-codec.h => dom/media/gmp/gmp-api/gmp-video-codec.h
rename : content/media/gmp/gmp-api/gmp-video-decode.h => dom/media/gmp/gmp-api/gmp-video-decode.h
rename : content/media/gmp/gmp-api/gmp-video-encode.h => dom/media/gmp/gmp-api/gmp-video-encode.h
rename : content/media/gmp/gmp-api/gmp-video-frame-encoded.h => dom/media/gmp/gmp-api/gmp-video-frame-encoded.h
rename : content/media/gmp/gmp-api/gmp-video-frame-i420.h => dom/media/gmp/gmp-api/gmp-video-frame-i420.h
rename : content/media/gmp/gmp-api/gmp-video-frame.h => dom/media/gmp/gmp-api/gmp-video-frame.h
rename : content/media/gmp/gmp-api/gmp-video-host.h => dom/media/gmp/gmp-api/gmp-video-host.h
rename : content/media/gmp/gmp-api/gmp-video-plane.h => dom/media/gmp/gmp-api/gmp-video-plane.h
rename : content/media/gmp/moz.build => dom/media/gmp/moz.build
rename : content/media/gmp/mozIGeckoMediaPluginService.idl => dom/media/gmp/mozIGeckoMediaPluginService.idl
rename : content/media/gmp/rlz/COPYING => dom/media/gmp/rlz/COPYING
rename : content/media/gmp/rlz/README.mozilla => dom/media/gmp/rlz/README.mozilla
rename : content/media/gmp/rlz/base/memory/scoped_ptr.h => dom/media/gmp/rlz/base/memory/scoped_ptr.h
rename : content/media/gmp/rlz/base/string16.h => dom/media/gmp/rlz/base/string16.h
rename : content/media/gmp/rlz/lib/assert.h => dom/media/gmp/rlz/lib/assert.h
rename : content/media/gmp/rlz/lib/machine_id.h => dom/media/gmp/rlz/lib/machine_id.h
rename : content/media/gmp/rlz/lib/string_utils.cc => dom/media/gmp/rlz/lib/string_utils.cc
rename : content/media/gmp/rlz/lib/string_utils.h => dom/media/gmp/rlz/lib/string_utils.h
rename : content/media/gmp/rlz/moz.build => dom/media/gmp/rlz/moz.build
rename : content/media/gmp/rlz/win/lib/machine_id_win.cc => dom/media/gmp/rlz/win/lib/machine_id_win.cc
rename : content/media/gstreamer/GStreamerAllocator.cpp => dom/media/gstreamer/GStreamerAllocator.cpp
rename : content/media/gstreamer/GStreamerAllocator.h => dom/media/gstreamer/GStreamerAllocator.h
rename : content/media/gstreamer/GStreamerDecoder.cpp => dom/media/gstreamer/GStreamerDecoder.cpp
rename : content/media/gstreamer/GStreamerDecoder.h => dom/media/gstreamer/GStreamerDecoder.h
rename : content/media/gstreamer/GStreamerFormatHelper.cpp => dom/media/gstreamer/GStreamerFormatHelper.cpp
rename : content/media/gstreamer/GStreamerFormatHelper.h => dom/media/gstreamer/GStreamerFormatHelper.h
rename : content/media/gstreamer/GStreamerFunctionList.h => dom/media/gstreamer/GStreamerFunctionList.h
rename : content/media/gstreamer/GStreamerLoader.cpp => dom/media/gstreamer/GStreamerLoader.cpp
rename : content/media/gstreamer/GStreamerLoader.h => dom/media/gstreamer/GStreamerLoader.h
rename : content/media/gstreamer/GStreamerMozVideoBuffer.cpp => dom/media/gstreamer/GStreamerMozVideoBuffer.cpp
rename : content/media/gstreamer/GStreamerMozVideoBuffer.h => dom/media/gstreamer/GStreamerMozVideoBuffer.h
rename : content/media/gstreamer/GStreamerReader-0.10.cpp => dom/media/gstreamer/GStreamerReader-0.10.cpp
rename : content/media/gstreamer/GStreamerReader.cpp => dom/media/gstreamer/GStreamerReader.cpp
rename : content/media/gstreamer/GStreamerReader.h => dom/media/gstreamer/GStreamerReader.h
rename : content/media/gstreamer/moz.build => dom/media/gstreamer/moz.build
rename : content/media/gtest/MockMediaDecoderOwner.h => dom/media/gtest/MockMediaDecoderOwner.h
rename : content/media/gtest/MockMediaResource.cpp => dom/media/gtest/MockMediaResource.cpp
rename : content/media/gtest/MockMediaResource.h => dom/media/gtest/MockMediaResource.h
rename : content/media/gtest/TestAudioCompactor.cpp => dom/media/gtest/TestAudioCompactor.cpp
rename : content/media/gtest/TestGMPCrossOrigin.cpp => dom/media/gtest/TestGMPCrossOrigin.cpp
rename : content/media/gtest/TestMP4Reader.cpp => dom/media/gtest/TestMP4Reader.cpp
rename : content/media/gtest/TestTrackEncoder.cpp => dom/media/gtest/TestTrackEncoder.cpp
rename : content/media/gtest/TestVideoSegment.cpp => dom/media/gtest/TestVideoSegment.cpp
rename : content/media/gtest/TestVideoTrackEncoder.cpp => dom/media/gtest/TestVideoTrackEncoder.cpp
rename : content/media/gtest/TestVorbisTrackEncoder.cpp => dom/media/gtest/TestVorbisTrackEncoder.cpp
rename : content/media/gtest/TestWebMBuffered.cpp => dom/media/gtest/TestWebMBuffered.cpp
rename : content/media/gtest/TestWebMWriter.cpp => dom/media/gtest/TestWebMWriter.cpp
rename : content/media/gtest/mediasource_test.mp4 => dom/media/gtest/mediasource_test.mp4
rename : content/media/gtest/moz.build => dom/media/gtest/moz.build
rename : content/media/gtest/test.webm => dom/media/gtest/test.webm
rename : content/media/imagecapture/CaptureTask.cpp => dom/media/imagecapture/CaptureTask.cpp
rename : content/media/imagecapture/CaptureTask.h => dom/media/imagecapture/CaptureTask.h
rename : content/media/imagecapture/ImageCapture.cpp => dom/media/imagecapture/ImageCapture.cpp
rename : content/media/imagecapture/ImageCapture.h => dom/media/imagecapture/ImageCapture.h
rename : content/media/imagecapture/moz.build => dom/media/imagecapture/moz.build
rename : content/media/mediasource/AsyncEventRunner.h => dom/media/mediasource/AsyncEventRunner.h
rename : content/media/mediasource/ContainerParser.cpp => dom/media/mediasource/ContainerParser.cpp
rename : content/media/mediasource/ContainerParser.h => dom/media/mediasource/ContainerParser.h
rename : content/media/mediasource/MediaSource.cpp => dom/media/mediasource/MediaSource.cpp
rename : content/media/mediasource/MediaSource.h => dom/media/mediasource/MediaSource.h
rename : content/media/mediasource/MediaSourceDecoder.cpp => dom/media/mediasource/MediaSourceDecoder.cpp
rename : content/media/mediasource/MediaSourceDecoder.h => dom/media/mediasource/MediaSourceDecoder.h
rename : content/media/mediasource/MediaSourceReader.cpp => dom/media/mediasource/MediaSourceReader.cpp
rename : content/media/mediasource/MediaSourceReader.h => dom/media/mediasource/MediaSourceReader.h
rename : content/media/mediasource/MediaSourceResource.h => dom/media/mediasource/MediaSourceResource.h
rename : content/media/mediasource/MediaSourceUtils.cpp => dom/media/mediasource/MediaSourceUtils.cpp
rename : content/media/mediasource/MediaSourceUtils.h => dom/media/mediasource/MediaSourceUtils.h
rename : content/media/mediasource/ResourceQueue.h => dom/media/mediasource/ResourceQueue.h
rename : content/media/mediasource/SourceBuffer.cpp => dom/media/mediasource/SourceBuffer.cpp
rename : content/media/mediasource/SourceBuffer.h => dom/media/mediasource/SourceBuffer.h
rename : content/media/mediasource/SourceBufferDecoder.cpp => dom/media/mediasource/SourceBufferDecoder.cpp
rename : content/media/mediasource/SourceBufferDecoder.h => dom/media/mediasource/SourceBufferDecoder.h
rename : content/media/mediasource/SourceBufferList.cpp => dom/media/mediasource/SourceBufferList.cpp
rename : content/media/mediasource/SourceBufferList.h => dom/media/mediasource/SourceBufferList.h
rename : content/media/mediasource/SourceBufferResource.cpp => dom/media/mediasource/SourceBufferResource.cpp
rename : content/media/mediasource/SourceBufferResource.h => dom/media/mediasource/SourceBufferResource.h
rename : content/media/mediasource/TrackBuffer.cpp => dom/media/mediasource/TrackBuffer.cpp
rename : content/media/mediasource/TrackBuffer.h => dom/media/mediasource/TrackBuffer.h
rename : content/media/mediasource/moz.build => dom/media/mediasource/moz.build
rename : content/media/mediasource/test/crashtests/1005366.html => dom/media/mediasource/test/crashtests/1005366.html
rename : content/media/mediasource/test/crashtests/1059035.html => dom/media/mediasource/test/crashtests/1059035.html
rename : content/media/mediasource/test/crashtests/926665.html => dom/media/mediasource/test/crashtests/926665.html
rename : content/media/mediasource/test/crashtests/931388.html => dom/media/mediasource/test/crashtests/931388.html
rename : content/media/mediasource/test/crashtests/crashtests.list => dom/media/mediasource/test/crashtests/crashtests.list
rename : content/media/mediasource/test/mediasource.js => dom/media/mediasource/test/mediasource.js
rename : content/media/mediasource/test/mochitest.ini => dom/media/mediasource/test/mochitest.ini
rename : content/media/mediasource/test/seek.webm => dom/media/mediasource/test/seek.webm
rename : content/media/mediasource/test/seek.webm^headers^ => dom/media/mediasource/test/seek.webm^headers^
rename : content/media/mediasource/test/seek_lowres.webm => dom/media/mediasource/test/seek_lowres.webm
rename : content/media/mediasource/test/seek_lowres.webm^headers^ => dom/media/mediasource/test/seek_lowres.webm^headers^
rename : content/media/mediasource/test/test_BufferedSeek.html => dom/media/mediasource/test/test_BufferedSeek.html
rename : content/media/mediasource/test/test_FrameSelection.html => dom/media/mediasource/test/test_FrameSelection.html
rename : content/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html => dom/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html
rename : content/media/mediasource/test/test_MediaSource.html => dom/media/mediasource/test/test_MediaSource.html
rename : content/media/mediasource/test/test_MediaSource_disabled.html => dom/media/mediasource/test/test_MediaSource_disabled.html
rename : content/media/mediasource/test/test_SeekableAfterEndOfStream.html => dom/media/mediasource/test/test_SeekableAfterEndOfStream.html
rename : content/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html => dom/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html
rename : content/media/mediasource/test/test_SeekableBeforeEndOfStream.html => dom/media/mediasource/test/test_SeekableBeforeEndOfStream.html
rename : content/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html => dom/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html
rename : content/media/mediasource/test/test_SplitAppend.html => dom/media/mediasource/test/test_SplitAppend.html
rename : content/media/mediasource/test/test_SplitAppendDelay.html => dom/media/mediasource/test/test_SplitAppendDelay.html
rename : content/media/nsIDocumentActivity.h => dom/media/nsIDocumentActivity.h
rename : content/media/ogg/OggCodecState.cpp => dom/media/ogg/OggCodecState.cpp
rename : content/media/ogg/OggCodecState.h => dom/media/ogg/OggCodecState.h
rename : content/media/ogg/OggDecoder.cpp => dom/media/ogg/OggDecoder.cpp
rename : content/media/ogg/OggDecoder.h => dom/media/ogg/OggDecoder.h
rename : content/media/ogg/OggReader.cpp => dom/media/ogg/OggReader.cpp
rename : content/media/ogg/OggReader.h => dom/media/ogg/OggReader.h
rename : content/media/ogg/OggWriter.cpp => dom/media/ogg/OggWriter.cpp
rename : content/media/ogg/OggWriter.h => dom/media/ogg/OggWriter.h
rename : content/media/ogg/OpusParser.cpp => dom/media/ogg/OpusParser.cpp
rename : content/media/ogg/OpusParser.h => dom/media/ogg/OpusParser.h
rename : content/media/ogg/moz.build => dom/media/ogg/moz.build
rename : content/media/omx/AudioOffloadPlayer.cpp => dom/media/omx/AudioOffloadPlayer.cpp
rename : content/media/omx/AudioOffloadPlayer.h => dom/media/omx/AudioOffloadPlayer.h
rename : content/media/omx/AudioOffloadPlayerBase.h => dom/media/omx/AudioOffloadPlayerBase.h
rename : content/media/omx/AudioOutput.cpp => dom/media/omx/AudioOutput.cpp
rename : content/media/omx/AudioOutput.h => dom/media/omx/AudioOutput.h
rename : content/media/omx/AudioSink.h => dom/media/omx/AudioSink.h
rename : content/media/omx/I420ColorConverterHelper.cpp => dom/media/omx/I420ColorConverterHelper.cpp
rename : content/media/omx/I420ColorConverterHelper.h => dom/media/omx/I420ColorConverterHelper.h
rename : content/media/omx/MPAPI.h => dom/media/omx/MPAPI.h
rename : content/media/omx/MediaCodecDecoder.cpp => dom/media/omx/MediaCodecDecoder.cpp
rename : content/media/omx/MediaCodecDecoder.h => dom/media/omx/MediaCodecDecoder.h
rename : content/media/omx/MediaCodecProxy.cpp => dom/media/omx/MediaCodecProxy.cpp
rename : content/media/omx/MediaCodecProxy.h => dom/media/omx/MediaCodecProxy.h
rename : content/media/omx/MediaCodecReader.cpp => dom/media/omx/MediaCodecReader.cpp
rename : content/media/omx/MediaCodecReader.h => dom/media/omx/MediaCodecReader.h
rename : content/media/omx/MediaOmxCommonDecoder.cpp => dom/media/omx/MediaOmxCommonDecoder.cpp
rename : content/media/omx/MediaOmxCommonDecoder.h => dom/media/omx/MediaOmxCommonDecoder.h
rename : content/media/omx/MediaOmxCommonReader.cpp => dom/media/omx/MediaOmxCommonReader.cpp
rename : content/media/omx/MediaOmxCommonReader.h => dom/media/omx/MediaOmxCommonReader.h
rename : content/media/omx/MediaOmxDecoder.cpp => dom/media/omx/MediaOmxDecoder.cpp
rename : content/media/omx/MediaOmxDecoder.h => dom/media/omx/MediaOmxDecoder.h
rename : content/media/omx/MediaOmxReader.cpp => dom/media/omx/MediaOmxReader.cpp
rename : content/media/omx/MediaOmxReader.h => dom/media/omx/MediaOmxReader.h
rename : content/media/omx/MediaStreamSource.cpp => dom/media/omx/MediaStreamSource.cpp
rename : content/media/omx/MediaStreamSource.h => dom/media/omx/MediaStreamSource.h
rename : content/media/omx/OMXCodecDescriptorUtil.cpp => dom/media/omx/OMXCodecDescriptorUtil.cpp
rename : content/media/omx/OMXCodecDescriptorUtil.h => dom/media/omx/OMXCodecDescriptorUtil.h
rename : content/media/omx/OMXCodecProxy.cpp => dom/media/omx/OMXCodecProxy.cpp
rename : content/media/omx/OMXCodecProxy.h => dom/media/omx/OMXCodecProxy.h
rename : content/media/omx/OMXCodecWrapper.cpp => dom/media/omx/OMXCodecWrapper.cpp
rename : content/media/omx/OMXCodecWrapper.h => dom/media/omx/OMXCodecWrapper.h
rename : content/media/omx/OmxDecoder.cpp => dom/media/omx/OmxDecoder.cpp
rename : content/media/omx/OmxDecoder.h => dom/media/omx/OmxDecoder.h
rename : content/media/omx/RtspExtractor.cpp => dom/media/omx/RtspExtractor.cpp
rename : content/media/omx/RtspExtractor.h => dom/media/omx/RtspExtractor.h
rename : content/media/omx/RtspMediaCodecDecoder.cpp => dom/media/omx/RtspMediaCodecDecoder.cpp
rename : content/media/omx/RtspMediaCodecDecoder.h => dom/media/omx/RtspMediaCodecDecoder.h
rename : content/media/omx/RtspMediaCodecReader.cpp => dom/media/omx/RtspMediaCodecReader.cpp
rename : content/media/omx/RtspMediaCodecReader.h => dom/media/omx/RtspMediaCodecReader.h
rename : content/media/omx/RtspOmxDecoder.cpp => dom/media/omx/RtspOmxDecoder.cpp
rename : content/media/omx/RtspOmxDecoder.h => dom/media/omx/RtspOmxDecoder.h
rename : content/media/omx/RtspOmxReader.cpp => dom/media/omx/RtspOmxReader.cpp
rename : content/media/omx/RtspOmxReader.h => dom/media/omx/RtspOmxReader.h
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp => dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h => dom/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp => dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h => dom/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp => dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp
rename : content/media/omx/mediaresourcemanager/IMediaResourceManagerService.h => dom/media/omx/mediaresourcemanager/IMediaResourceManagerService.h
rename : content/media/omx/mediaresourcemanager/MediaResourceHandler.cpp => dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp
rename : content/media/omx/mediaresourcemanager/MediaResourceHandler.h => dom/media/omx/mediaresourcemanager/MediaResourceHandler.h
rename : content/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp => dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp
rename : content/media/omx/mediaresourcemanager/MediaResourceManagerClient.h => dom/media/omx/mediaresourcemanager/MediaResourceManagerClient.h
rename : content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp => dom/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
rename : content/media/omx/mediaresourcemanager/MediaResourceManagerService.h => dom/media/omx/mediaresourcemanager/MediaResourceManagerService.h
rename : content/media/omx/mediaresourcemanager/moz.build => dom/media/omx/mediaresourcemanager/moz.build
rename : content/media/omx/moz.build => dom/media/omx/moz.build
rename : content/media/raw/RawDecoder.cpp => dom/media/raw/RawDecoder.cpp
rename : content/media/raw/RawDecoder.h => dom/media/raw/RawDecoder.h
rename : content/media/raw/RawReader.cpp => dom/media/raw/RawReader.cpp
rename : content/media/raw/RawReader.h => dom/media/raw/RawReader.h
rename : content/media/raw/RawStructs.h => dom/media/raw/RawStructs.h
rename : content/media/raw/moz.build => dom/media/raw/moz.build
rename : content/media/systemservices/LoadManager.cpp => dom/media/systemservices/LoadManager.cpp
rename : content/media/systemservices/LoadManager.h => dom/media/systemservices/LoadManager.h
rename : content/media/systemservices/LoadManagerFactory.cpp => dom/media/systemservices/LoadManagerFactory.cpp
rename : content/media/systemservices/LoadManagerFactory.h => dom/media/systemservices/LoadManagerFactory.h
rename : content/media/systemservices/LoadMonitor.cpp => dom/media/systemservices/LoadMonitor.cpp
rename : content/media/systemservices/LoadMonitor.h => dom/media/systemservices/LoadMonitor.h
rename : content/media/systemservices/OSXRunLoopSingleton.cpp => dom/media/systemservices/OSXRunLoopSingleton.cpp
rename : content/media/systemservices/OSXRunLoopSingleton.h => dom/media/systemservices/OSXRunLoopSingleton.h
rename : content/media/systemservices/OpenSLESProvider.cpp => dom/media/systemservices/OpenSLESProvider.cpp
rename : content/media/systemservices/OpenSLESProvider.h => dom/media/systemservices/OpenSLESProvider.h
rename : content/media/systemservices/moz.build => dom/media/systemservices/moz.build
rename : content/media/test/320x240.ogv => dom/media/test/320x240.ogv
rename : content/media/test/320x240.ogv^headers^ => dom/media/test/320x240.ogv^headers^
rename : content/media/test/448636.ogv => dom/media/test/448636.ogv
rename : content/media/test/448636.ogv^headers^ => dom/media/test/448636.ogv^headers^
rename : content/media/test/VID_0001.ogg => dom/media/test/VID_0001.ogg
rename : content/media/test/VID_0001.ogg^headers^ => dom/media/test/VID_0001.ogg^headers^
rename : content/media/test/allowed.sjs => dom/media/test/allowed.sjs
rename : content/media/test/audio-gaps.ogg => dom/media/test/audio-gaps.ogg
rename : content/media/test/audio-gaps.ogg^headers^ => dom/media/test/audio-gaps.ogg^headers^
rename : content/media/test/audio-overhang.ogg => dom/media/test/audio-overhang.ogg
rename : content/media/test/audio-overhang.ogg^headers^ => dom/media/test/audio-overhang.ogg^headers^
rename : content/media/test/audio.wav => dom/media/test/audio.wav
rename : content/media/test/audio.wav^headers^ => dom/media/test/audio.wav^headers^
rename : content/media/test/bad-signature.vtt => dom/media/test/bad-signature.vtt
rename : content/media/test/badtags.ogg => dom/media/test/badtags.ogg
rename : content/media/test/badtags.ogg^headers^ => dom/media/test/badtags.ogg^headers^
rename : content/media/test/basic.vtt => dom/media/test/basic.vtt
rename : content/media/test/beta-phrasebook.ogg => dom/media/test/beta-phrasebook.ogg
rename : content/media/test/beta-phrasebook.ogg^headers^ => dom/media/test/beta-phrasebook.ogg^headers^
rename : content/media/test/big.wav => dom/media/test/big.wav
rename : content/media/test/big.wav^headers^ => dom/media/test/big.wav^headers^
rename : content/media/test/bogus.duh => dom/media/test/bogus.duh
rename : content/media/test/bogus.ogv => dom/media/test/bogus.ogv
rename : content/media/test/bogus.ogv^headers^ => dom/media/test/bogus.ogv^headers^
rename : content/media/test/bogus.wav => dom/media/test/bogus.wav
rename : content/media/test/bogus.wav^headers^ => dom/media/test/bogus.wav^headers^
rename : content/media/test/bug1066943.webm => dom/media/test/bug1066943.webm
rename : content/media/test/bug1066943.webm^headers^ => dom/media/test/bug1066943.webm^headers^
rename : content/media/test/bug461281.ogg => dom/media/test/bug461281.ogg
rename : content/media/test/bug461281.ogg^headers^ => dom/media/test/bug461281.ogg^headers^
rename : content/media/test/bug482461-theora.ogv => dom/media/test/bug482461-theora.ogv
rename : content/media/test/bug482461-theora.ogv^headers^ => dom/media/test/bug482461-theora.ogv^headers^
rename : content/media/test/bug482461.ogv => dom/media/test/bug482461.ogv
rename : content/media/test/bug482461.ogv^headers^ => dom/media/test/bug482461.ogv^headers^
rename : content/media/test/bug495129.ogv => dom/media/test/bug495129.ogv
rename : content/media/test/bug495129.ogv^headers^ => dom/media/test/bug495129.ogv^headers^
rename : content/media/test/bug495794.ogg => dom/media/test/bug495794.ogg
rename : content/media/test/bug495794.ogg^headers^ => dom/media/test/bug495794.ogg^headers^
rename : content/media/test/bug498380.ogv => dom/media/test/bug498380.ogv
rename : content/media/test/bug498380.ogv^headers^ => dom/media/test/bug498380.ogv^headers^
rename : content/media/test/bug498855-1.ogv => dom/media/test/bug498855-1.ogv
rename : content/media/test/bug498855-1.ogv^headers^ => dom/media/test/bug498855-1.ogv^headers^
rename : content/media/test/bug498855-2.ogv => dom/media/test/bug498855-2.ogv
rename : content/media/test/bug498855-2.ogv^headers^ => dom/media/test/bug498855-2.ogv^headers^
rename : content/media/test/bug498855-3.ogv => dom/media/test/bug498855-3.ogv
rename : content/media/test/bug498855-3.ogv^headers^ => dom/media/test/bug498855-3.ogv^headers^
rename : content/media/test/bug499519.ogv => dom/media/test/bug499519.ogv
rename : content/media/test/bug499519.ogv^headers^ => dom/media/test/bug499519.ogv^headers^
rename : content/media/test/bug500311.ogv => dom/media/test/bug500311.ogv
rename : content/media/test/bug500311.ogv^headers^ => dom/media/test/bug500311.ogv^headers^
rename : content/media/test/bug501279.ogg => dom/media/test/bug501279.ogg
rename : content/media/test/bug501279.ogg^headers^ => dom/media/test/bug501279.ogg^headers^
rename : content/media/test/bug504613.ogv => dom/media/test/bug504613.ogv
rename : content/media/test/bug504613.ogv^headers^ => dom/media/test/bug504613.ogv^headers^
rename : content/media/test/bug504644.ogv => dom/media/test/bug504644.ogv
rename : content/media/test/bug504644.ogv^headers^ => dom/media/test/bug504644.ogv^headers^
rename : content/media/test/bug504843.ogv => dom/media/test/bug504843.ogv
rename : content/media/test/bug504843.ogv^headers^ => dom/media/test/bug504843.ogv^headers^
rename : content/media/test/bug506094.ogv => dom/media/test/bug506094.ogv
rename : content/media/test/bug506094.ogv^headers^ => dom/media/test/bug506094.ogv^headers^
rename : content/media/test/bug516323.indexed.ogv => dom/media/test/bug516323.indexed.ogv
rename : content/media/test/bug516323.indexed.ogv^headers^ => dom/media/test/bug516323.indexed.ogv^headers^
rename : content/media/test/bug516323.ogv => dom/media/test/bug516323.ogv
rename : content/media/test/bug516323.ogv^headers^ => dom/media/test/bug516323.ogv^headers^
rename : content/media/test/bug520493.ogg => dom/media/test/bug520493.ogg
rename : content/media/test/bug520493.ogg^headers^ => dom/media/test/bug520493.ogg^headers^
rename : content/media/test/bug520500.ogg => dom/media/test/bug520500.ogg
rename : content/media/test/bug520500.ogg^headers^ => dom/media/test/bug520500.ogg^headers^
rename : content/media/test/bug520908.ogv => dom/media/test/bug520908.ogv
rename : content/media/test/bug520908.ogv^headers^ => dom/media/test/bug520908.ogv^headers^
rename : content/media/test/bug523816.ogv => dom/media/test/bug523816.ogv
rename : content/media/test/bug523816.ogv^headers^ => dom/media/test/bug523816.ogv^headers^
rename : content/media/test/bug533822.ogg => dom/media/test/bug533822.ogg
rename : content/media/test/bug533822.ogg^headers^ => dom/media/test/bug533822.ogg^headers^
rename : content/media/test/bug556821.ogv => dom/media/test/bug556821.ogv
rename : content/media/test/bug556821.ogv^headers^ => dom/media/test/bug556821.ogv^headers^
rename : content/media/test/bug557094.ogv => dom/media/test/bug557094.ogv
rename : content/media/test/bug557094.ogv^headers^ => dom/media/test/bug557094.ogv^headers^
rename : content/media/test/bug580982.webm => dom/media/test/bug580982.webm
rename : content/media/test/bug580982.webm^headers^ => dom/media/test/bug580982.webm^headers^
rename : content/media/test/bug603918.webm => dom/media/test/bug603918.webm
rename : content/media/test/bug603918.webm^headers^ => dom/media/test/bug603918.webm^headers^
rename : content/media/test/bug604067.webm => dom/media/test/bug604067.webm
rename : content/media/test/bug604067.webm^headers^ => dom/media/test/bug604067.webm^headers^
rename : content/media/test/bug883173.vtt => dom/media/test/bug883173.vtt
rename : content/media/test/can_play_type_dash.js => dom/media/test/can_play_type_dash.js
rename : content/media/test/can_play_type_ogg.js => dom/media/test/can_play_type_ogg.js
rename : content/media/test/can_play_type_wave.js => dom/media/test/can_play_type_wave.js
rename : content/media/test/can_play_type_webm.js => dom/media/test/can_play_type_webm.js
rename : content/media/test/cancellable_request.sjs => dom/media/test/cancellable_request.sjs
rename : content/media/test/chain.ogg => dom/media/test/chain.ogg
rename : content/media/test/chain.ogg^headers^ => dom/media/test/chain.ogg^headers^
rename : content/media/test/chain.ogv => dom/media/test/chain.ogv
rename : content/media/test/chain.ogv^headers^ => dom/media/test/chain.ogv^headers^
rename : content/media/test/chain.opus => dom/media/test/chain.opus
rename : content/media/test/chain.opus^headers^ => dom/media/test/chain.opus^headers^
rename : content/media/test/chained-audio-video.ogg => dom/media/test/chained-audio-video.ogg
rename : content/media/test/chained-audio-video.ogg^headers^ => dom/media/test/chained-audio-video.ogg^headers^
rename : content/media/test/chained-video.ogv => dom/media/test/chained-video.ogv
rename : content/media/test/chained-video.ogv^headers^ => dom/media/test/chained-video.ogv^headers^
rename : content/media/test/chrome.ini => dom/media/test/chrome.ini
rename : content/media/test/contentDuration1.sjs => dom/media/test/contentDuration1.sjs
rename : content/media/test/contentDuration2.sjs => dom/media/test/contentDuration2.sjs
rename : content/media/test/contentDuration3.sjs => dom/media/test/contentDuration3.sjs
rename : content/media/test/contentDuration4.sjs => dom/media/test/contentDuration4.sjs
rename : content/media/test/contentDuration5.sjs => dom/media/test/contentDuration5.sjs
rename : content/media/test/contentDuration6.sjs => dom/media/test/contentDuration6.sjs
rename : content/media/test/contentDuration7.sjs => dom/media/test/contentDuration7.sjs
rename : content/media/test/contentType.sjs => dom/media/test/contentType.sjs
rename : content/media/test/crashtests/0-timescale.html => dom/media/test/crashtests/0-timescale.html
rename : content/media/test/crashtests/0-timescale.mp4 => dom/media/test/crashtests/0-timescale.mp4
rename : content/media/test/crashtests/1015662.html => dom/media/test/crashtests/1015662.html
rename : content/media/test/crashtests/1028458.html => dom/media/test/crashtests/1028458.html
rename : content/media/test/crashtests/1080986.html => dom/media/test/crashtests/1080986.html
rename : content/media/test/crashtests/1080986.wav => dom/media/test/crashtests/1080986.wav
rename : content/media/test/crashtests/459439-1.html => dom/media/test/crashtests/459439-1.html
rename : content/media/test/crashtests/466607-1.html => dom/media/test/crashtests/466607-1.html
rename : content/media/test/crashtests/466945-1.html => dom/media/test/crashtests/466945-1.html
rename : content/media/test/crashtests/468763-1.html => dom/media/test/crashtests/468763-1.html
rename : content/media/test/crashtests/474744-1.html => dom/media/test/crashtests/474744-1.html
rename : content/media/test/crashtests/481136-1.html => dom/media/test/crashtests/481136-1.html
rename : content/media/test/crashtests/492286-1.xhtml => dom/media/test/crashtests/492286-1.xhtml
rename : content/media/test/crashtests/493915-1.html => dom/media/test/crashtests/493915-1.html
rename : content/media/test/crashtests/495794-1.html => dom/media/test/crashtests/495794-1.html
rename : content/media/test/crashtests/495794-1.ogg => dom/media/test/crashtests/495794-1.ogg
rename : content/media/test/crashtests/576612-1.html => dom/media/test/crashtests/576612-1.html
rename : content/media/test/crashtests/691096-1.html => dom/media/test/crashtests/691096-1.html
rename : content/media/test/crashtests/752784-1.html => dom/media/test/crashtests/752784-1.html
rename : content/media/test/crashtests/789075-1.html => dom/media/test/crashtests/789075-1.html
rename : content/media/test/crashtests/789075.webm => dom/media/test/crashtests/789075.webm
rename : content/media/test/crashtests/795892-1.html => dom/media/test/crashtests/795892-1.html
rename : content/media/test/crashtests/844563.html => dom/media/test/crashtests/844563.html
rename : content/media/test/crashtests/846612.html => dom/media/test/crashtests/846612.html
rename : content/media/test/crashtests/852838.html => dom/media/test/crashtests/852838.html
rename : content/media/test/crashtests/865537-1.html => dom/media/test/crashtests/865537-1.html
rename : content/media/test/crashtests/868504.html => dom/media/test/crashtests/868504.html
rename : content/media/test/crashtests/874869.html => dom/media/test/crashtests/874869.html
rename : content/media/test/crashtests/874915.html => dom/media/test/crashtests/874915.html
rename : content/media/test/crashtests/874934.html => dom/media/test/crashtests/874934.html
rename : content/media/test/crashtests/874952.html => dom/media/test/crashtests/874952.html
rename : content/media/test/crashtests/875144.html => dom/media/test/crashtests/875144.html
rename : content/media/test/crashtests/875596.html => dom/media/test/crashtests/875596.html
rename : content/media/test/crashtests/875911.html => dom/media/test/crashtests/875911.html
rename : content/media/test/crashtests/876024-1.html => dom/media/test/crashtests/876024-1.html
rename : content/media/test/crashtests/876024-2.html => dom/media/test/crashtests/876024-2.html
rename : content/media/test/crashtests/876118.html => dom/media/test/crashtests/876118.html
rename : content/media/test/crashtests/876207.html => dom/media/test/crashtests/876207.html
rename : content/media/test/crashtests/876215.html => dom/media/test/crashtests/876215.html
rename : content/media/test/crashtests/876249.html => dom/media/test/crashtests/876249.html
rename : content/media/test/crashtests/876252.html => dom/media/test/crashtests/876252.html
rename : content/media/test/crashtests/876834.html => dom/media/test/crashtests/876834.html
rename : content/media/test/crashtests/877527.html => dom/media/test/crashtests/877527.html
rename : content/media/test/crashtests/877820.html => dom/media/test/crashtests/877820.html
rename : content/media/test/crashtests/878014.html => dom/media/test/crashtests/878014.html
rename : content/media/test/crashtests/878328.html => dom/media/test/crashtests/878328.html
rename : content/media/test/crashtests/878407.html => dom/media/test/crashtests/878407.html
rename : content/media/test/crashtests/878478.html => dom/media/test/crashtests/878478.html
rename : content/media/test/crashtests/880129.html => dom/media/test/crashtests/880129.html
rename : content/media/test/crashtests/880202.html => dom/media/test/crashtests/880202.html
rename : content/media/test/crashtests/880342-1.html => dom/media/test/crashtests/880342-1.html
rename : content/media/test/crashtests/880342-2.html => dom/media/test/crashtests/880342-2.html
rename : content/media/test/crashtests/880384.html => dom/media/test/crashtests/880384.html
rename : content/media/test/crashtests/880404.html => dom/media/test/crashtests/880404.html
rename : content/media/test/crashtests/880724.html => dom/media/test/crashtests/880724.html
rename : content/media/test/crashtests/881775.html => dom/media/test/crashtests/881775.html
rename : content/media/test/crashtests/882549.html => dom/media/test/crashtests/882549.html
rename : content/media/test/crashtests/882956.html => dom/media/test/crashtests/882956.html
rename : content/media/test/crashtests/884459.html => dom/media/test/crashtests/884459.html
rename : content/media/test/crashtests/889042.html => dom/media/test/crashtests/889042.html
rename : content/media/test/crashtests/894104.html => dom/media/test/crashtests/894104.html
rename : content/media/test/crashtests/907986-1.html => dom/media/test/crashtests/907986-1.html
rename : content/media/test/crashtests/907986-2.html => dom/media/test/crashtests/907986-2.html
rename : content/media/test/crashtests/907986-3.html => dom/media/test/crashtests/907986-3.html
rename : content/media/test/crashtests/907986-4.html => dom/media/test/crashtests/907986-4.html
rename : content/media/test/crashtests/910171-1.html => dom/media/test/crashtests/910171-1.html
rename : content/media/test/crashtests/920987.html => dom/media/test/crashtests/920987.html
rename : content/media/test/crashtests/925619-1.html => dom/media/test/crashtests/925619-1.html
rename : content/media/test/crashtests/925619-2.html => dom/media/test/crashtests/925619-2.html
rename : content/media/test/crashtests/926619.html => dom/media/test/crashtests/926619.html
rename : content/media/test/crashtests/933151.html => dom/media/test/crashtests/933151.html
rename : content/media/test/crashtests/933156.html => dom/media/test/crashtests/933156.html
rename : content/media/test/crashtests/944851.html => dom/media/test/crashtests/944851.html
rename : content/media/test/crashtests/952756.html => dom/media/test/crashtests/952756.html
rename : content/media/test/crashtests/966636.html => dom/media/test/crashtests/966636.html
rename : content/media/test/crashtests/986901.html => dom/media/test/crashtests/986901.html
rename : content/media/test/crashtests/990794.html => dom/media/test/crashtests/990794.html
rename : content/media/test/crashtests/buffer-source-ended-1.html => dom/media/test/crashtests/buffer-source-ended-1.html
rename : content/media/test/crashtests/cors.webm => dom/media/test/crashtests/cors.webm
rename : content/media/test/crashtests/cors.webm^headers^ => dom/media/test/crashtests/cors.webm^headers^
rename : content/media/test/crashtests/crashtests.list => dom/media/test/crashtests/crashtests.list
rename : content/media/test/crashtests/media-element-source-seek-1.html => dom/media/test/crashtests/media-element-source-seek-1.html
rename : content/media/test/crashtests/offline-buffer-source-ended-1.html => dom/media/test/crashtests/offline-buffer-source-ended-1.html
rename : content/media/test/crashtests/oscillator-ended-1.html => dom/media/test/crashtests/oscillator-ended-1.html
rename : content/media/test/crashtests/oscillator-ended-2.html => dom/media/test/crashtests/oscillator-ended-2.html
rename : content/media/test/crashtests/sound.ogg => dom/media/test/crashtests/sound.ogg
rename : content/media/test/dash/dash-manifest-garbled-webm.mpd => dom/media/test/dash/dash-manifest-garbled-webm.mpd
rename : content/media/test/dash/dash-manifest-garbled.mpd => dom/media/test/dash/dash-manifest-garbled.mpd
rename : content/media/test/dash/dash-manifest-sjs.mpd => dom/media/test/dash/dash-manifest-sjs.mpd
rename : content/media/test/dash/dash-manifest.mpd => dom/media/test/dash/dash-manifest.mpd
rename : content/media/test/dash/dash-webm-audio-128k.webm => dom/media/test/dash/dash-webm-audio-128k.webm
rename : content/media/test/dash/dash-webm-video-320x180.webm => dom/media/test/dash/dash-webm-video-320x180.webm
rename : content/media/test/dash/dash-webm-video-428x240.webm => dom/media/test/dash/dash-webm-video-428x240.webm
rename : content/media/test/dash/garbled.webm => dom/media/test/dash/garbled.webm
rename : content/media/test/dash_detect_stream_switch.sjs => dom/media/test/dash_detect_stream_switch.sjs
rename : content/media/test/detodos.opus => dom/media/test/detodos.opus
rename : content/media/test/detodos.opus^headers^ => dom/media/test/detodos.opus^headers^
rename : content/media/test/detodos.webm => dom/media/test/detodos.webm
rename : content/media/test/detodos.webm^headers^ => dom/media/test/detodos.webm^headers^
rename : content/media/test/dirac.ogg => dom/media/test/dirac.ogg
rename : content/media/test/dirac.ogg^headers^ => dom/media/test/dirac.ogg^headers^
rename : content/media/test/dynamic_redirect.sjs => dom/media/test/dynamic_redirect.sjs
rename : content/media/test/dynamic_resource.sjs => dom/media/test/dynamic_resource.sjs
rename : content/media/test/file_access_controls.html => dom/media/test/file_access_controls.html
rename : content/media/test/fragment_noplay.js => dom/media/test/fragment_noplay.js
rename : content/media/test/fragment_play.js => dom/media/test/fragment_play.js
rename : content/media/test/gizmo-frag-cenc.xml => dom/media/test/gizmo-frag-cenc.xml
rename : content/media/test/gizmo-frag-cenc1.m4s => dom/media/test/gizmo-frag-cenc1.m4s
rename : content/media/test/gizmo-frag-cenc2.m4s => dom/media/test/gizmo-frag-cenc2.m4s
rename : content/media/test/gizmo-frag-cencinit.mp4 => dom/media/test/gizmo-frag-cencinit.mp4
rename : content/media/test/gizmo.mp4 => dom/media/test/gizmo.mp4
rename : content/media/test/gizmo.mp4^headers^ => dom/media/test/gizmo.mp4^headers^
rename : content/media/test/graph_latency.py => dom/media/test/graph_latency.py
rename : content/media/test/huge-id3.mp3 => dom/media/test/huge-id3.mp3
rename : content/media/test/huge-id3.mp3^headers^ => dom/media/test/huge-id3.mp3^headers^
rename : content/media/test/id3tags.mp3 => dom/media/test/id3tags.mp3
rename : content/media/test/id3tags.mp3^headers^ => dom/media/test/id3tags.mp3^headers^
rename : content/media/test/invalid-cmap-s0c0.opus => dom/media/test/invalid-cmap-s0c0.opus
rename : content/media/test/invalid-cmap-s0c0.opus^headers^ => dom/media/test/invalid-cmap-s0c0.opus^headers^
rename : content/media/test/invalid-cmap-s0c2.opus => dom/media/test/invalid-cmap-s0c2.opus
rename : content/media/test/invalid-cmap-s0c2.opus^headers^ => dom/media/test/invalid-cmap-s0c2.opus^headers^
rename : content/media/test/invalid-cmap-s1c2.opus => dom/media/test/invalid-cmap-s1c2.opus
rename : content/media/test/invalid-cmap-s1c2.opus^headers^ => dom/media/test/invalid-cmap-s1c2.opus^headers^
rename : content/media/test/invalid-cmap-short.opus => dom/media/test/invalid-cmap-short.opus
rename : content/media/test/invalid-cmap-short.opus^headers^ => dom/media/test/invalid-cmap-short.opus^headers^
rename : content/media/test/invalid-discard_on_multi_blocks.webm => dom/media/test/invalid-discard_on_multi_blocks.webm
rename : content/media/test/invalid-discard_on_multi_blocks.webm^headers^ => dom/media/test/invalid-discard_on_multi_blocks.webm^headers^
rename : content/media/test/invalid-excess_discard.webm => dom/media/test/invalid-excess_discard.webm
rename : content/media/test/invalid-excess_discard.webm^headers^ => dom/media/test/invalid-excess_discard.webm^headers^
rename : content/media/test/invalid-excess_neg_discard.webm => dom/media/test/invalid-excess_neg_discard.webm
rename : content/media/test/invalid-excess_neg_discard.webm^headers^ => dom/media/test/invalid-excess_neg_discard.webm^headers^
rename : content/media/test/invalid-m0c0.opus => dom/media/test/invalid-m0c0.opus
rename : content/media/test/invalid-m0c0.opus^headers^ => dom/media/test/invalid-m0c0.opus^headers^
rename : content/media/test/invalid-m0c3.opus => dom/media/test/invalid-m0c3.opus
rename : content/media/test/invalid-m0c3.opus^headers^ => dom/media/test/invalid-m0c3.opus^headers^
rename : content/media/test/invalid-m1c0.opus => dom/media/test/invalid-m1c0.opus
rename : content/media/test/invalid-m1c0.opus^headers^ => dom/media/test/invalid-m1c0.opus^headers^
rename : content/media/test/invalid-m1c9.opus => dom/media/test/invalid-m1c9.opus
rename : content/media/test/invalid-m1c9.opus^headers^ => dom/media/test/invalid-m1c9.opus^headers^
rename : content/media/test/invalid-m2c0.opus => dom/media/test/invalid-m2c0.opus
rename : content/media/test/invalid-m2c0.opus^headers^ => dom/media/test/invalid-m2c0.opus^headers^
rename : content/media/test/invalid-m2c1.opus => dom/media/test/invalid-m2c1.opus
rename : content/media/test/invalid-m2c1.opus^headers^ => dom/media/test/invalid-m2c1.opus^headers^
rename : content/media/test/invalid-neg_discard.webm => dom/media/test/invalid-neg_discard.webm
rename : content/media/test/invalid-neg_discard.webm^headers^ => dom/media/test/invalid-neg_discard.webm^headers^
rename : content/media/test/invalid-preskip.webm => dom/media/test/invalid-preskip.webm
rename : content/media/test/invalid-preskip.webm^headers^ => dom/media/test/invalid-preskip.webm^headers^
rename : content/media/test/long.vtt => dom/media/test/long.vtt
rename : content/media/test/make-headers.sh => dom/media/test/make-headers.sh
rename : content/media/test/manifest.js => dom/media/test/manifest.js
rename : content/media/test/mochitest.ini => dom/media/test/mochitest.ini
rename : content/media/test/multiple-bos-more-header-fileds.ogg => dom/media/test/multiple-bos-more-header-fileds.ogg
rename : content/media/test/multiple-bos-more-header-fileds.ogg^headers^ => dom/media/test/multiple-bos-more-header-fileds.ogg^headers^
rename : content/media/test/multiple-bos.ogg => dom/media/test/multiple-bos.ogg
rename : content/media/test/multiple-bos.ogg^headers^ => dom/media/test/multiple-bos.ogg^headers^
rename : content/media/test/no-cues.webm => dom/media/test/no-cues.webm
rename : content/media/test/no-cues.webm^headers^ => dom/media/test/no-cues.webm^headers^
rename : content/media/test/noContentLength.sjs => dom/media/test/noContentLength.sjs
rename : content/media/test/notags.mp3 => dom/media/test/notags.mp3
rename : content/media/test/notags.mp3^headers^ => dom/media/test/notags.mp3^headers^
rename : content/media/test/owl-funnier-id3.mp3 => dom/media/test/owl-funnier-id3.mp3
rename : content/media/test/owl-funnier-id3.mp3^headers^ => dom/media/test/owl-funnier-id3.mp3^headers^
rename : content/media/test/owl-funny-id3.mp3 => dom/media/test/owl-funny-id3.mp3
rename : content/media/test/owl-funny-id3.mp3^headers^ => dom/media/test/owl-funny-id3.mp3^headers^
rename : content/media/test/owl.mp3 => dom/media/test/owl.mp3
rename : content/media/test/owl.mp3^headers^ => dom/media/test/owl.mp3^headers^
rename : content/media/test/parser.vtt => dom/media/test/parser.vtt
rename : content/media/test/pixel_aspect_ratio.mp4 => dom/media/test/pixel_aspect_ratio.mp4
rename : content/media/test/r11025_msadpcm_c1.wav => dom/media/test/r11025_msadpcm_c1.wav
rename : content/media/test/r11025_msadpcm_c1.wav^headers^ => dom/media/test/r11025_msadpcm_c1.wav^headers^
rename : content/media/test/r11025_s16_c1.wav => dom/media/test/r11025_s16_c1.wav
rename : content/media/test/r11025_s16_c1.wav^headers^ => dom/media/test/r11025_s16_c1.wav^headers^
rename : content/media/test/r11025_s16_c1_trailing.wav => dom/media/test/r11025_s16_c1_trailing.wav
rename : content/media/test/r11025_s16_c1_trailing.wav^headers^ => dom/media/test/r11025_s16_c1_trailing.wav^headers^
rename : content/media/test/r11025_u8_c1.wav => dom/media/test/r11025_u8_c1.wav
rename : content/media/test/r11025_u8_c1.wav^headers^ => dom/media/test/r11025_u8_c1.wav^headers^
rename : content/media/test/r11025_u8_c1_trunc.wav => dom/media/test/r11025_u8_c1_trunc.wav
rename : content/media/test/r11025_u8_c1_trunc.wav^headers^ => dom/media/test/r11025_u8_c1_trunc.wav^headers^
rename : content/media/test/r16000_u8_c1_list.wav => dom/media/test/r16000_u8_c1_list.wav
rename : content/media/test/r16000_u8_c1_list.wav^headers^ => dom/media/test/r16000_u8_c1_list.wav^headers^
rename : content/media/test/reactivate_helper.html => dom/media/test/reactivate_helper.html
rename : content/media/test/redirect.sjs => dom/media/test/redirect.sjs
rename : content/media/test/referer.sjs => dom/media/test/referer.sjs
rename : content/media/test/region.vtt => dom/media/test/region.vtt
rename : content/media/test/sample-fisbone-skeleton4.ogv => dom/media/test/sample-fisbone-skeleton4.ogv
rename : content/media/test/sample-fisbone-skeleton4.ogv^headers^ => dom/media/test/sample-fisbone-skeleton4.ogv^headers^
rename : content/media/test/sample-fisbone-wrong-header.ogv => dom/media/test/sample-fisbone-wrong-header.ogv
rename : content/media/test/sample-fisbone-wrong-header.ogv^headers^ => dom/media/test/sample-fisbone-wrong-header.ogv^headers^
rename : content/media/test/sample.3g2 => dom/media/test/sample.3g2
rename : content/media/test/sample.3gp => dom/media/test/sample.3gp
rename : content/media/test/seek.ogv => dom/media/test/seek.ogv
rename : content/media/test/seek.ogv^headers^ => dom/media/test/seek.ogv^headers^
rename : content/media/test/seek.webm => dom/media/test/seek.webm
rename : content/media/test/seek.webm^headers^ => dom/media/test/seek.webm^headers^
rename : content/media/test/seek.yuv => dom/media/test/seek.yuv
rename : content/media/test/seekLies.sjs => dom/media/test/seekLies.sjs
rename : content/media/test/seek_support.js => dom/media/test/seek_support.js
rename : content/media/test/seek_with_sound.ogg => dom/media/test/seek_with_sound.ogg
rename : content/media/test/seek_with_sound.ogg^headers^ => dom/media/test/seek_with_sound.ogg^headers^
rename : content/media/test/short-cenc.mp4 => dom/media/test/short-cenc.mp4
rename : content/media/test/short-cenc.xml => dom/media/test/short-cenc.xml
rename : content/media/test/short-video.ogv => dom/media/test/short-video.ogv
rename : content/media/test/short-video.ogv^headers^ => dom/media/test/short-video.ogv^headers^
rename : content/media/test/short.mp4 => dom/media/test/short.mp4
rename : content/media/test/small-shot-mp3.mp4 => dom/media/test/small-shot-mp3.mp4
rename : content/media/test/small-shot-mp3.mp4^headers^ => dom/media/test/small-shot-mp3.mp4^headers^
rename : content/media/test/small-shot.m4a => dom/media/test/small-shot.m4a
rename : content/media/test/small-shot.mp3 => dom/media/test/small-shot.mp3
rename : content/media/test/small-shot.mp3^headers^ => dom/media/test/small-shot.mp3^headers^
rename : content/media/test/small-shot.ogg => dom/media/test/small-shot.ogg
rename : content/media/test/small-shot.ogg^headers^ => dom/media/test/small-shot.ogg^headers^
rename : content/media/test/sound.ogg => dom/media/test/sound.ogg
rename : content/media/test/sound.ogg^headers^ => dom/media/test/sound.ogg^headers^
rename : content/media/test/spacestorm-1000Hz-100ms.ogg => dom/media/test/spacestorm-1000Hz-100ms.ogg
rename : content/media/test/spacestorm-1000Hz-100ms.ogg^headers^ => dom/media/test/spacestorm-1000Hz-100ms.ogg^headers^
rename : content/media/test/split.webm => dom/media/test/split.webm
rename : content/media/test/split.webm^headers^ => dom/media/test/split.webm^headers^
rename : content/media/test/street.mp4 => dom/media/test/street.mp4
rename : content/media/test/street.mp4^headers^ => dom/media/test/street.mp4^headers^
rename : content/media/test/test-1-mono.opus => dom/media/test/test-1-mono.opus
rename : content/media/test/test-1-mono.opus^headers^ => dom/media/test/test-1-mono.opus^headers^
rename : content/media/test/test-2-stereo.opus => dom/media/test/test-2-stereo.opus
rename : content/media/test/test-2-stereo.opus^headers^ => dom/media/test/test-2-stereo.opus^headers^
rename : content/media/test/test-3-LCR.opus => dom/media/test/test-3-LCR.opus
rename : content/media/test/test-3-LCR.opus^headers^ => dom/media/test/test-3-LCR.opus^headers^
rename : content/media/test/test-4-quad.opus => dom/media/test/test-4-quad.opus
rename : content/media/test/test-4-quad.opus^headers^ => dom/media/test/test-4-quad.opus^headers^
rename : content/media/test/test-5-5.0.opus => dom/media/test/test-5-5.0.opus
rename : content/media/test/test-5-5.0.opus^headers^ => dom/media/test/test-5-5.0.opus^headers^
rename : content/media/test/test-6-5.1.opus => dom/media/test/test-6-5.1.opus
rename : content/media/test/test-6-5.1.opus^headers^ => dom/media/test/test-6-5.1.opus^headers^
rename : content/media/test/test-7-6.1.opus => dom/media/test/test-7-6.1.opus
rename : content/media/test/test-7-6.1.opus^headers^ => dom/media/test/test-7-6.1.opus^headers^
rename : content/media/test/test-8-7.1.opus => dom/media/test/test-8-7.1.opus
rename : content/media/test/test-8-7.1.opus^headers^ => dom/media/test/test-8-7.1.opus^headers^
rename : content/media/test/test_VideoPlaybackQuality.html => dom/media/test/test_VideoPlaybackQuality.html
rename : content/media/test/test_VideoPlaybackQuality_disabled.html => dom/media/test/test_VideoPlaybackQuality_disabled.html
rename : content/media/test/test_access_control.html => dom/media/test/test_access_control.html
rename : content/media/test/test_aspectratio_mp4.html => dom/media/test/test_aspectratio_mp4.html
rename : content/media/test/test_audio1.html => dom/media/test/test_audio1.html
rename : content/media/test/test_audio2.html => dom/media/test/test_audio2.html
rename : content/media/test/test_audioDocumentTitle.html => dom/media/test/test_audioDocumentTitle.html
rename : content/media/test/test_autoplay.html => dom/media/test/test_autoplay.html
rename : content/media/test/test_autoplay_contentEditable.html => dom/media/test/test_autoplay_contentEditable.html
rename : content/media/test/test_buffered.html => dom/media/test/test_buffered.html
rename : content/media/test/test_bug1018933.html => dom/media/test/test_bug1018933.html
rename : content/media/test/test_bug448534.html => dom/media/test/test_bug448534.html
rename : content/media/test/test_bug463162.xhtml => dom/media/test/test_bug463162.xhtml
rename : content/media/test/test_bug465498.html => dom/media/test/test_bug465498.html
rename : content/media/test/test_bug493187.html => dom/media/test/test_bug493187.html
rename : content/media/test/test_bug495145.html => dom/media/test/test_bug495145.html
rename : content/media/test/test_bug495300.html => dom/media/test/test_bug495300.html
rename : content/media/test/test_bug654550.html => dom/media/test/test_bug654550.html
rename : content/media/test/test_bug686942.html => dom/media/test/test_bug686942.html
rename : content/media/test/test_bug726904.html => dom/media/test/test_bug726904.html
rename : content/media/test/test_bug874897.html => dom/media/test/test_bug874897.html
rename : content/media/test/test_bug883173.html => dom/media/test/test_bug883173.html
rename : content/media/test/test_bug895091.html => dom/media/test/test_bug895091.html
rename : content/media/test/test_bug895305.html => dom/media/test/test_bug895305.html
rename : content/media/test/test_bug919265.html => dom/media/test/test_bug919265.html
rename : content/media/test/test_bug957847.html => dom/media/test/test_bug957847.html
rename : content/media/test/test_can_play_type.html => dom/media/test/test_can_play_type.html
rename : content/media/test/test_can_play_type_mpeg.html => dom/media/test/test_can_play_type_mpeg.html
rename : content/media/test/test_can_play_type_no_ogg.html => dom/media/test/test_can_play_type_no_ogg.html
rename : content/media/test/test_can_play_type_no_wave.html => dom/media/test/test_can_play_type_no_wave.html
rename : content/media/test/test_can_play_type_no_webm.html => dom/media/test/test_can_play_type_no_webm.html
rename : content/media/test/test_can_play_type_ogg.html => dom/media/test/test_can_play_type_ogg.html
rename : content/media/test/test_can_play_type_wave.html => dom/media/test/test_can_play_type_wave.html
rename : content/media/test/test_can_play_type_webm.html => dom/media/test/test_can_play_type_webm.html
rename : content/media/test/test_chaining.html => dom/media/test/test_chaining.html
rename : content/media/test/test_clone_media_element.html => dom/media/test/test_clone_media_element.html
rename : content/media/test/test_closing_connections.html => dom/media/test/test_closing_connections.html
rename : content/media/test/test_constants.html => dom/media/test/test_constants.html
rename : content/media/test/test_contentDuration1.html => dom/media/test/test_contentDuration1.html
rename : content/media/test/test_contentDuration2.html => dom/media/test/test_contentDuration2.html
rename : content/media/test/test_contentDuration3.html => dom/media/test/test_contentDuration3.html
rename : content/media/test/test_contentDuration4.html => dom/media/test/test_contentDuration4.html
rename : content/media/test/test_contentDuration5.html => dom/media/test/test_contentDuration5.html
rename : content/media/test/test_contentDuration6.html => dom/media/test/test_contentDuration6.html
rename : content/media/test/test_contentDuration7.html => dom/media/test/test_contentDuration7.html
rename : content/media/test/test_controls.html => dom/media/test/test_controls.html
rename : content/media/test/test_currentTime.html => dom/media/test/test_currentTime.html
rename : content/media/test/test_decode_error.html => dom/media/test/test_decode_error.html
rename : content/media/test/test_decoder_disable.html => dom/media/test/test_decoder_disable.html
rename : content/media/test/test_defaultMuted.html => dom/media/test/test_defaultMuted.html
rename : content/media/test/test_delay_load.html => dom/media/test/test_delay_load.html
rename : content/media/test/test_encryptedMediaExtensions.html => dom/media/test/test_encryptedMediaExtensions.html
rename : content/media/test/test_error_in_video_document.html => dom/media/test/test_error_in_video_document.html
rename : content/media/test/test_error_on_404.html => dom/media/test/test_error_on_404.html
rename : content/media/test/test_fastSeek-forwards.html => dom/media/test/test_fastSeek-forwards.html
rename : content/media/test/test_fastSeek.html => dom/media/test/test_fastSeek.html
rename : content/media/test/test_fragment_noplay.html => dom/media/test/test_fragment_noplay.html
rename : content/media/test/test_fragment_play.html => dom/media/test/test_fragment_play.html
rename : content/media/test/test_imagecapture.html => dom/media/test/test_imagecapture.html
rename : content/media/test/test_info_leak.html => dom/media/test/test_info_leak.html
rename : content/media/test/test_invalid_reject.html => dom/media/test/test_invalid_reject.html
rename : content/media/test/test_invalid_reject_play.html => dom/media/test/test_invalid_reject_play.html
rename : content/media/test/test_invalid_seek.html => dom/media/test/test_invalid_seek.html
rename : content/media/test/test_load.html => dom/media/test/test_load.html
rename : content/media/test/test_load_candidates.html => dom/media/test/test_load_candidates.html
rename : content/media/test/test_load_same_resource.html => dom/media/test/test_load_same_resource.html
rename : content/media/test/test_load_source.html => dom/media/test/test_load_source.html
rename : content/media/test/test_loop.html => dom/media/test/test_loop.html
rename : content/media/test/test_media_selection.html => dom/media/test/test_media_selection.html
rename : content/media/test/test_media_sniffer.html => dom/media/test/test_media_sniffer.html
rename : content/media/test/test_mediarecorder_avoid_recursion.html => dom/media/test/test_mediarecorder_avoid_recursion.html
rename : content/media/test/test_mediarecorder_creation.html => dom/media/test/test_mediarecorder_creation.html
rename : content/media/test/test_mediarecorder_creation_fail.html => dom/media/test/test_mediarecorder_creation_fail.html
rename : content/media/test/test_mediarecorder_getencodeddata.html => dom/media/test/test_mediarecorder_getencodeddata.html
rename : content/media/test/test_mediarecorder_record_4ch_audiocontext.html => dom/media/test/test_mediarecorder_record_4ch_audiocontext.html
rename : content/media/test/test_mediarecorder_record_audiocontext.html => dom/media/test/test_mediarecorder_record_audiocontext.html
rename : content/media/test/test_mediarecorder_record_audiocontext_mlk.html => dom/media/test/test_mediarecorder_record_audiocontext_mlk.html
rename : content/media/test/test_mediarecorder_record_audionode.html => dom/media/test/test_mediarecorder_record_audionode.html
rename : content/media/test/test_mediarecorder_record_getdata_afterstart.html => dom/media/test/test_mediarecorder_record_getdata_afterstart.html
rename : content/media/test/test_mediarecorder_record_gum_video_timeslice.html => dom/media/test/test_mediarecorder_record_gum_video_timeslice.html
rename : content/media/test/test_mediarecorder_record_immediate_stop.html => dom/media/test/test_mediarecorder_record_immediate_stop.html
rename : content/media/test/test_mediarecorder_record_no_timeslice.html => dom/media/test/test_mediarecorder_record_no_timeslice.html
rename : content/media/test/test_mediarecorder_record_nosrc.html => dom/media/test/test_mediarecorder_record_nosrc.html
rename : content/media/test/test_mediarecorder_record_session.html => dom/media/test/test_mediarecorder_record_session.html
rename : content/media/test/test_mediarecorder_record_startstopstart.html => dom/media/test/test_mediarecorder_record_startstopstart.html
rename : content/media/test/test_mediarecorder_record_stopms.html => dom/media/test/test_mediarecorder_record_stopms.html
rename : content/media/test/test_mediarecorder_record_timeslice.html => dom/media/test/test_mediarecorder_record_timeslice.html
rename : content/media/test/test_mediarecorder_reload_crash.html => dom/media/test/test_mediarecorder_reload_crash.html
rename : content/media/test/test_mediarecorder_state_transition.html => dom/media/test/test_mediarecorder_state_transition.html
rename : content/media/test/test_mediarecorder_unsupported_src.html => dom/media/test/test_mediarecorder_unsupported_src.html
rename : content/media/test/test_mediatrack_consuming_mediaresource.html => dom/media/test/test_mediatrack_consuming_mediaresource.html
rename : content/media/test/test_mediatrack_consuming_mediastream.html => dom/media/test/test_mediatrack_consuming_mediastream.html
rename : content/media/test/test_mediatrack_events.html => dom/media/test/test_mediatrack_events.html
rename : content/media/test/test_mediatrack_parsing_ogg.html => dom/media/test/test_mediatrack_parsing_ogg.html
rename : content/media/test/test_mediatrack_replay_from_end.html => dom/media/test/test_mediatrack_replay_from_end.html
rename : content/media/test/test_metadata.html => dom/media/test/test_metadata.html
rename : content/media/test/test_mixed_principals.html => dom/media/test/test_mixed_principals.html
rename : content/media/test/test_mozHasAudio.html => dom/media/test/test_mozHasAudio.html
rename : content/media/test/test_networkState.html => dom/media/test/test_networkState.html
rename : content/media/test/test_new_audio.html => dom/media/test/test_new_audio.html
rename : content/media/test/test_no_load_event.html => dom/media/test/test_no_load_event.html
rename : content/media/test/test_paused.html => dom/media/test/test_paused.html
rename : content/media/test/test_paused_after_ended.html => dom/media/test/test_paused_after_ended.html
rename : content/media/test/test_play_events.html => dom/media/test/test_play_events.html
rename : content/media/test/test_play_events_2.html => dom/media/test/test_play_events_2.html
rename : content/media/test/test_play_twice.html => dom/media/test/test_play_twice.html
rename : content/media/test/test_playback.html => dom/media/test/test_playback.html
rename : content/media/test/test_playback_errors.html => dom/media/test/test_playback_errors.html
rename : content/media/test/test_playback_rate.html => dom/media/test/test_playback_rate.html
rename : content/media/test/test_playback_rate_playpause.html => dom/media/test/test_playback_rate_playpause.html
rename : content/media/test/test_played.html => dom/media/test/test_played.html
rename : content/media/test/test_preload_actions.html => dom/media/test/test_preload_actions.html
rename : content/media/test/test_preload_attribute.html => dom/media/test/test_preload_attribute.html
rename : content/media/test/test_preload_suspend.html => dom/media/test/test_preload_suspend.html
rename : content/media/test/test_progress.html => dom/media/test/test_progress.html
rename : content/media/test/test_reactivate.html => dom/media/test/test_reactivate.html
rename : content/media/test/test_readyState.html => dom/media/test/test_readyState.html
rename : content/media/test/test_referer.html => dom/media/test/test_referer.html
rename : content/media/test/test_replay_metadata.html => dom/media/test/test_replay_metadata.html
rename : content/media/test/test_reset_events_async.html => dom/media/test/test_reset_events_async.html
rename : content/media/test/test_reset_src.html => dom/media/test/test_reset_src.html
rename : content/media/test/test_resume.html => dom/media/test/test_resume.html
rename : content/media/test/test_seek-1.html => dom/media/test/test_seek-1.html
rename : content/media/test/test_seek-10.html => dom/media/test/test_seek-10.html
rename : content/media/test/test_seek-11.html => dom/media/test/test_seek-11.html
rename : content/media/test/test_seek-12.html => dom/media/test/test_seek-12.html
rename : content/media/test/test_seek-13.html => dom/media/test/test_seek-13.html
rename : content/media/test/test_seek-2.html => dom/media/test/test_seek-2.html
rename : content/media/test/test_seek-3.html => dom/media/test/test_seek-3.html
rename : content/media/test/test_seek-4.html => dom/media/test/test_seek-4.html
rename : content/media/test/test_seek-5.html => dom/media/test/test_seek-5.html
rename : content/media/test/test_seek-6.html => dom/media/test/test_seek-6.html
rename : content/media/test/test_seek-7.html => dom/media/test/test_seek-7.html
rename : content/media/test/test_seek-8.html => dom/media/test/test_seek-8.html
rename : content/media/test/test_seek-9.html => dom/media/test/test_seek-9.html
rename : content/media/test/test_seekLies.html => dom/media/test/test_seekLies.html
rename : content/media/test/test_seek_out_of_range.html => dom/media/test/test_seek_out_of_range.html
rename : content/media/test/test_seekable1.html => dom/media/test/test_seekable1.html
rename : content/media/test/test_seekable2.html => dom/media/test/test_seekable2.html
rename : content/media/test/test_seekable3.html => dom/media/test/test_seekable3.html
rename : content/media/test/test_source.html => dom/media/test/test_source.html
rename : content/media/test/test_source_media.html => dom/media/test/test_source_media.html
rename : content/media/test/test_source_null.html => dom/media/test/test_source_null.html
rename : content/media/test/test_source_write.html => dom/media/test/test_source_write.html
rename : content/media/test/test_standalone.html => dom/media/test/test_standalone.html
rename : content/media/test/test_streams_autoplay.html => dom/media/test/test_streams_autoplay.html
rename : content/media/test/test_streams_element_capture.html => dom/media/test/test_streams_element_capture.html
rename : content/media/test/test_streams_element_capture_createObjectURL.html => dom/media/test/test_streams_element_capture_createObjectURL.html
rename : content/media/test/test_streams_element_capture_playback.html => dom/media/test/test_streams_element_capture_playback.html
rename : content/media/test/test_streams_element_capture_reset.html => dom/media/test/test_streams_element_capture_reset.html
rename : content/media/test/test_streams_gc.html => dom/media/test/test_streams_gc.html
rename : content/media/test/test_streams_srcObject.html => dom/media/test/test_streams_srcObject.html
rename : content/media/test/test_streams_tracks.html => dom/media/test/test_streams_tracks.html
rename : content/media/test/test_texttrack.html => dom/media/test/test_texttrack.html
rename : content/media/test/test_texttrack_chrome.html => dom/media/test/test_texttrack_chrome.html
rename : content/media/test/test_texttrackcue.html => dom/media/test/test_texttrackcue.html
rename : content/media/test/test_texttrackcue_chrome.html => dom/media/test/test_texttrackcue_chrome.html
rename : content/media/test/test_texttracklist.html => dom/media/test/test_texttracklist.html
rename : content/media/test/test_texttracklist_chrome.html => dom/media/test/test_texttracklist_chrome.html
rename : content/media/test/test_texttrackregion.html => dom/media/test/test_texttrackregion.html
rename : content/media/test/test_timeupdate_small_files.html => dom/media/test/test_timeupdate_small_files.html
rename : content/media/test/test_trackelementevent.html => dom/media/test/test_trackelementevent.html
rename : content/media/test/test_trackevent.html => dom/media/test/test_trackevent.html
rename : content/media/test/test_unseekable.html => dom/media/test/test_unseekable.html
rename : content/media/test/test_videoDocumentTitle.html => dom/media/test/test_videoDocumentTitle.html
rename : content/media/test/test_video_in_audio_element.html => dom/media/test/test_video_in_audio_element.html
rename : content/media/test/test_video_to_canvas.html => dom/media/test/test_video_to_canvas.html
rename : content/media/test/test_volume.html => dom/media/test/test_volume.html
rename : content/media/test/test_vttparser.html => dom/media/test/test_vttparser.html
rename : content/media/test/test_wav_ended1.html => dom/media/test/test_wav_ended1.html
rename : content/media/test/test_wav_ended2.html => dom/media/test/test_wav_ended2.html
rename : content/media/test/test_webvtt_disabled.html => dom/media/test/test_webvtt_disabled.html
rename : content/media/test/variable-channel.ogg => dom/media/test/variable-channel.ogg
rename : content/media/test/variable-channel.ogg^headers^ => dom/media/test/variable-channel.ogg^headers^
rename : content/media/test/variable-channel.opus => dom/media/test/variable-channel.opus
rename : content/media/test/variable-channel.opus^headers^ => dom/media/test/variable-channel.opus^headers^
rename : content/media/test/variable-preskip.opus => dom/media/test/variable-preskip.opus
rename : content/media/test/variable-preskip.opus^headers^ => dom/media/test/variable-preskip.opus^headers^
rename : content/media/test/variable-samplerate.ogg => dom/media/test/variable-samplerate.ogg
rename : content/media/test/variable-samplerate.ogg^headers^ => dom/media/test/variable-samplerate.ogg^headers^
rename : content/media/test/variable-samplerate.opus => dom/media/test/variable-samplerate.opus
rename : content/media/test/variable-samplerate.opus^headers^ => dom/media/test/variable-samplerate.opus^headers^
rename : content/media/test/vbr-head.mp3 => dom/media/test/vbr-head.mp3
rename : content/media/test/vbr-head.mp3^headers^ => dom/media/test/vbr-head.mp3^headers^
rename : content/media/test/vbr.mp3 => dom/media/test/vbr.mp3
rename : content/media/test/vbr.mp3^headers^ => dom/media/test/vbr.mp3^headers^
rename : content/media/test/video-overhang.ogg => dom/media/test/video-overhang.ogg
rename : content/media/test/video-overhang.ogg^headers^ => dom/media/test/video-overhang.ogg^headers^
rename : content/media/test/vp9.webm => dom/media/test/vp9.webm
rename : content/media/test/vp9.webm^headers^ => dom/media/test/vp9.webm^headers^
rename : content/media/test/vp9cake.webm => dom/media/test/vp9cake.webm
rename : content/media/test/vp9cake.webm^headers^ => dom/media/test/vp9cake.webm^headers^
rename : content/media/test/wave_metadata.wav => dom/media/test/wave_metadata.wav
rename : content/media/test/wave_metadata.wav^headers^ => dom/media/test/wave_metadata.wav^headers^
rename : content/media/test/wave_metadata_bad_len.wav => dom/media/test/wave_metadata_bad_len.wav
rename : content/media/test/wave_metadata_bad_len.wav^headers^ => dom/media/test/wave_metadata_bad_len.wav^headers^
rename : content/media/test/wave_metadata_bad_no_null.wav => dom/media/test/wave_metadata_bad_no_null.wav
rename : content/media/test/wave_metadata_bad_no_null.wav^headers^ => dom/media/test/wave_metadata_bad_no_null.wav^headers^
rename : content/media/test/wave_metadata_bad_utf8.wav => dom/media/test/wave_metadata_bad_utf8.wav
rename : content/media/test/wave_metadata_bad_utf8.wav^headers^ => dom/media/test/wave_metadata_bad_utf8.wav^headers^
rename : content/media/test/wave_metadata_unknown_tag.wav => dom/media/test/wave_metadata_unknown_tag.wav
rename : content/media/test/wave_metadata_unknown_tag.wav^headers^ => dom/media/test/wave_metadata_unknown_tag.wav^headers^
rename : content/media/test/wave_metadata_utf8.wav => dom/media/test/wave_metadata_utf8.wav
rename : content/media/test/wave_metadata_utf8.wav^headers^ => dom/media/test/wave_metadata_utf8.wav^headers^
rename : content/media/test/wavedata_s16.wav => dom/media/test/wavedata_s16.wav
rename : content/media/test/wavedata_s16.wav^headers^ => dom/media/test/wavedata_s16.wav^headers^
rename : content/media/test/wavedata_u8.wav => dom/media/test/wavedata_u8.wav
rename : content/media/test/wavedata_u8.wav^headers^ => dom/media/test/wavedata_u8.wav^headers^
rename : content/media/wave/WaveDecoder.cpp => dom/media/wave/WaveDecoder.cpp
rename : content/media/wave/WaveDecoder.h => dom/media/wave/WaveDecoder.h
rename : content/media/wave/WaveReader.cpp => dom/media/wave/WaveReader.cpp
rename : content/media/wave/WaveReader.h => dom/media/wave/WaveReader.h
rename : content/media/wave/moz.build => dom/media/wave/moz.build
rename : content/media/webaudio/AnalyserNode.cpp => dom/media/webaudio/AnalyserNode.cpp
rename : content/media/webaudio/AnalyserNode.h => dom/media/webaudio/AnalyserNode.h
rename : content/media/webaudio/AudioBuffer.cpp => dom/media/webaudio/AudioBuffer.cpp
rename : content/media/webaudio/AudioBuffer.h => dom/media/webaudio/AudioBuffer.h
rename : content/media/webaudio/AudioBufferSourceNode.cpp => dom/media/webaudio/AudioBufferSourceNode.cpp
rename : content/media/webaudio/AudioBufferSourceNode.h => dom/media/webaudio/AudioBufferSourceNode.h
rename : content/media/webaudio/AudioContext.cpp => dom/media/webaudio/AudioContext.cpp
rename : content/media/webaudio/AudioContext.h => dom/media/webaudio/AudioContext.h
rename : content/media/webaudio/AudioDestinationNode.cpp => dom/media/webaudio/AudioDestinationNode.cpp
rename : content/media/webaudio/AudioDestinationNode.h => dom/media/webaudio/AudioDestinationNode.h
rename : content/media/webaudio/AudioEventTimeline.h => dom/media/webaudio/AudioEventTimeline.h
rename : content/media/webaudio/AudioListener.cpp => dom/media/webaudio/AudioListener.cpp
rename : content/media/webaudio/AudioListener.h => dom/media/webaudio/AudioListener.h
rename : content/media/webaudio/AudioNode.cpp => dom/media/webaudio/AudioNode.cpp
rename : content/media/webaudio/AudioNode.h => dom/media/webaudio/AudioNode.h
rename : content/media/webaudio/AudioNodeEngine.cpp => dom/media/webaudio/AudioNodeEngine.cpp
rename : content/media/webaudio/AudioNodeEngine.h => dom/media/webaudio/AudioNodeEngine.h
rename : content/media/webaudio/AudioNodeEngineNEON.cpp => dom/media/webaudio/AudioNodeEngineNEON.cpp
rename : content/media/webaudio/AudioNodeEngineNEON.h => dom/media/webaudio/AudioNodeEngineNEON.h
rename : content/media/webaudio/AudioNodeExternalInputStream.cpp => dom/media/webaudio/AudioNodeExternalInputStream.cpp
rename : content/media/webaudio/AudioNodeExternalInputStream.h => dom/media/webaudio/AudioNodeExternalInputStream.h
rename : content/media/webaudio/AudioNodeStream.cpp => dom/media/webaudio/AudioNodeStream.cpp
rename : content/media/webaudio/AudioNodeStream.h => dom/media/webaudio/AudioNodeStream.h
rename : content/media/webaudio/AudioParam.cpp => dom/media/webaudio/AudioParam.cpp
rename : content/media/webaudio/AudioParam.h => dom/media/webaudio/AudioParam.h
rename : content/media/webaudio/AudioParamTimeline.h => dom/media/webaudio/AudioParamTimeline.h
rename : content/media/webaudio/AudioProcessingEvent.cpp => dom/media/webaudio/AudioProcessingEvent.cpp
rename : content/media/webaudio/AudioProcessingEvent.h => dom/media/webaudio/AudioProcessingEvent.h
rename : content/media/webaudio/BiquadFilterNode.cpp => dom/media/webaudio/BiquadFilterNode.cpp
rename : content/media/webaudio/BiquadFilterNode.h => dom/media/webaudio/BiquadFilterNode.h
rename : content/media/webaudio/BufferDecoder.cpp => dom/media/webaudio/BufferDecoder.cpp
rename : content/media/webaudio/BufferDecoder.h => dom/media/webaudio/BufferDecoder.h
rename : content/media/webaudio/ChannelMergerNode.cpp => dom/media/webaudio/ChannelMergerNode.cpp
rename : content/media/webaudio/ChannelMergerNode.h => dom/media/webaudio/ChannelMergerNode.h
rename : content/media/webaudio/ChannelSplitterNode.cpp => dom/media/webaudio/ChannelSplitterNode.cpp
rename : content/media/webaudio/ChannelSplitterNode.h => dom/media/webaudio/ChannelSplitterNode.h
rename : content/media/webaudio/ConvolverNode.cpp => dom/media/webaudio/ConvolverNode.cpp
rename : content/media/webaudio/ConvolverNode.h => dom/media/webaudio/ConvolverNode.h
rename : content/media/webaudio/DelayBuffer.cpp => dom/media/webaudio/DelayBuffer.cpp
rename : content/media/webaudio/DelayBuffer.h => dom/media/webaudio/DelayBuffer.h
rename : content/media/webaudio/DelayNode.cpp => dom/media/webaudio/DelayNode.cpp
rename : content/media/webaudio/DelayNode.h => dom/media/webaudio/DelayNode.h
rename : content/media/webaudio/DynamicsCompressorNode.cpp => dom/media/webaudio/DynamicsCompressorNode.cpp
rename : content/media/webaudio/DynamicsCompressorNode.h => dom/media/webaudio/DynamicsCompressorNode.h
rename : content/media/webaudio/FFTBlock.cpp => dom/media/webaudio/FFTBlock.cpp
rename : content/media/webaudio/FFTBlock.h => dom/media/webaudio/FFTBlock.h
rename : content/media/webaudio/GainNode.cpp => dom/media/webaudio/GainNode.cpp
rename : content/media/webaudio/GainNode.h => dom/media/webaudio/GainNode.h
rename : content/media/webaudio/MediaBufferDecoder.cpp => dom/media/webaudio/MediaBufferDecoder.cpp
rename : content/media/webaudio/MediaBufferDecoder.h => dom/media/webaudio/MediaBufferDecoder.h
rename : content/media/webaudio/MediaElementAudioSourceNode.cpp => dom/media/webaudio/MediaElementAudioSourceNode.cpp
rename : content/media/webaudio/MediaElementAudioSourceNode.h => dom/media/webaudio/MediaElementAudioSourceNode.h
rename : content/media/webaudio/MediaStreamAudioDestinationNode.cpp => dom/media/webaudio/MediaStreamAudioDestinationNode.cpp
rename : content/media/webaudio/MediaStreamAudioDestinationNode.h => dom/media/webaudio/MediaStreamAudioDestinationNode.h
rename : content/media/webaudio/MediaStreamAudioSourceNode.cpp => dom/media/webaudio/MediaStreamAudioSourceNode.cpp
rename : content/media/webaudio/MediaStreamAudioSourceNode.h => dom/media/webaudio/MediaStreamAudioSourceNode.h
rename : content/media/webaudio/OfflineAudioCompletionEvent.cpp => dom/media/webaudio/OfflineAudioCompletionEvent.cpp
rename : content/media/webaudio/OfflineAudioCompletionEvent.h => dom/media/webaudio/OfflineAudioCompletionEvent.h
rename : content/media/webaudio/OscillatorNode.cpp => dom/media/webaudio/OscillatorNode.cpp
rename : content/media/webaudio/OscillatorNode.h => dom/media/webaudio/OscillatorNode.h
rename : content/media/webaudio/PannerNode.cpp => dom/media/webaudio/PannerNode.cpp
rename : content/media/webaudio/PannerNode.h => dom/media/webaudio/PannerNode.h
rename : content/media/webaudio/PeriodicWave.cpp => dom/media/webaudio/PeriodicWave.cpp
rename : content/media/webaudio/PeriodicWave.h => dom/media/webaudio/PeriodicWave.h
rename : content/media/webaudio/PlayingRefChangeHandler.h => dom/media/webaudio/PlayingRefChangeHandler.h
rename : content/media/webaudio/ReportDecodeResultTask.h => dom/media/webaudio/ReportDecodeResultTask.h
rename : content/media/webaudio/ScriptProcessorNode.cpp => dom/media/webaudio/ScriptProcessorNode.cpp
rename : content/media/webaudio/ScriptProcessorNode.h => dom/media/webaudio/ScriptProcessorNode.h
rename : content/media/webaudio/ThreeDPoint.cpp => dom/media/webaudio/ThreeDPoint.cpp
rename : content/media/webaudio/ThreeDPoint.h => dom/media/webaudio/ThreeDPoint.h
rename : content/media/webaudio/WaveShaperNode.cpp => dom/media/webaudio/WaveShaperNode.cpp
rename : content/media/webaudio/WaveShaperNode.h => dom/media/webaudio/WaveShaperNode.h
rename : content/media/webaudio/WebAudioUtils.cpp => dom/media/webaudio/WebAudioUtils.cpp
rename : content/media/webaudio/WebAudioUtils.h => dom/media/webaudio/WebAudioUtils.h
rename : content/media/webaudio/blink/Biquad.cpp => dom/media/webaudio/blink/Biquad.cpp
rename : content/media/webaudio/blink/Biquad.h => dom/media/webaudio/blink/Biquad.h
rename : content/media/webaudio/blink/DenormalDisabler.h => dom/media/webaudio/blink/DenormalDisabler.h
rename : content/media/webaudio/blink/DirectConvolver.cpp => dom/media/webaudio/blink/DirectConvolver.cpp
rename : content/media/webaudio/blink/DirectConvolver.h => dom/media/webaudio/blink/DirectConvolver.h
rename : content/media/webaudio/blink/DynamicsCompressor.cpp => dom/media/webaudio/blink/DynamicsCompressor.cpp
rename : content/media/webaudio/blink/DynamicsCompressor.h => dom/media/webaudio/blink/DynamicsCompressor.h
rename : content/media/webaudio/blink/DynamicsCompressorKernel.cpp => dom/media/webaudio/blink/DynamicsCompressorKernel.cpp
rename : content/media/webaudio/blink/DynamicsCompressorKernel.h => dom/media/webaudio/blink/DynamicsCompressorKernel.h
rename : content/media/webaudio/blink/FFTConvolver.cpp => dom/media/webaudio/blink/FFTConvolver.cpp
rename : content/media/webaudio/blink/FFTConvolver.h => dom/media/webaudio/blink/FFTConvolver.h
rename : content/media/webaudio/blink/HRTFDatabase.cpp => dom/media/webaudio/blink/HRTFDatabase.cpp
rename : content/media/webaudio/blink/HRTFDatabase.h => dom/media/webaudio/blink/HRTFDatabase.h
rename : content/media/webaudio/blink/HRTFDatabaseLoader.cpp => dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
rename : content/media/webaudio/blink/HRTFDatabaseLoader.h => dom/media/webaudio/blink/HRTFDatabaseLoader.h
rename : content/media/webaudio/blink/HRTFElevation.cpp => dom/media/webaudio/blink/HRTFElevation.cpp
rename : content/media/webaudio/blink/HRTFElevation.h => dom/media/webaudio/blink/HRTFElevation.h
rename : content/media/webaudio/blink/HRTFKernel.cpp => dom/media/webaudio/blink/HRTFKernel.cpp
rename : content/media/webaudio/blink/HRTFKernel.h => dom/media/webaudio/blink/HRTFKernel.h
rename : content/media/webaudio/blink/HRTFPanner.cpp => dom/media/webaudio/blink/HRTFPanner.cpp
rename : content/media/webaudio/blink/HRTFPanner.h => dom/media/webaudio/blink/HRTFPanner.h
rename : content/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp => dom/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp
rename : content/media/webaudio/blink/PeriodicWave.cpp => dom/media/webaudio/blink/PeriodicWave.cpp
rename : content/media/webaudio/blink/PeriodicWave.h => dom/media/webaudio/blink/PeriodicWave.h
rename : content/media/webaudio/blink/README => dom/media/webaudio/blink/README
rename : content/media/webaudio/blink/Reverb.cpp => dom/media/webaudio/blink/Reverb.cpp
rename : content/media/webaudio/blink/Reverb.h => dom/media/webaudio/blink/Reverb.h
rename : content/media/webaudio/blink/ReverbAccumulationBuffer.cpp => dom/media/webaudio/blink/ReverbAccumulationBuffer.cpp
rename : content/media/webaudio/blink/ReverbAccumulationBuffer.h => dom/media/webaudio/blink/ReverbAccumulationBuffer.h
rename : content/media/webaudio/blink/ReverbConvolver.cpp => dom/media/webaudio/blink/ReverbConvolver.cpp
rename : content/media/webaudio/blink/ReverbConvolver.h => dom/media/webaudio/blink/ReverbConvolver.h
rename : content/media/webaudio/blink/ReverbConvolverStage.cpp => dom/media/webaudio/blink/ReverbConvolverStage.cpp
rename : content/media/webaudio/blink/ReverbConvolverStage.h => dom/media/webaudio/blink/ReverbConvolverStage.h
rename : content/media/webaudio/blink/ReverbInputBuffer.cpp => dom/media/webaudio/blink/ReverbInputBuffer.cpp
rename : content/media/webaudio/blink/ReverbInputBuffer.h => dom/media/webaudio/blink/ReverbInputBuffer.h
rename : content/media/webaudio/blink/ZeroPole.cpp => dom/media/webaudio/blink/ZeroPole.cpp
rename : content/media/webaudio/blink/ZeroPole.h => dom/media/webaudio/blink/ZeroPole.h
rename : content/media/webaudio/blink/moz.build => dom/media/webaudio/blink/moz.build
rename : content/media/webaudio/compiledtest/TestAudioEventTimeline.cpp => dom/media/webaudio/compiledtest/TestAudioEventTimeline.cpp
rename : content/media/webaudio/compiledtest/moz.build => dom/media/webaudio/compiledtest/moz.build
rename : content/media/webaudio/moz.build => dom/media/webaudio/moz.build
rename : content/media/webaudio/test/audio-expected.wav => dom/media/webaudio/test/audio-expected.wav
rename : content/media/webaudio/test/audio-mono-expected-2.wav => dom/media/webaudio/test/audio-mono-expected-2.wav
rename : content/media/webaudio/test/audio-mono-expected.wav => dom/media/webaudio/test/audio-mono-expected.wav
rename : content/media/webaudio/test/audio-quad.wav => dom/media/webaudio/test/audio-quad.wav
rename : content/media/webaudio/test/audio.ogv => dom/media/webaudio/test/audio.ogv
rename : content/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js => dom/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js
rename : content/media/webaudio/test/blink/README => dom/media/webaudio/test/blink/README
rename : content/media/webaudio/test/blink/audio-testing.js => dom/media/webaudio/test/blink/audio-testing.js
rename : content/media/webaudio/test/blink/convolution-testing.js => dom/media/webaudio/test/blink/convolution-testing.js
rename : content/media/webaudio/test/blink/mochitest.ini => dom/media/webaudio/test/blink/mochitest.ini
rename : content/media/webaudio/test/blink/panner-model-testing.js => dom/media/webaudio/test/blink/panner-model-testing.js
rename : content/media/webaudio/test/browser.ini => dom/media/webaudio/test/browser.ini
rename : content/media/webaudio/test/browser_mozAudioChannel.html => dom/media/webaudio/test/browser_mozAudioChannel.html
rename : content/media/webaudio/test/browser_mozAudioChannel.js => dom/media/webaudio/test/browser_mozAudioChannel.js
rename : content/media/webaudio/test/browser_mozAudioChannel_muted.html => dom/media/webaudio/test/browser_mozAudioChannel_muted.html
rename : content/media/webaudio/test/browser_mozAudioChannel_muted.js => dom/media/webaudio/test/browser_mozAudioChannel_muted.js
rename : content/media/webaudio/test/chrome.ini => dom/media/webaudio/test/chrome.ini
rename : content/media/webaudio/test/invalid.txt => dom/media/webaudio/test/invalid.txt
rename : content/media/webaudio/test/layouttest-glue.js => dom/media/webaudio/test/layouttest-glue.js
rename : content/media/webaudio/test/mochitest.ini => dom/media/webaudio/test/mochitest.ini
rename : content/media/webaudio/test/noaudio.webm => dom/media/webaudio/test/noaudio.webm
rename : content/media/webaudio/test/small-shot-expected.wav => dom/media/webaudio/test/small-shot-expected.wav
rename : content/media/webaudio/test/small-shot-mono-expected.wav => dom/media/webaudio/test/small-shot-mono-expected.wav
rename : content/media/webaudio/test/small-shot.mp3 => dom/media/webaudio/test/small-shot.mp3
rename : content/media/webaudio/test/small-shot.ogg => dom/media/webaudio/test/small-shot.ogg
rename : content/media/webaudio/test/test_AudioBuffer.html => dom/media/webaudio/test/test_AudioBuffer.html
rename : content/media/webaudio/test/test_AudioContext.html => dom/media/webaudio/test/test_AudioContext.html
rename : content/media/webaudio/test/test_AudioListener.html => dom/media/webaudio/test/test_AudioListener.html
rename : content/media/webaudio/test/test_AudioNodeDevtoolsAPI.html => dom/media/webaudio/test/test_AudioNodeDevtoolsAPI.html
rename : content/media/webaudio/test/test_OfflineAudioContext.html => dom/media/webaudio/test/test_OfflineAudioContext.html
rename : content/media/webaudio/test/test_analyserNode.html => dom/media/webaudio/test/test_analyserNode.html
rename : content/media/webaudio/test/test_analyserNodeOutput.html => dom/media/webaudio/test/test_analyserNodeOutput.html
rename : content/media/webaudio/test/test_analyserNodePassThrough.html => dom/media/webaudio/test/test_analyserNodePassThrough.html
rename : content/media/webaudio/test/test_audioBufferSourceNode.html => dom/media/webaudio/test/test_audioBufferSourceNode.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeEnded.html => dom/media/webaudio/test/test_audioBufferSourceNodeEnded.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html => dom/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeLoop.html => dom/media/webaudio/test/test_audioBufferSourceNodeLoop.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html => dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html => dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeNeutered.html => dom/media/webaudio/test/test_audioBufferSourceNodeNeutered.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeNoStart.html => dom/media/webaudio/test/test_audioBufferSourceNodeNoStart.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html => dom/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html
rename : content/media/webaudio/test/test_audioBufferSourceNodeOffset.html => dom/media/webaudio/test/test_audioBufferSourceNodeOffset.html
rename : content/media/webaudio/test/test_audioBufferSourceNodePassThrough.html => dom/media/webaudio/test/test_audioBufferSourceNodePassThrough.html
rename : content/media/webaudio/test/test_audioDestinationNode.html => dom/media/webaudio/test/test_audioDestinationNode.html
rename : content/media/webaudio/test/test_audioParamExponentialRamp.html => dom/media/webaudio/test/test_audioParamExponentialRamp.html
rename : content/media/webaudio/test/test_audioParamGain.html => dom/media/webaudio/test/test_audioParamGain.html
rename : content/media/webaudio/test/test_audioParamLinearRamp.html => dom/media/webaudio/test/test_audioParamLinearRamp.html
rename : content/media/webaudio/test/test_audioParamSetCurveAtTime.html => dom/media/webaudio/test/test_audioParamSetCurveAtTime.html
rename : content/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html => dom/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html
rename : content/media/webaudio/test/test_audioParamSetTargetAtTime.html => dom/media/webaudio/test/test_audioParamSetTargetAtTime.html
rename : content/media/webaudio/test/test_audioParamSetValueAtTime.html => dom/media/webaudio/test/test_audioParamSetValueAtTime.html
rename : content/media/webaudio/test/test_audioParamTimelineDestinationOffset.html => dom/media/webaudio/test/test_audioParamTimelineDestinationOffset.html
rename : content/media/webaudio/test/test_badConnect.html => dom/media/webaudio/test/test_badConnect.html
rename : content/media/webaudio/test/test_biquadFilterNode.html => dom/media/webaudio/test/test_biquadFilterNode.html
rename : content/media/webaudio/test/test_biquadFilterNodePassThrough.html => dom/media/webaudio/test/test_biquadFilterNodePassThrough.html
rename : content/media/webaudio/test/test_biquadFilterNodeWithGain.html => dom/media/webaudio/test/test_biquadFilterNodeWithGain.html
rename : content/media/webaudio/test/test_bug1056032.html => dom/media/webaudio/test/test_bug1056032.html
rename : content/media/webaudio/test/test_bug808374.html => dom/media/webaudio/test/test_bug808374.html
rename : content/media/webaudio/test/test_bug827541.html => dom/media/webaudio/test/test_bug827541.html
rename : content/media/webaudio/test/test_bug839753.html => dom/media/webaudio/test/test_bug839753.html
rename : content/media/webaudio/test/test_bug845960.html => dom/media/webaudio/test/test_bug845960.html
rename : content/media/webaudio/test/test_bug856771.html => dom/media/webaudio/test/test_bug856771.html
rename : content/media/webaudio/test/test_bug866570.html => dom/media/webaudio/test/test_bug866570.html
rename : content/media/webaudio/test/test_bug866737.html => dom/media/webaudio/test/test_bug866737.html
rename : content/media/webaudio/test/test_bug867089.html => dom/media/webaudio/test/test_bug867089.html
rename : content/media/webaudio/test/test_bug867104.html => dom/media/webaudio/test/test_bug867104.html
rename : content/media/webaudio/test/test_bug867174.html => dom/media/webaudio/test/test_bug867174.html
rename : content/media/webaudio/test/test_bug867203.html => dom/media/webaudio/test/test_bug867203.html
rename : content/media/webaudio/test/test_bug875221.html => dom/media/webaudio/test/test_bug875221.html
rename : content/media/webaudio/test/test_bug875402.html => dom/media/webaudio/test/test_bug875402.html
rename : content/media/webaudio/test/test_bug894150.html => dom/media/webaudio/test/test_bug894150.html
rename : content/media/webaudio/test/test_bug956489.html => dom/media/webaudio/test/test_bug956489.html
rename : content/media/webaudio/test/test_bug964376.html => dom/media/webaudio/test/test_bug964376.html
rename : content/media/webaudio/test/test_bug972678.html => dom/media/webaudio/test/test_bug972678.html
rename : content/media/webaudio/test/test_channelMergerNode.html => dom/media/webaudio/test/test_channelMergerNode.html
rename : content/media/webaudio/test/test_channelMergerNodeWithVolume.html => dom/media/webaudio/test/test_channelMergerNodeWithVolume.html
rename : content/media/webaudio/test/test_channelSplitterNode.html => dom/media/webaudio/test/test_channelSplitterNode.html
rename : content/media/webaudio/test/test_channelSplitterNodeWithVolume.html => dom/media/webaudio/test/test_channelSplitterNodeWithVolume.html
rename : content/media/webaudio/test/test_convolverNode.html => dom/media/webaudio/test/test_convolverNode.html
rename : content/media/webaudio/test/test_convolverNodeChannelCount.html => dom/media/webaudio/test/test_convolverNodeChannelCount.html
rename : content/media/webaudio/test/test_convolverNodePassThrough.html => dom/media/webaudio/test/test_convolverNodePassThrough.html
rename : content/media/webaudio/test/test_convolverNodeWithGain.html => dom/media/webaudio/test/test_convolverNodeWithGain.html
rename : content/media/webaudio/test/test_convolverNode_mono_mono.html => dom/media/webaudio/test/test_convolverNode_mono_mono.html
rename : content/media/webaudio/test/test_currentTime.html => dom/media/webaudio/test/test_currentTime.html
rename : content/media/webaudio/test/test_decodeMultichannel.html => dom/media/webaudio/test/test_decodeMultichannel.html
rename : content/media/webaudio/test/test_delayNode.html => dom/media/webaudio/test/test_delayNode.html
rename : content/media/webaudio/test/test_delayNodeAtMax.html => dom/media/webaudio/test/test_delayNodeAtMax.html
rename : content/media/webaudio/test/test_delayNodeChannelChanges.html => dom/media/webaudio/test/test_delayNodeChannelChanges.html
rename : content/media/webaudio/test/test_delayNodeCycles.html => dom/media/webaudio/test/test_delayNodeCycles.html
rename : content/media/webaudio/test/test_delayNodePassThrough.html => dom/media/webaudio/test/test_delayNodePassThrough.html
rename : content/media/webaudio/test/test_delayNodeSmallMaxDelay.html => dom/media/webaudio/test/test_delayNodeSmallMaxDelay.html
rename : content/media/webaudio/test/test_delayNodeTailIncrease.html => dom/media/webaudio/test/test_delayNodeTailIncrease.html
rename : content/media/webaudio/test/test_delayNodeTailWithDisconnect.html => dom/media/webaudio/test/test_delayNodeTailWithDisconnect.html
rename : content/media/webaudio/test/test_delayNodeTailWithGain.html => dom/media/webaudio/test/test_delayNodeTailWithGain.html
rename : content/media/webaudio/test/test_delayNodeTailWithReconnect.html => dom/media/webaudio/test/test_delayNodeTailWithReconnect.html
rename : content/media/webaudio/test/test_delayNodeWithGain.html => dom/media/webaudio/test/test_delayNodeWithGain.html
rename : content/media/webaudio/test/test_dynamicsCompressorNode.html => dom/media/webaudio/test/test_dynamicsCompressorNode.html
rename : content/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html => dom/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html
rename : content/media/webaudio/test/test_gainNode.html => dom/media/webaudio/test/test_gainNode.html
rename : content/media/webaudio/test/test_gainNodeInLoop.html => dom/media/webaudio/test/test_gainNodeInLoop.html
rename : content/media/webaudio/test/test_gainNodePassThrough.html => dom/media/webaudio/test/test_gainNodePassThrough.html
rename : content/media/webaudio/test/test_maxChannelCount.html => dom/media/webaudio/test/test_maxChannelCount.html
rename : content/media/webaudio/test/test_mediaDecoding.html => dom/media/webaudio/test/test_mediaDecoding.html
rename : content/media/webaudio/test/test_mediaElementAudioSourceNode.html => dom/media/webaudio/test/test_mediaElementAudioSourceNode.html
rename : content/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html => dom/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html
rename : content/media/webaudio/test/test_mediaStreamAudioDestinationNode.html => dom/media/webaudio/test/test_mediaStreamAudioDestinationNode.html
rename : content/media/webaudio/test/test_mediaStreamAudioSourceNode.html => dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html
rename : content/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html => dom/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html
rename : content/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html => dom/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html
rename : content/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html => dom/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html
rename : content/media/webaudio/test/test_mixingRules.html => dom/media/webaudio/test/test_mixingRules.html
rename : content/media/webaudio/test/test_mozaudiochannel.html => dom/media/webaudio/test/test_mozaudiochannel.html
rename : content/media/webaudio/test/test_nodeToParamConnection.html => dom/media/webaudio/test/test_nodeToParamConnection.html
rename : content/media/webaudio/test/test_offlineDestinationChannelCountLess.html => dom/media/webaudio/test/test_offlineDestinationChannelCountLess.html
rename : content/media/webaudio/test/test_offlineDestinationChannelCountMore.html => dom/media/webaudio/test/test_offlineDestinationChannelCountMore.html
rename : content/media/webaudio/test/test_oscillatorNode.html => dom/media/webaudio/test/test_oscillatorNode.html
rename : content/media/webaudio/test/test_oscillatorNode2.html => dom/media/webaudio/test/test_oscillatorNode2.html
rename : content/media/webaudio/test/test_oscillatorNodePassThrough.html => dom/media/webaudio/test/test_oscillatorNodePassThrough.html
rename : content/media/webaudio/test/test_oscillatorNodeStart.html => dom/media/webaudio/test/test_oscillatorNodeStart.html
rename : content/media/webaudio/test/test_oscillatorTypeChange.html => dom/media/webaudio/test/test_oscillatorTypeChange.html
rename : content/media/webaudio/test/test_pannerNode.html => dom/media/webaudio/test/test_pannerNode.html
rename : content/media/webaudio/test/test_pannerNodeAbove.html => dom/media/webaudio/test/test_pannerNodeAbove.html
rename : content/media/webaudio/test/test_pannerNodeChannelCount.html => dom/media/webaudio/test/test_pannerNodeChannelCount.html
rename : content/media/webaudio/test/test_pannerNodeHRTFSymmetry.html => dom/media/webaudio/test/test_pannerNodeHRTFSymmetry.html
rename : content/media/webaudio/test/test_pannerNodePassThrough.html => dom/media/webaudio/test/test_pannerNodePassThrough.html
rename : content/media/webaudio/test/test_pannerNodeTail.html => dom/media/webaudio/test/test_pannerNodeTail.html
rename : content/media/webaudio/test/test_pannerNode_equalPower.html => dom/media/webaudio/test/test_pannerNode_equalPower.html
rename : content/media/webaudio/test/test_periodicWave.html => dom/media/webaudio/test/test_periodicWave.html
rename : content/media/webaudio/test/test_scriptProcessorNode.html => dom/media/webaudio/test/test_scriptProcessorNode.html
rename : content/media/webaudio/test/test_scriptProcessorNodeChannelCount.html => dom/media/webaudio/test/test_scriptProcessorNodeChannelCount.html
rename : content/media/webaudio/test/test_scriptProcessorNodeNotConnected.html => dom/media/webaudio/test/test_scriptProcessorNodeNotConnected.html
rename : content/media/webaudio/test/test_scriptProcessorNodePassThrough.html => dom/media/webaudio/test/test_scriptProcessorNodePassThrough.html
rename : content/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html => dom/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html
rename : content/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html => dom/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html
rename : content/media/webaudio/test/test_singleSourceDest.html => dom/media/webaudio/test/test_singleSourceDest.html
rename : content/media/webaudio/test/test_stereoPanningWithGain.html => dom/media/webaudio/test/test_stereoPanningWithGain.html
rename : content/media/webaudio/test/test_waveDecoder.html => dom/media/webaudio/test/test_waveDecoder.html
rename : content/media/webaudio/test/test_waveShaper.html => dom/media/webaudio/test/test_waveShaper.html
rename : content/media/webaudio/test/test_waveShaperNoCurve.html => dom/media/webaudio/test/test_waveShaperNoCurve.html
rename : content/media/webaudio/test/test_waveShaperPassThrough.html => dom/media/webaudio/test/test_waveShaperPassThrough.html
rename : content/media/webaudio/test/test_waveShaperZeroLengthCurve.html => dom/media/webaudio/test/test_waveShaperZeroLengthCurve.html
rename : content/media/webaudio/test/ting-44.1k-1ch.ogg => dom/media/webaudio/test/ting-44.1k-1ch.ogg
rename : content/media/webaudio/test/ting-44.1k-1ch.wav => dom/media/webaudio/test/ting-44.1k-1ch.wav
rename : content/media/webaudio/test/ting-44.1k-2ch.ogg => dom/media/webaudio/test/ting-44.1k-2ch.ogg
rename : content/media/webaudio/test/ting-44.1k-2ch.wav => dom/media/webaudio/test/ting-44.1k-2ch.wav
rename : content/media/webaudio/test/ting-48k-1ch.ogg => dom/media/webaudio/test/ting-48k-1ch.ogg
rename : content/media/webaudio/test/ting-48k-1ch.wav => dom/media/webaudio/test/ting-48k-1ch.wav
rename : content/media/webaudio/test/ting-48k-2ch.ogg => dom/media/webaudio/test/ting-48k-2ch.ogg
rename : content/media/webaudio/test/ting-48k-2ch.wav => dom/media/webaudio/test/ting-48k-2ch.wav
rename : content/media/webaudio/test/ting-dualchannel44.1.wav => dom/media/webaudio/test/ting-dualchannel44.1.wav
rename : content/media/webaudio/test/ting-dualchannel48.wav => dom/media/webaudio/test/ting-dualchannel48.wav
rename : content/media/webaudio/test/webaudio.js => dom/media/webaudio/test/webaudio.js
rename : content/media/webm/EbmlComposer.cpp => dom/media/webm/EbmlComposer.cpp
rename : content/media/webm/EbmlComposer.h => dom/media/webm/EbmlComposer.h
rename : content/media/webm/WebMBufferedParser.cpp => dom/media/webm/WebMBufferedParser.cpp
rename : content/media/webm/WebMBufferedParser.h => dom/media/webm/WebMBufferedParser.h
rename : content/media/webm/WebMDecoder.cpp => dom/media/webm/WebMDecoder.cpp
rename : content/media/webm/WebMDecoder.h => dom/media/webm/WebMDecoder.h
rename : content/media/webm/WebMReader.cpp => dom/media/webm/WebMReader.cpp
rename : content/media/webm/WebMReader.h => dom/media/webm/WebMReader.h
rename : content/media/webm/WebMWriter.cpp => dom/media/webm/WebMWriter.cpp
rename : content/media/webm/WebMWriter.h => dom/media/webm/WebMWriter.h
rename : content/media/webm/moz.build => dom/media/webm/moz.build
rename : content/media/webrtc/AudioOutputObserver.h => dom/media/webrtc/AudioOutputObserver.h
rename : content/media/webrtc/MediaEngine.h => dom/media/webrtc/MediaEngine.h
rename : content/media/webrtc/MediaEngineCameraVideoSource.cpp => dom/media/webrtc/MediaEngineCameraVideoSource.cpp
rename : content/media/webrtc/MediaEngineCameraVideoSource.h => dom/media/webrtc/MediaEngineCameraVideoSource.h
rename : content/media/webrtc/MediaEngineDefault.cpp => dom/media/webrtc/MediaEngineDefault.cpp
rename : content/media/webrtc/MediaEngineDefault.h => dom/media/webrtc/MediaEngineDefault.h
rename : content/media/webrtc/MediaEngineGonkVideoSource.cpp => dom/media/webrtc/MediaEngineGonkVideoSource.cpp
rename : content/media/webrtc/MediaEngineGonkVideoSource.h => dom/media/webrtc/MediaEngineGonkVideoSource.h
rename : content/media/webrtc/MediaEngineTabVideoSource.cpp => dom/media/webrtc/MediaEngineTabVideoSource.cpp
rename : content/media/webrtc/MediaEngineTabVideoSource.h => dom/media/webrtc/MediaEngineTabVideoSource.h
rename : content/media/webrtc/MediaEngineWebRTC.cpp => dom/media/webrtc/MediaEngineWebRTC.cpp
rename : content/media/webrtc/MediaEngineWebRTC.h => dom/media/webrtc/MediaEngineWebRTC.h
rename : content/media/webrtc/MediaEngineWebRTCAudio.cpp => dom/media/webrtc/MediaEngineWebRTCAudio.cpp
rename : content/media/webrtc/MediaEngineWebRTCVideo.cpp => dom/media/webrtc/MediaEngineWebRTCVideo.cpp
rename : content/media/webrtc/MediaTrackConstraints.h => dom/media/webrtc/MediaTrackConstraints.h
rename : content/media/webrtc/PeerIdentity.cpp => dom/media/webrtc/PeerIdentity.cpp
rename : content/media/webrtc/PeerIdentity.h => dom/media/webrtc/PeerIdentity.h
rename : content/media/webrtc/moz.build => dom/media/webrtc/moz.build
rename : content/media/webrtc/nsITabSource.idl => dom/media/webrtc/nsITabSource.idl
rename : content/media/webspeech/moz.build => dom/media/webspeech/moz.build
rename : content/media/webspeech/recognition/SpeechGrammar.cpp => dom/media/webspeech/recognition/SpeechGrammar.cpp
rename : content/media/webspeech/recognition/SpeechGrammar.h => dom/media/webspeech/recognition/SpeechGrammar.h
rename : content/media/webspeech/recognition/SpeechGrammarList.cpp => dom/media/webspeech/recognition/SpeechGrammarList.cpp
rename : content/media/webspeech/recognition/SpeechGrammarList.h => dom/media/webspeech/recognition/SpeechGrammarList.h
rename : content/media/webspeech/recognition/SpeechRecognition.cpp => dom/media/webspeech/recognition/SpeechRecognition.cpp
rename : content/media/webspeech/recognition/SpeechRecognition.h => dom/media/webspeech/recognition/SpeechRecognition.h
rename : content/media/webspeech/recognition/SpeechRecognitionAlternative.cpp => dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp
rename : content/media/webspeech/recognition/SpeechRecognitionAlternative.h => dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
rename : content/media/webspeech/recognition/SpeechRecognitionResult.cpp => dom/media/webspeech/recognition/SpeechRecognitionResult.cpp
rename : content/media/webspeech/recognition/SpeechRecognitionResult.h => dom/media/webspeech/recognition/SpeechRecognitionResult.h
rename : content/media/webspeech/recognition/SpeechRecognitionResultList.cpp => dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp
rename : content/media/webspeech/recognition/SpeechRecognitionResultList.h => dom/media/webspeech/recognition/SpeechRecognitionResultList.h
rename : content/media/webspeech/recognition/SpeechStreamListener.cpp => dom/media/webspeech/recognition/SpeechStreamListener.cpp
rename : content/media/webspeech/recognition/SpeechStreamListener.h => dom/media/webspeech/recognition/SpeechStreamListener.h
rename : content/media/webspeech/recognition/endpointer.cc => dom/media/webspeech/recognition/endpointer.cc
rename : content/media/webspeech/recognition/endpointer.h => dom/media/webspeech/recognition/endpointer.h
rename : content/media/webspeech/recognition/energy_endpointer.cc => dom/media/webspeech/recognition/energy_endpointer.cc
rename : content/media/webspeech/recognition/energy_endpointer.h => dom/media/webspeech/recognition/energy_endpointer.h
rename : content/media/webspeech/recognition/energy_endpointer_params.cc => dom/media/webspeech/recognition/energy_endpointer_params.cc
rename : content/media/webspeech/recognition/energy_endpointer_params.h => dom/media/webspeech/recognition/energy_endpointer_params.h
rename : content/media/webspeech/recognition/moz.build => dom/media/webspeech/recognition/moz.build
rename : content/media/webspeech/recognition/nsISpeechRecognitionService.idl => dom/media/webspeech/recognition/nsISpeechRecognitionService.idl
rename : content/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp => dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp
rename : content/media/webspeech/recognition/test/FakeSpeechRecognitionService.h => dom/media/webspeech/recognition/test/FakeSpeechRecognitionService.h
rename : content/media/webspeech/recognition/test/head.js => dom/media/webspeech/recognition/test/head.js
rename : content/media/webspeech/recognition/test/hello.ogg => dom/media/webspeech/recognition/test/hello.ogg
rename : content/media/webspeech/recognition/test/hello.ogg^headers^ => dom/media/webspeech/recognition/test/hello.ogg^headers^
rename : content/media/webspeech/recognition/test/mochitest.ini => dom/media/webspeech/recognition/test/mochitest.ini
rename : content/media/webspeech/recognition/test/silence.ogg => dom/media/webspeech/recognition/test/silence.ogg
rename : content/media/webspeech/recognition/test/silence.ogg^headers^ => dom/media/webspeech/recognition/test/silence.ogg^headers^
rename : content/media/webspeech/recognition/test/test_abort.html => dom/media/webspeech/recognition/test/test_abort.html
rename : content/media/webspeech/recognition/test/test_audio_capture_error.html => dom/media/webspeech/recognition/test/test_audio_capture_error.html
rename : content/media/webspeech/recognition/test/test_call_start_from_end_handler.html => dom/media/webspeech/recognition/test/test_call_start_from_end_handler.html
rename : content/media/webspeech/recognition/test/test_nested_eventloop.html => dom/media/webspeech/recognition/test/test_nested_eventloop.html
rename : content/media/webspeech/recognition/test/test_preference_enable.html => dom/media/webspeech/recognition/test/test_preference_enable.html
rename : content/media/webspeech/recognition/test/test_recognition_service_error.html => dom/media/webspeech/recognition/test/test_recognition_service_error.html
rename : content/media/webspeech/recognition/test/test_success_without_recognition_service.html => dom/media/webspeech/recognition/test/test_success_without_recognition_service.html
rename : content/media/webspeech/recognition/test/test_timeout.html => dom/media/webspeech/recognition/test/test_timeout.html
rename : content/media/webspeech/synth/SpeechSynthesis.cpp => dom/media/webspeech/synth/SpeechSynthesis.cpp
rename : content/media/webspeech/synth/SpeechSynthesis.h => dom/media/webspeech/synth/SpeechSynthesis.h
rename : content/media/webspeech/synth/SpeechSynthesisUtterance.cpp => dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp
rename : content/media/webspeech/synth/SpeechSynthesisUtterance.h => dom/media/webspeech/synth/SpeechSynthesisUtterance.h
rename : content/media/webspeech/synth/SpeechSynthesisVoice.cpp => dom/media/webspeech/synth/SpeechSynthesisVoice.cpp
rename : content/media/webspeech/synth/SpeechSynthesisVoice.h => dom/media/webspeech/synth/SpeechSynthesisVoice.h
rename : content/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl => dom/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl
rename : content/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl => dom/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl
rename : content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp => dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
rename : content/media/webspeech/synth/ipc/SpeechSynthesisChild.h => dom/media/webspeech/synth/ipc/SpeechSynthesisChild.h
rename : content/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp => dom/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp
rename : content/media/webspeech/synth/ipc/SpeechSynthesisParent.h => dom/media/webspeech/synth/ipc/SpeechSynthesisParent.h
rename : content/media/webspeech/synth/ipc/test/file_ipc.html => dom/media/webspeech/synth/ipc/test/file_ipc.html
rename : content/media/webspeech/synth/ipc/test/mochitest.ini => dom/media/webspeech/synth/ipc/test/mochitest.ini
rename : content/media/webspeech/synth/ipc/test/test_ipc.html => dom/media/webspeech/synth/ipc/test/test_ipc.html
rename : content/media/webspeech/synth/moz.build => dom/media/webspeech/synth/moz.build
rename : content/media/webspeech/synth/nsISpeechService.idl => dom/media/webspeech/synth/nsISpeechService.idl
rename : content/media/webspeech/synth/nsISynthVoiceRegistry.idl => dom/media/webspeech/synth/nsISynthVoiceRegistry.idl
rename : content/media/webspeech/synth/nsSpeechTask.cpp => dom/media/webspeech/synth/nsSpeechTask.cpp
rename : content/media/webspeech/synth/nsSpeechTask.h => dom/media/webspeech/synth/nsSpeechTask.h
rename : content/media/webspeech/synth/nsSynthVoiceRegistry.cpp => dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
rename : content/media/webspeech/synth/nsSynthVoiceRegistry.h => dom/media/webspeech/synth/nsSynthVoiceRegistry.h
rename : content/media/webspeech/synth/pico/PicoModule.cpp => dom/media/webspeech/synth/pico/PicoModule.cpp
rename : content/media/webspeech/synth/pico/moz.build => dom/media/webspeech/synth/pico/moz.build
rename : content/media/webspeech/synth/pico/nsPicoService.cpp => dom/media/webspeech/synth/pico/nsPicoService.cpp
rename : content/media/webspeech/synth/pico/nsPicoService.h => dom/media/webspeech/synth/pico/nsPicoService.h
rename : content/media/webspeech/synth/test/common.js => dom/media/webspeech/synth/test/common.js
rename : content/media/webspeech/synth/test/file_setup.html => dom/media/webspeech/synth/test/file_setup.html
rename : content/media/webspeech/synth/test/file_speech_queue.html => dom/media/webspeech/synth/test/file_speech_queue.html
rename : content/media/webspeech/synth/test/file_speech_simple.html => dom/media/webspeech/synth/test/file_speech_simple.html
rename : content/media/webspeech/synth/test/mochitest.ini => dom/media/webspeech/synth/test/mochitest.ini
rename : content/media/webspeech/synth/test/test_setup.html => dom/media/webspeech/synth/test/test_setup.html
rename : content/media/webspeech/synth/test/test_speech_queue.html => dom/media/webspeech/synth/test/test_speech_queue.html
rename : content/media/webspeech/synth/test/test_speech_simple.html => dom/media/webspeech/synth/test/test_speech_simple.html
rename : content/media/webvtt/WebVTT.manifest => dom/media/webvtt/WebVTT.manifest
rename : content/media/webvtt/WebVTTParserWrapper.js => dom/media/webvtt/WebVTTParserWrapper.js
rename : content/media/webvtt/moz.build => dom/media/webvtt/moz.build
rename : content/media/webvtt/nsIWebVTTListener.idl => dom/media/webvtt/nsIWebVTTListener.idl
rename : content/media/webvtt/nsIWebVTTParserWrapper.idl => dom/media/webvtt/nsIWebVTTParserWrapper.idl
rename : content/media/webvtt/package.json => dom/media/webvtt/package.json
rename : content/media/webvtt/update-webvtt.js => dom/media/webvtt/update-webvtt.js
rename : content/media/webvtt/vtt.jsm => dom/media/webvtt/vtt.jsm
rename : content/media/wmf/DXVA2Manager.cpp => dom/media/wmf/DXVA2Manager.cpp
rename : content/media/wmf/DXVA2Manager.h => dom/media/wmf/DXVA2Manager.h
rename : content/media/wmf/WMF.h => dom/media/wmf/WMF.h
rename : content/media/wmf/WMFByteStream.cpp => dom/media/wmf/WMFByteStream.cpp
rename : content/media/wmf/WMFByteStream.h => dom/media/wmf/WMFByteStream.h
rename : content/media/wmf/WMFDecoder.cpp => dom/media/wmf/WMFDecoder.cpp
rename : content/media/wmf/WMFDecoder.h => dom/media/wmf/WMFDecoder.h
rename : content/media/wmf/WMFReader.cpp => dom/media/wmf/WMFReader.cpp
rename : content/media/wmf/WMFReader.h => dom/media/wmf/WMFReader.h
rename : content/media/wmf/WMFSourceReaderCallback.cpp => dom/media/wmf/WMFSourceReaderCallback.cpp
rename : content/media/wmf/WMFSourceReaderCallback.h => dom/media/wmf/WMFSourceReaderCallback.h
rename : content/media/wmf/WMFUtils.cpp => dom/media/wmf/WMFUtils.cpp
rename : content/media/wmf/WMFUtils.h => dom/media/wmf/WMFUtils.h
rename : content/media/wmf/moz.build => dom/media/wmf/moz.build
---
 accessible/tests/mochitest/a11y.ini           |   2 +-
 .../base/test/file_mixed_content_main.html    |   2 +-
 content/html/content/src/moz.build            |   2 +-
 content/media/moz.build                       | 214 ----------------
 content/moz.build                             |   1 -
 dom/bindings/moz.build                        |   4 +-
 dom/browser-element/mochitest/mochitest.ini   |   2 +-
 .../crossorigin/test_video_crossorigin.html   |   4 +-
 dom/ipc/moz.build                             |   2 +-
 {content => dom}/media/AbstractMediaDecoder.h |   0
 {content => dom}/media/AudioBufferUtils.h     |   0
 {content => dom}/media/AudioChannelFormat.cpp |   0
 {content => dom}/media/AudioChannelFormat.h   |   0
 {content => dom}/media/AudioCompactor.cpp     |   0
 {content => dom}/media/AudioCompactor.h       |   0
 {content => dom}/media/AudioMixer.h           |   0
 {content => dom}/media/AudioSampleFormat.h    |   0
 {content => dom}/media/AudioSegment.cpp       |   0
 {content => dom}/media/AudioSegment.h         |   0
 {content => dom}/media/AudioSink.cpp          |   0
 {content => dom}/media/AudioSink.h            |   0
 {content => dom}/media/AudioStream.cpp        |   0
 {content => dom}/media/AudioStream.h          |   0
 {content => dom}/media/AudioStreamTrack.cpp   |   0
 {content => dom}/media/AudioStreamTrack.h     |   0
 {content => dom}/media/AudioTrack.cpp         |   0
 {content => dom}/media/AudioTrack.h           |   0
 {content => dom}/media/AudioTrackList.cpp     |   0
 {content => dom}/media/AudioTrackList.h       |   0
 {content => dom}/media/BufferMediaResource.h  |   0
 {content => dom}/media/CubebUtils.cpp         |   0
 {content => dom}/media/CubebUtils.h           |   0
 {content => dom}/media/DOMMediaStream.cpp     |   0
 {content => dom}/media/DOMMediaStream.h       |   2 +-
 {content => dom}/media/DecoderTraits.cpp      |   0
 {content => dom}/media/DecoderTraits.h        |   0
 {content => dom}/media/EncodedBufferCache.cpp |   0
 {content => dom}/media/EncodedBufferCache.h   |   0
 {content => dom}/media/FileBlockCache.cpp     |   0
 {content => dom}/media/FileBlockCache.h       |   0
 {content => dom}/media/GraphDriver.cpp        |   0
 {content => dom}/media/GraphDriver.h          |   0
 {content => dom}/media/Latency.cpp            |   0
 {content => dom}/media/Latency.h              |   0
 {content => dom}/media/MP3FrameParser.cpp     |   0
 {content => dom}/media/MP3FrameParser.h       |   0
 {content => dom}/media/MediaCache.cpp         |   0
 {content => dom}/media/MediaCache.h           |   0
 {content => dom}/media/MediaData.cpp          |   0
 {content => dom}/media/MediaData.h            |   0
 .../media/MediaDataDecodedListener.h          |   0
 {content => dom}/media/MediaDecoder.cpp       |   0
 {content => dom}/media/MediaDecoder.h         |   0
 {content => dom}/media/MediaDecoderOwner.h    |   0
 {content => dom}/media/MediaDecoderReader.cpp |   0
 {content => dom}/media/MediaDecoderReader.h   |   0
 .../media/MediaDecoderStateMachine.cpp        |   0
 .../media/MediaDecoderStateMachine.h          |   0
 .../MediaDecoderStateMachineScheduler.cpp     |   0
 .../media/MediaDecoderStateMachineScheduler.h |   0
 {content => dom}/media/MediaInfo.h            |   0
 {content => dom}/media/MediaMetadataManager.h |   0
 {content => dom}/media/MediaQueue.h           |   0
 {content => dom}/media/MediaRecorder.cpp      |   4 +
 {content => dom}/media/MediaRecorder.h        |   0
 {content => dom}/media/MediaResource.cpp      |   0
 {content => dom}/media/MediaResource.h        |   0
 {content => dom}/media/MediaSegment.h         |   0
 .../media/MediaShutdownManager.cpp            |   0
 {content => dom}/media/MediaShutdownManager.h |   0
 {content => dom}/media/MediaStreamGraph.cpp   |   0
 {content => dom}/media/MediaStreamGraph.h     |   0
 {content => dom}/media/MediaStreamGraphImpl.h |   0
 {content => dom}/media/MediaStreamTrack.cpp   |   0
 {content => dom}/media/MediaStreamTrack.h     |   0
 {content => dom}/media/MediaTaskQueue.cpp     |   0
 {content => dom}/media/MediaTaskQueue.h       |   0
 {content => dom}/media/MediaTrack.cpp         |   0
 {content => dom}/media/MediaTrack.h           |   0
 {content => dom}/media/MediaTrackList.cpp     |   0
 {content => dom}/media/MediaTrackList.h       |   0
 {content => dom}/media/RtspMediaResource.cpp  |   0
 {content => dom}/media/RtspMediaResource.h    |   0
 {content => dom}/media/SharedBuffer.h         |   0
 {content => dom}/media/SharedThreadPool.cpp   |   0
 {content => dom}/media/SharedThreadPool.h     |   0
 {content => dom}/media/StreamBuffer.cpp       |   0
 {content => dom}/media/StreamBuffer.h         |   0
 {content => dom}/media/TextTrack.cpp          |   0
 {content => dom}/media/TextTrack.h            |   0
 {content => dom}/media/TextTrackCue.cpp       |   0
 {content => dom}/media/TextTrackCue.h         |   0
 {content => dom}/media/TextTrackCueList.cpp   |   0
 {content => dom}/media/TextTrackCueList.h     |   0
 {content => dom}/media/TextTrackList.cpp      |   0
 {content => dom}/media/TextTrackList.h        |   0
 {content => dom}/media/TextTrackRegion.cpp    |   0
 {content => dom}/media/TextTrackRegion.h      |   0
 .../media/ThreadPoolCOMListener.cpp           |   0
 .../media/ThreadPoolCOMListener.h             |   0
 {content => dom}/media/TimeVarying.h          |   0
 {content => dom}/media/TrackUnionStream.cpp   |   4 +
 {content => dom}/media/TrackUnionStream.h     |   0
 .../media/VideoFrameContainer.cpp             |   0
 {content => dom}/media/VideoFrameContainer.h  |   0
 .../media/VideoPlaybackQuality.cpp            |   0
 {content => dom}/media/VideoPlaybackQuality.h |   0
 {content => dom}/media/VideoSegment.cpp       |   0
 {content => dom}/media/VideoSegment.h         |   0
 {content => dom}/media/VideoStreamTrack.cpp   |   0
 {content => dom}/media/VideoStreamTrack.h     |   0
 {content => dom}/media/VideoTrack.cpp         |   0
 {content => dom}/media/VideoTrack.h           |   0
 {content => dom}/media/VideoTrackList.cpp     |   0
 {content => dom}/media/VideoTrackList.h       |   0
 {content => dom}/media/VideoUtils.cpp         |   0
 {content => dom}/media/VideoUtils.h           |   0
 {content => dom}/media/VorbisUtils.h          |   0
 {content => dom}/media/WebVTTListener.cpp     |   0
 {content => dom}/media/WebVTTListener.h       |   0
 .../media/android/AndroidMediaDecoder.cpp     |   0
 .../media/android/AndroidMediaDecoder.h       |   0
 .../media/android/AndroidMediaPluginHost.cpp  |   0
 .../media/android/AndroidMediaPluginHost.h    |   0
 .../media/android/AndroidMediaReader.cpp      |   0
 .../media/android/AndroidMediaReader.h        |   0
 .../android/AndroidMediaResourceServer.cpp    |   0
 .../android/AndroidMediaResourceServer.h      |   0
 {content => dom}/media/android/MPAPI.h        |   0
 {content => dom}/media/android/moz.build      |   0
 {content => dom}/media/apple/AppleDecoder.cpp |   0
 {content => dom}/media/apple/AppleDecoder.h   |   0
 .../media/apple/AppleMP3Reader.cpp            |   0
 {content => dom}/media/apple/AppleMP3Reader.h |   0
 {content => dom}/media/apple/moz.build        |   0
 .../media/compiledtest/TestAudioBuffers.cpp   |   0
 .../media/compiledtest/TestAudioMixer.cpp     |   0
 {content => dom}/media/compiledtest/moz.build |   0
 .../media/directshow/AudioSinkFilter.cpp      |   0
 .../media/directshow/AudioSinkFilter.h        |   0
 .../media/directshow/AudioSinkInputPin.cpp    |   0
 .../media/directshow/AudioSinkInputPin.h      |   0
 .../media/directshow/DirectShowDecoder.cpp    |   0
 .../media/directshow/DirectShowDecoder.h      |   0
 .../media/directshow/DirectShowReader.cpp     |   0
 .../media/directshow/DirectShowReader.h       |   0
 .../media/directshow/DirectShowUtils.cpp      |   0
 .../media/directshow/DirectShowUtils.h        |   0
 .../media/directshow/SampleSink.cpp           |   0
 .../media/directshow/SampleSink.h             |   0
 .../media/directshow/SourceFilter.cpp         |   0
 .../media/directshow/SourceFilter.h           |   0
 {content => dom}/media/directshow/moz.build   |   0
 .../media/eme/CDMCallbackProxy.cpp            |   0
 {content => dom}/media/eme/CDMCallbackProxy.h |   0
 {content => dom}/media/eme/CDMCaps.cpp        |   0
 {content => dom}/media/eme/CDMCaps.h          |   0
 {content => dom}/media/eme/CDMProxy.cpp       |   0
 {content => dom}/media/eme/CDMProxy.h         |   0
 {content => dom}/media/eme/EMELog.cpp         |   0
 {content => dom}/media/eme/EMELog.h           |   0
 .../media/eme/MediaEncryptedEvent.cpp         |   0
 .../media/eme/MediaEncryptedEvent.h           |   0
 {content => dom}/media/eme/MediaKeyError.cpp  |   0
 {content => dom}/media/eme/MediaKeyError.h    |   0
 .../media/eme/MediaKeyMessageEvent.cpp        |   0
 .../media/eme/MediaKeyMessageEvent.h          |   0
 .../media/eme/MediaKeySession.cpp             |   0
 {content => dom}/media/eme/MediaKeySession.h  |   0
 {content => dom}/media/eme/MediaKeys.cpp      |   0
 {content => dom}/media/eme/MediaKeys.h        |   0
 {content => dom}/media/eme/moz.build          |   0
 .../media/encoder/ContainerWriter.h           |   0
 .../media/encoder/EncodedFrameContainer.h     |   0
 .../media/encoder/MediaEncoder.cpp            |   0
 {content => dom}/media/encoder/MediaEncoder.h |   0
 .../media/encoder/OmxTrackEncoder.cpp         |   0
 .../media/encoder/OmxTrackEncoder.h           |   0
 .../media/encoder/OpusTrackEncoder.cpp        |   0
 .../media/encoder/OpusTrackEncoder.h          |   0
 .../media/encoder/TrackEncoder.cpp            |   0
 {content => dom}/media/encoder/TrackEncoder.h |   0
 .../media/encoder/TrackMetadataBase.h         |   0
 .../media/encoder/VP8TrackEncoder.cpp         |   0
 .../media/encoder/VP8TrackEncoder.h           |   0
 .../media/encoder/VorbisTrackEncoder.cpp      |   0
 .../media/encoder/VorbisTrackEncoder.h        |   0
 .../media/encoder/fmp4_muxer/AMRBox.cpp       |   0
 .../media/encoder/fmp4_muxer/AMRBox.h         |   0
 .../media/encoder/fmp4_muxer/AVCBox.cpp       |   0
 .../media/encoder/fmp4_muxer/AVCBox.h         |   0
 .../media/encoder/fmp4_muxer/ISOControl.cpp   |   0
 .../media/encoder/fmp4_muxer/ISOControl.h     |   0
 .../encoder/fmp4_muxer/ISOMediaBoxes.cpp      |   0
 .../media/encoder/fmp4_muxer/ISOMediaBoxes.h  |   0
 .../encoder/fmp4_muxer/ISOMediaWriter.cpp     |   0
 .../media/encoder/fmp4_muxer/ISOMediaWriter.h |   0
 .../encoder/fmp4_muxer/ISOTrackMetadata.h     |   0
 .../media/encoder/fmp4_muxer/MP4ESDS.cpp      |   0
 .../media/encoder/fmp4_muxer/MP4ESDS.h        |   0
 .../media/encoder/fmp4_muxer/MuxerOperation.h |   0
 .../media/encoder/fmp4_muxer/moz.build        |   0
 {content => dom}/media/encoder/moz.build      |   0
 .../media/fmp4/BlankDecoderModule.cpp         |   0
 {content => dom}/media/fmp4/MP4Decoder.cpp    |   0
 {content => dom}/media/fmp4/MP4Decoder.h      |   0
 {content => dom}/media/fmp4/MP4Reader.cpp     |   0
 {content => dom}/media/fmp4/MP4Reader.h       |   0
 .../media/fmp4/PlatformDecoderModule.cpp      |   0
 .../media/fmp4/PlatformDecoderModule.h        |   0
 .../fmp4/android/AndroidDecoderModule.cpp     |   0
 .../media/fmp4/android/AndroidDecoderModule.h |   0
 .../media/fmp4/apple/AppleATDecoder.cpp       |   0
 .../media/fmp4/apple/AppleATDecoder.h         |   0
 .../media/fmp4/apple/AppleCMFunctions.h       |   0
 .../media/fmp4/apple/AppleCMLinker.cpp        |   0
 .../media/fmp4/apple/AppleCMLinker.h          |   0
 .../media/fmp4/apple/AppleDecoderModule.cpp   |   0
 .../media/fmp4/apple/AppleDecoderModule.h     |   0
 .../media/fmp4/apple/AppleUtils.cpp           |   0
 .../media/fmp4/apple/AppleUtils.h             |   0
 .../media/fmp4/apple/AppleVDADecoder.cpp      |   0
 .../media/fmp4/apple/AppleVDADecoder.h        |   0
 .../media/fmp4/apple/AppleVDAFunctions.h      |   0
 .../media/fmp4/apple/AppleVDALinker.cpp       |   0
 .../media/fmp4/apple/AppleVDALinker.h         |   0
 .../media/fmp4/apple/AppleVTDecoder.cpp       |   0
 .../media/fmp4/apple/AppleVTDecoder.h         |   0
 .../media/fmp4/apple/AppleVTFunctions.h       |   0
 .../media/fmp4/apple/AppleVTLinker.cpp        |   0
 .../media/fmp4/apple/AppleVTLinker.h          |   0
 .../media/fmp4/apple/ReorderQueue.h           |   0
 .../VideoDecodeAcceleration/VDADecoder.h      |   0
 .../fmp4/apple/VideoToolbox/VideoToolbox.h    |   0
 .../media/fmp4/eme/EMEAudioDecoder.cpp        |   0
 .../media/fmp4/eme/EMEAudioDecoder.h          |   0
 .../media/fmp4/eme/EMEDecoderModule.cpp       |   0
 .../media/fmp4/eme/EMEDecoderModule.h         |   0
 .../media/fmp4/eme/EMEH264Decoder.cpp         |   0
 .../media/fmp4/eme/EMEH264Decoder.h           |   0
 {content => dom}/media/fmp4/eme/moz.build     |   0
 .../media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp  |   0
 .../media/fmp4/ffmpeg/FFmpegAudioDecoder.h    |   0
 .../media/fmp4/ffmpeg/FFmpegDataDecoder.cpp   |   0
 .../media/fmp4/ffmpeg/FFmpegDataDecoder.h     |   0
 .../media/fmp4/ffmpeg/FFmpegDecoderModule.cpp |   0
 .../media/fmp4/ffmpeg/FFmpegDecoderModule.h   |   0
 .../media/fmp4/ffmpeg/FFmpegFunctionList.h    |   0
 .../media/fmp4/ffmpeg/FFmpegH264Decoder.cpp   |   0
 .../media/fmp4/ffmpeg/FFmpegH264Decoder.h     |   0
 .../media/fmp4/ffmpeg/FFmpegLibs.h            |   0
 .../media/fmp4/ffmpeg/FFmpegLog.cpp           |   0
 .../media/fmp4/ffmpeg/FFmpegLog.h             |   0
 .../media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp |   0
 .../media/fmp4/ffmpeg/FFmpegRuntimeLinker.h   |   0
 .../media/fmp4/ffmpeg/README_mozilla          |   0
 .../ffmpeg/libav53/include/COPYING.LGPLv2.1   |   0
 .../libav53/include/libavcodec/avcodec.h      |   0
 .../ffmpeg/libav53/include/libavcodec/avfft.h |   0
 .../ffmpeg/libav53/include/libavcodec/dxva2.h |   0
 .../include/libavcodec/old_codec_ids.h        |   0
 .../ffmpeg/libav53/include/libavcodec/opt.h   |   0
 .../ffmpeg/libav53/include/libavcodec/vaapi.h |   0
 .../ffmpeg/libav53/include/libavcodec/vda.h   |   0
 .../ffmpeg/libav53/include/libavcodec/vdpau.h |   0
 .../libav53/include/libavcodec/version.h      |   0
 .../ffmpeg/libav53/include/libavcodec/xvmc.h  |   0
 .../libav53/include/libavformat/avformat.h    |   0
 .../ffmpeg/libav53/include/libavformat/avio.h |   0
 .../libav53/include/libavformat/version.h     |   0
 .../libav53/include/libavutil/adler32.h       |   0
 .../ffmpeg/libav53/include/libavutil/aes.h    |   0
 .../libav53/include/libavutil/attributes.h    |   0
 .../libav53/include/libavutil/audio_fifo.h    |   0
 .../libav53/include/libavutil/audioconvert.h  |   0
 .../libav53/include/libavutil/avassert.h      |   0
 .../libav53/include/libavutil/avconfig.h      |   0
 .../libav53/include/libavutil/avstring.h      |   0
 .../ffmpeg/libav53/include/libavutil/avutil.h |   0
 .../ffmpeg/libav53/include/libavutil/base64.h |   0
 .../libav53/include/libavutil/blowfish.h      |   0
 .../ffmpeg/libav53/include/libavutil/bprint.h |   0
 .../ffmpeg/libav53/include/libavutil/bswap.h  |   0
 .../ffmpeg/libav53/include/libavutil/common.h |   0
 .../ffmpeg/libav53/include/libavutil/cpu.h    |   0
 .../ffmpeg/libav53/include/libavutil/crc.h    |   0
 .../ffmpeg/libav53/include/libavutil/dict.h   |   0
 .../ffmpeg/libav53/include/libavutil/error.h  |   0
 .../ffmpeg/libav53/include/libavutil/eval.h   |   0
 .../ffmpeg/libav53/include/libavutil/fifo.h   |   0
 .../ffmpeg/libav53/include/libavutil/file.h   |   0
 .../libav53/include/libavutil/imgutils.h      |   0
 .../libav53/include/libavutil/intfloat.h      |   0
 .../include/libavutil/intfloat_readwrite.h    |   0
 .../libav53/include/libavutil/intreadwrite.h  |   0
 .../ffmpeg/libav53/include/libavutil/lfg.h    |   0
 .../ffmpeg/libav53/include/libavutil/log.h    |   0
 .../ffmpeg/libav53/include/libavutil/lzo.h    |   0
 .../libav53/include/libavutil/mathematics.h   |   0
 .../ffmpeg/libav53/include/libavutil/md5.h    |   0
 .../ffmpeg/libav53/include/libavutil/mem.h    |   0
 .../libav53/include/libavutil/old_pix_fmts.h  |   0
 .../ffmpeg/libav53/include/libavutil/opt.h    |   0
 .../libav53/include/libavutil/parseutils.h    |   0
 .../libav53/include/libavutil/pixdesc.h       |   0
 .../ffmpeg/libav53/include/libavutil/pixfmt.h |   0
 .../libav53/include/libavutil/random_seed.h   |   0
 .../libav53/include/libavutil/rational.h      |   0
 .../libav53/include/libavutil/samplefmt.h     |   0
 .../ffmpeg/libav53/include/libavutil/sha.h    |   0
 .../ffmpeg/libav53/include/libavutil/time.h   |   0
 .../libav53/include/libavutil/timecode.h      |   0
 .../libav53/include/libavutil/timestamp.h     |   0
 .../libav53/include/libavutil/version.h       |   0
 .../ffmpeg/libav53/include/libavutil/xtea.h   |   0
 .../media/fmp4/ffmpeg/libav53/moz.build       |   0
 .../ffmpeg/libav54/include/COPYING.LGPLv2.1   |   0
 .../libav54/include/libavcodec/avcodec.h      |   0
 .../ffmpeg/libav54/include/libavcodec/avfft.h |   0
 .../ffmpeg/libav54/include/libavcodec/dxva2.h |   0
 .../include/libavcodec/old_codec_ids.h        |   0
 .../ffmpeg/libav54/include/libavcodec/vaapi.h |   0
 .../ffmpeg/libav54/include/libavcodec/vda.h   |   0
 .../ffmpeg/libav54/include/libavcodec/vdpau.h |   0
 .../libav54/include/libavcodec/version.h      |   0
 .../ffmpeg/libav54/include/libavcodec/xvmc.h  |   0
 .../libav54/include/libavformat/avformat.h    |   0
 .../ffmpeg/libav54/include/libavformat/avio.h |   0
 .../libav54/include/libavformat/version.h     |   0
 .../libav54/include/libavutil/adler32.h       |   0
 .../ffmpeg/libav54/include/libavutil/aes.h    |   0
 .../libav54/include/libavutil/attributes.h    |   0
 .../libav54/include/libavutil/audio_fifo.h    |   0
 .../libav54/include/libavutil/audioconvert.h  |   0
 .../libav54/include/libavutil/avassert.h      |   0
 .../libav54/include/libavutil/avconfig.h      |   0
 .../libav54/include/libavutil/avstring.h      |   0
 .../ffmpeg/libav54/include/libavutil/avutil.h |   0
 .../ffmpeg/libav54/include/libavutil/base64.h |   0
 .../libav54/include/libavutil/blowfish.h      |   0
 .../ffmpeg/libav54/include/libavutil/bswap.h  |   0
 .../include/libavutil/channel_layout.h        |   0
 .../ffmpeg/libav54/include/libavutil/common.h |   0
 .../ffmpeg/libav54/include/libavutil/cpu.h    |   0
 .../ffmpeg/libav54/include/libavutil/crc.h    |   0
 .../ffmpeg/libav54/include/libavutil/dict.h   |   0
 .../ffmpeg/libav54/include/libavutil/error.h  |   0
 .../ffmpeg/libav54/include/libavutil/eval.h   |   0
 .../ffmpeg/libav54/include/libavutil/fifo.h   |   0
 .../ffmpeg/libav54/include/libavutil/file.h   |   0
 .../libav54/include/libavutil/imgutils.h      |   0
 .../libav54/include/libavutil/intfloat.h      |   0
 .../include/libavutil/intfloat_readwrite.h    |   0
 .../libav54/include/libavutil/intreadwrite.h  |   0
 .../ffmpeg/libav54/include/libavutil/lfg.h    |   0
 .../ffmpeg/libav54/include/libavutil/log.h    |   0
 .../ffmpeg/libav54/include/libavutil/lzo.h    |   0
 .../libav54/include/libavutil/mathematics.h   |   0
 .../ffmpeg/libav54/include/libavutil/md5.h    |   0
 .../ffmpeg/libav54/include/libavutil/mem.h    |   0
 .../libav54/include/libavutil/old_pix_fmts.h  |   0
 .../ffmpeg/libav54/include/libavutil/opt.h    |   0
 .../libav54/include/libavutil/parseutils.h    |   0
 .../libav54/include/libavutil/pixdesc.h       |   0
 .../ffmpeg/libav54/include/libavutil/pixfmt.h |   0
 .../libav54/include/libavutil/random_seed.h   |   0
 .../libav54/include/libavutil/rational.h      |   0
 .../libav54/include/libavutil/samplefmt.h     |   0
 .../ffmpeg/libav54/include/libavutil/sha.h    |   0
 .../ffmpeg/libav54/include/libavutil/time.h   |   0
 .../libav54/include/libavutil/version.h       |   0
 .../ffmpeg/libav54/include/libavutil/xtea.h   |   0
 .../media/fmp4/ffmpeg/libav54/moz.build       |   0
 .../ffmpeg/libav55/include/COPYING.LGPLv2.1   |   0
 .../libav55/include/libavcodec/avcodec.h      |   0
 .../ffmpeg/libav55/include/libavcodec/avfft.h |   0
 .../ffmpeg/libav55/include/libavcodec/dxva2.h |   0
 .../ffmpeg/libav55/include/libavcodec/vaapi.h |   0
 .../ffmpeg/libav55/include/libavcodec/vda.h   |   0
 .../ffmpeg/libav55/include/libavcodec/vdpau.h |   0
 .../libav55/include/libavcodec/version.h      |   0
 .../ffmpeg/libav55/include/libavcodec/xvmc.h  |   0
 .../libav55/include/libavformat/avformat.h    |   0
 .../ffmpeg/libav55/include/libavformat/avio.h |   0
 .../libav55/include/libavformat/version.h     |   0
 .../libav55/include/libavutil/adler32.h       |   0
 .../ffmpeg/libav55/include/libavutil/aes.h    |   0
 .../libav55/include/libavutil/attributes.h    |   0
 .../libav55/include/libavutil/audio_fifo.h    |   0
 .../libav55/include/libavutil/audioconvert.h  |   0
 .../libav55/include/libavutil/avassert.h      |   0
 .../libav55/include/libavutil/avconfig.h      |   0
 .../libav55/include/libavutil/avstring.h      |   0
 .../ffmpeg/libav55/include/libavutil/avutil.h |   0
 .../ffmpeg/libav55/include/libavutil/base64.h |   0
 .../libav55/include/libavutil/blowfish.h      |   0
 .../ffmpeg/libav55/include/libavutil/bswap.h  |   0
 .../ffmpeg/libav55/include/libavutil/buffer.h |   0
 .../include/libavutil/channel_layout.h        |   0
 .../ffmpeg/libav55/include/libavutil/common.h |   0
 .../ffmpeg/libav55/include/libavutil/cpu.h    |   0
 .../ffmpeg/libav55/include/libavutil/crc.h    |   0
 .../ffmpeg/libav55/include/libavutil/dict.h   |   0
 .../libav55/include/libavutil/downmix_info.h  |   0
 .../ffmpeg/libav55/include/libavutil/error.h  |   0
 .../ffmpeg/libav55/include/libavutil/eval.h   |   0
 .../ffmpeg/libav55/include/libavutil/fifo.h   |   0
 .../ffmpeg/libav55/include/libavutil/file.h   |   0
 .../ffmpeg/libav55/include/libavutil/frame.h  |   0
 .../ffmpeg/libav55/include/libavutil/hmac.h   |   0
 .../libav55/include/libavutil/imgutils.h      |   0
 .../libav55/include/libavutil/intfloat.h      |   0
 .../libav55/include/libavutil/intreadwrite.h  |   0
 .../ffmpeg/libav55/include/libavutil/lfg.h    |   0
 .../ffmpeg/libav55/include/libavutil/log.h    |   0
 .../ffmpeg/libav55/include/libavutil/lzo.h    |   0
 .../ffmpeg/libav55/include/libavutil/macros.h |   0
 .../libav55/include/libavutil/mathematics.h   |   0
 .../ffmpeg/libav55/include/libavutil/md5.h    |   0
 .../ffmpeg/libav55/include/libavutil/mem.h    |   0
 .../libav55/include/libavutil/old_pix_fmts.h  |   0
 .../ffmpeg/libav55/include/libavutil/opt.h    |   0
 .../libav55/include/libavutil/parseutils.h    |   0
 .../libav55/include/libavutil/pixdesc.h       |   0
 .../ffmpeg/libav55/include/libavutil/pixfmt.h |   0
 .../libav55/include/libavutil/random_seed.h   |   0
 .../libav55/include/libavutil/rational.h      |   0
 .../libav55/include/libavutil/samplefmt.h     |   0
 .../ffmpeg/libav55/include/libavutil/sha.h    |   0
 .../libav55/include/libavutil/stereo3d.h      |   0
 .../ffmpeg/libav55/include/libavutil/time.h   |   0
 .../libav55/include/libavutil/version.h       |   0
 .../ffmpeg/libav55/include/libavutil/xtea.h   |   0
 .../media/fmp4/ffmpeg/libav55/moz.build       |   0
 .../fmp4/gonk/GonkAudioDecoderManager.cpp     |   0
 .../media/fmp4/gonk/GonkAudioDecoderManager.h |   0
 .../media/fmp4/gonk/GonkDecoderModule.cpp     |   0
 .../media/fmp4/gonk/GonkDecoderModule.h       |   0
 .../media/fmp4/gonk/GonkMediaDataDecoder.cpp  |   0
 .../media/fmp4/gonk/GonkMediaDataDecoder.h    |   0
 .../fmp4/gonk/GonkVideoDecoderManager.cpp     |   0
 .../media/fmp4/gonk/GonkVideoDecoderManager.h |   0
 {content => dom}/media/fmp4/gonk/moz.build    |   4 +-
 {content => dom}/media/fmp4/moz.build         |   0
 .../media/fmp4/wmf/MFTDecoder.cpp             |   0
 {content => dom}/media/fmp4/wmf/MFTDecoder.h  |   0
 .../media/fmp4/wmf/WMFAudioMFTManager.cpp     |   0
 .../media/fmp4/wmf/WMFAudioMFTManager.h       |   0
 .../media/fmp4/wmf/WMFDecoderModule.cpp       |   0
 .../media/fmp4/wmf/WMFDecoderModule.h         |   0
 .../media/fmp4/wmf/WMFMediaDataDecoder.cpp    |   0
 .../media/fmp4/wmf/WMFMediaDataDecoder.h      |   0
 .../media/fmp4/wmf/WMFVideoMFTManager.cpp     |   0
 .../media/fmp4/wmf/WMFVideoMFTManager.h       |   0
 {content => dom}/media/fmp4/wmf/moz.build     |   0
 .../media/gmp/GMPAudioDecoderChild.cpp        |   0
 .../media/gmp/GMPAudioDecoderChild.h          |   0
 .../media/gmp/GMPAudioDecoderParent.cpp       |   0
 .../media/gmp/GMPAudioDecoderParent.h         |   0
 .../media/gmp/GMPAudioDecoderProxy.h          |   0
 {content => dom}/media/gmp/GMPAudioHost.cpp   |   0
 {content => dom}/media/gmp/GMPAudioHost.h     |   0
 {content => dom}/media/gmp/GMPCallbackBase.h  |   0
 {content => dom}/media/gmp/GMPChild.cpp       |   0
 {content => dom}/media/gmp/GMPChild.h         |   0
 .../media/gmp/GMPDecryptorChild.cpp           |   0
 .../media/gmp/GMPDecryptorChild.h             |   0
 .../media/gmp/GMPDecryptorParent.cpp          |   0
 .../media/gmp/GMPDecryptorParent.h            |   0
 .../media/gmp/GMPDecryptorProxy.h             |   0
 .../media/gmp/GMPEncryptedBufferDataImpl.cpp  |   0
 .../media/gmp/GMPEncryptedBufferDataImpl.h    |   0
 {content => dom}/media/gmp/GMPMessageUtils.h  |   0
 {content => dom}/media/gmp/GMPParent.cpp      |   0
 {content => dom}/media/gmp/GMPParent.h        |   0
 {content => dom}/media/gmp/GMPPlatform.cpp    |   0
 {content => dom}/media/gmp/GMPPlatform.h      |   0
 .../media/gmp/GMPProcessChild.cpp             |   0
 {content => dom}/media/gmp/GMPProcessChild.h  |   0
 .../media/gmp/GMPProcessParent.cpp            |   0
 {content => dom}/media/gmp/GMPProcessParent.h |   0
 {content => dom}/media/gmp/GMPService.cpp     |   0
 {content => dom}/media/gmp/GMPService.h       |   0
 .../media/gmp/GMPSharedMemManager.cpp         |   0
 .../media/gmp/GMPSharedMemManager.h           |   0
 .../media/gmp/GMPStorageChild.cpp             |   0
 {content => dom}/media/gmp/GMPStorageChild.h  |   0
 .../media/gmp/GMPStorageParent.cpp            |   0
 {content => dom}/media/gmp/GMPStorageParent.h |   0
 {content => dom}/media/gmp/GMPTimerChild.cpp  |   0
 {content => dom}/media/gmp/GMPTimerChild.h    |   0
 {content => dom}/media/gmp/GMPTimerParent.cpp |   0
 {content => dom}/media/gmp/GMPTimerParent.h   |   0
 {content => dom}/media/gmp/GMPTypes.ipdlh     |   0
 .../media/gmp/GMPVideoDecoderChild.cpp        |   0
 .../media/gmp/GMPVideoDecoderChild.h          |   0
 .../media/gmp/GMPVideoDecoderParent.cpp       |   0
 .../media/gmp/GMPVideoDecoderParent.h         |   0
 .../media/gmp/GMPVideoDecoderProxy.h          |   0
 .../media/gmp/GMPVideoEncodedFrameImpl.cpp    |   0
 .../media/gmp/GMPVideoEncodedFrameImpl.h      |   0
 .../media/gmp/GMPVideoEncoderChild.cpp        |   0
 .../media/gmp/GMPVideoEncoderChild.h          |   0
 .../media/gmp/GMPVideoEncoderParent.cpp       |   0
 .../media/gmp/GMPVideoEncoderParent.h         |   0
 .../media/gmp/GMPVideoEncoderProxy.h          |   0
 {content => dom}/media/gmp/GMPVideoHost.cpp   |   0
 {content => dom}/media/gmp/GMPVideoHost.h     |   0
 .../media/gmp/GMPVideoPlaneImpl.cpp           |   0
 .../media/gmp/GMPVideoPlaneImpl.h             |   0
 .../media/gmp/GMPVideoi420FrameImpl.cpp       |   0
 .../media/gmp/GMPVideoi420FrameImpl.h         |   0
 {content => dom}/media/gmp/PGMP.ipdl          |   0
 .../media/gmp/PGMPAudioDecoder.ipdl           |   0
 {content => dom}/media/gmp/PGMPDecryptor.ipdl |   0
 {content => dom}/media/gmp/PGMPStorage.ipdl   |   0
 {content => dom}/media/gmp/PGMPTimer.ipdl     |   0
 .../media/gmp/PGMPVideoDecoder.ipdl           |   0
 .../media/gmp/PGMPVideoEncoder.ipdl           |   0
 {content => dom}/media/gmp/README.txt         |   0
 .../media/gmp/gmp-api/gmp-async-shutdown.h    |   0
 .../media/gmp/gmp-api/gmp-audio-codec.h       |   0
 .../media/gmp/gmp-api/gmp-audio-decode.h      |   0
 .../media/gmp/gmp-api/gmp-audio-host.h        |   0
 .../media/gmp/gmp-api/gmp-audio-samples.h     |   0
 .../media/gmp/gmp-api/gmp-decryption.h        |   0
 .../media/gmp/gmp-api/gmp-entrypoints.h       |   0
 .../media/gmp/gmp-api/gmp-errors.h            |   0
 .../media/gmp/gmp-api/gmp-platform.h          |   0
 .../media/gmp/gmp-api/gmp-storage.h           |   0
 .../media/gmp/gmp-api/gmp-video-codec.h       |   0
 .../media/gmp/gmp-api/gmp-video-decode.h      |   0
 .../media/gmp/gmp-api/gmp-video-encode.h      |   0
 .../gmp/gmp-api/gmp-video-frame-encoded.h     |   0
 .../media/gmp/gmp-api/gmp-video-frame-i420.h  |   0
 .../media/gmp/gmp-api/gmp-video-frame.h       |   0
 .../media/gmp/gmp-api/gmp-video-host.h        |   0
 .../media/gmp/gmp-api/gmp-video-plane.h       |   0
 {content => dom}/media/gmp/moz.build          |   0
 .../media/gmp/mozIGeckoMediaPluginService.idl |   0
 {content => dom}/media/gmp/rlz/COPYING        |   0
 {content => dom}/media/gmp/rlz/README.mozilla |   0
 .../media/gmp/rlz/base/memory/scoped_ptr.h    |   0
 .../media/gmp/rlz/base/string16.h             |   0
 {content => dom}/media/gmp/rlz/lib/assert.h   |   0
 .../media/gmp/rlz/lib/machine_id.h            |   0
 .../media/gmp/rlz/lib/string_utils.cc         |   0
 .../media/gmp/rlz/lib/string_utils.h          |   0
 {content => dom}/media/gmp/rlz/moz.build      |   0
 .../media/gmp/rlz/win/lib/machine_id_win.cc   |   0
 .../media/gstreamer/GStreamerAllocator.cpp    |   0
 .../media/gstreamer/GStreamerAllocator.h      |   0
 .../media/gstreamer/GStreamerDecoder.cpp      |   0
 .../media/gstreamer/GStreamerDecoder.h        |   0
 .../media/gstreamer/GStreamerFormatHelper.cpp |   0
 .../media/gstreamer/GStreamerFormatHelper.h   |   0
 .../media/gstreamer/GStreamerFunctionList.h   |   0
 .../media/gstreamer/GStreamerLoader.cpp       |   0
 .../media/gstreamer/GStreamerLoader.h         |   0
 .../gstreamer/GStreamerMozVideoBuffer.cpp     |   0
 .../media/gstreamer/GStreamerMozVideoBuffer.h |   0
 .../media/gstreamer/GStreamerReader-0.10.cpp  |   0
 .../media/gstreamer/GStreamerReader.cpp       |   0
 .../media/gstreamer/GStreamerReader.h         |   0
 {content => dom}/media/gstreamer/moz.build    |   0
 .../media/gtest/MockMediaDecoderOwner.h       |   0
 .../media/gtest/MockMediaResource.cpp         |   0
 .../media/gtest/MockMediaResource.h           |   0
 .../media/gtest/TestAudioCompactor.cpp        |   0
 .../media/gtest/TestGMPCrossOrigin.cpp        |   0
 .../media/gtest/TestMP4Reader.cpp             |   0
 .../media/gtest/TestTrackEncoder.cpp          |   0
 .../media/gtest/TestVideoSegment.cpp          |   0
 .../media/gtest/TestVideoTrackEncoder.cpp     |   0
 .../media/gtest/TestVorbisTrackEncoder.cpp    |   0
 .../media/gtest/TestWebMBuffered.cpp          |   0
 .../media/gtest/TestWebMWriter.cpp            |   0
 .../media/gtest/mediasource_test.mp4          | Bin
 {content => dom}/media/gtest/moz.build        |  23 +-
 {content => dom}/media/gtest/test.webm        | Bin
 .../media/imagecapture/CaptureTask.cpp        |   0
 .../media/imagecapture/CaptureTask.h          |   0
 .../media/imagecapture/ImageCapture.cpp       |   0
 .../media/imagecapture/ImageCapture.h         |   0
 {content => dom}/media/imagecapture/moz.build |   0
 .../media/mediasource/AsyncEventRunner.h      |   0
 .../media/mediasource/ContainerParser.cpp     |   0
 .../media/mediasource/ContainerParser.h       |   0
 .../media/mediasource/MediaSource.cpp         |   0
 .../media/mediasource/MediaSource.h           |   0
 .../media/mediasource/MediaSourceDecoder.cpp  |   0
 .../media/mediasource/MediaSourceDecoder.h    |   0
 .../media/mediasource/MediaSourceReader.cpp   |   0
 .../media/mediasource/MediaSourceReader.h     |   0
 .../media/mediasource/MediaSourceResource.h   |   0
 .../media/mediasource/MediaSourceUtils.cpp    |   0
 .../media/mediasource/MediaSourceUtils.h      |   0
 .../media/mediasource/ResourceQueue.h         |   0
 .../media/mediasource/SourceBuffer.cpp        |   0
 .../media/mediasource/SourceBuffer.h          |   0
 .../media/mediasource/SourceBufferDecoder.cpp |   0
 .../media/mediasource/SourceBufferDecoder.h   |   0
 .../media/mediasource/SourceBufferList.cpp    |   0
 .../media/mediasource/SourceBufferList.h      |   0
 .../mediasource/SourceBufferResource.cpp      |   0
 .../media/mediasource/SourceBufferResource.h  |   0
 .../media/mediasource/TrackBuffer.cpp         |   0
 .../media/mediasource/TrackBuffer.h           |   0
 {content => dom}/media/mediasource/moz.build  |   0
 .../mediasource/test/crashtests/1005366.html  |   0
 .../mediasource/test/crashtests/1059035.html  |   0
 .../mediasource/test/crashtests/926665.html   |   0
 .../mediasource/test/crashtests/931388.html   |   0
 .../test/crashtests/crashtests.list           |   0
 .../media/mediasource/test/mediasource.js     |   0
 .../media/mediasource/test/mochitest.ini      |   0
 .../media/mediasource/test/seek.webm          | Bin
 .../media/mediasource/test/seek.webm^headers^ |   0
 .../media/mediasource/test/seek_lowres.webm   | Bin
 .../test/seek_lowres.webm^headers^            |   0
 .../mediasource/test/test_BufferedSeek.html   |   0
 .../mediasource/test/test_FrameSelection.html |   0
 .../test/test_HaveMetadataUnbufferedSeek.html |   0
 .../mediasource/test/test_MediaSource.html    |   0
 .../test/test_MediaSource_disabled.html       |   0
 .../test/test_SeekableAfterEndOfStream.html   |   0
 .../test_SeekableAfterEndOfStreamSplit.html   |   0
 .../test/test_SeekableBeforeEndOfStream.html  |   0
 .../test_SeekableBeforeEndOfStreamSplit.html  |   0
 .../mediasource/test/test_SplitAppend.html    |   0
 .../test/test_SplitAppendDelay.html           |   0
 dom/media/moz.build                           | 241 ++++++++++++++++--
 {content => dom}/media/nsIDocumentActivity.h  |   0
 {content => dom}/media/ogg/OggCodecState.cpp  |   0
 {content => dom}/media/ogg/OggCodecState.h    |   0
 {content => dom}/media/ogg/OggDecoder.cpp     |   0
 {content => dom}/media/ogg/OggDecoder.h       |   0
 {content => dom}/media/ogg/OggReader.cpp      |   0
 {content => dom}/media/ogg/OggReader.h        |   0
 {content => dom}/media/ogg/OggWriter.cpp      |   0
 {content => dom}/media/ogg/OggWriter.h        |   0
 {content => dom}/media/ogg/OpusParser.cpp     |   0
 {content => dom}/media/ogg/OpusParser.h       |   0
 {content => dom}/media/ogg/moz.build          |   0
 .../media/omx/AudioOffloadPlayer.cpp          |   0
 .../media/omx/AudioOffloadPlayer.h            |   0
 .../media/omx/AudioOffloadPlayerBase.h        |   0
 {content => dom}/media/omx/AudioOutput.cpp    |   0
 {content => dom}/media/omx/AudioOutput.h      |   0
 {content => dom}/media/omx/AudioSink.h        |   0
 .../media/omx/I420ColorConverterHelper.cpp    |   0
 .../media/omx/I420ColorConverterHelper.h      |   0
 {content => dom}/media/omx/MPAPI.h            |   0
 .../media/omx/MediaCodecDecoder.cpp           |   0
 .../media/omx/MediaCodecDecoder.h             |   0
 .../media/omx/MediaCodecProxy.cpp             |   0
 {content => dom}/media/omx/MediaCodecProxy.h  |   0
 .../media/omx/MediaCodecReader.cpp            |   0
 {content => dom}/media/omx/MediaCodecReader.h |   0
 .../media/omx/MediaOmxCommonDecoder.cpp       |   0
 .../media/omx/MediaOmxCommonDecoder.h         |   0
 .../media/omx/MediaOmxCommonReader.cpp        |   0
 .../media/omx/MediaOmxCommonReader.h          |   0
 .../media/omx/MediaOmxDecoder.cpp             |   0
 {content => dom}/media/omx/MediaOmxDecoder.h  |   0
 {content => dom}/media/omx/MediaOmxReader.cpp |   0
 {content => dom}/media/omx/MediaOmxReader.h   |   0
 .../media/omx/MediaStreamSource.cpp           |   0
 .../media/omx/MediaStreamSource.h             |   0
 .../media/omx/OMXCodecDescriptorUtil.cpp      |   0
 .../media/omx/OMXCodecDescriptorUtil.h        |   0
 {content => dom}/media/omx/OMXCodecProxy.cpp  |   0
 {content => dom}/media/omx/OMXCodecProxy.h    |   0
 .../media/omx/OMXCodecWrapper.cpp             |   0
 {content => dom}/media/omx/OMXCodecWrapper.h  |   0
 {content => dom}/media/omx/OmxDecoder.cpp     |   0
 {content => dom}/media/omx/OmxDecoder.h       |   0
 {content => dom}/media/omx/RtspExtractor.cpp  |   0
 {content => dom}/media/omx/RtspExtractor.h    |   0
 .../media/omx/RtspMediaCodecDecoder.cpp       |   0
 .../media/omx/RtspMediaCodecDecoder.h         |   0
 .../media/omx/RtspMediaCodecReader.cpp        |   0
 .../media/omx/RtspMediaCodecReader.h          |   0
 {content => dom}/media/omx/RtspOmxDecoder.cpp |   0
 {content => dom}/media/omx/RtspOmxDecoder.h   |   0
 {content => dom}/media/omx/RtspOmxReader.cpp  |   0
 {content => dom}/media/omx/RtspOmxReader.h    |   0
 .../IMediaResourceManagerClient.cpp           |   0
 .../IMediaResourceManagerClient.h             |   0
 .../IMediaResourceManagerDeathNotifier.cpp    |   0
 .../IMediaResourceManagerDeathNotifier.h      |   0
 .../IMediaResourceManagerService.cpp          |   0
 .../IMediaResourceManagerService.h            |   0
 .../MediaResourceHandler.cpp                  |   0
 .../MediaResourceHandler.h                    |   0
 .../MediaResourceManagerClient.cpp            |   0
 .../MediaResourceManagerClient.h              |   0
 .../MediaResourceManagerService.cpp           |   0
 .../MediaResourceManagerService.h             |   0
 .../media/omx/mediaresourcemanager/moz.build  |   0
 {content => dom}/media/omx/moz.build          |   0
 {content => dom}/media/raw/RawDecoder.cpp     |   0
 {content => dom}/media/raw/RawDecoder.h       |   0
 {content => dom}/media/raw/RawReader.cpp      |   0
 {content => dom}/media/raw/RawReader.h        |   0
 {content => dom}/media/raw/RawStructs.h       |   0
 {content => dom}/media/raw/moz.build          |   0
 .../media/systemservices/LoadManager.cpp      |   0
 .../media/systemservices/LoadManager.h        |   0
 .../systemservices/LoadManagerFactory.cpp     |   0
 .../media/systemservices/LoadManagerFactory.h |   0
 .../media/systemservices/LoadMonitor.cpp      |   0
 .../media/systemservices/LoadMonitor.h        |   0
 .../systemservices/OSXRunLoopSingleton.cpp    |   0
 .../systemservices/OSXRunLoopSingleton.h      |   0
 .../media/systemservices/OpenSLESProvider.cpp |   0
 .../media/systemservices/OpenSLESProvider.h   |   0
 .../media/systemservices/moz.build            |   0
 {content => dom}/media/test/320x240.ogv       | Bin
 .../media/test/320x240.ogv^headers^           |   0
 {content => dom}/media/test/448636.ogv        | Bin
 .../media/test/448636.ogv^headers^            |   0
 {content => dom}/media/test/VID_0001.ogg      | Bin
 .../media/test/VID_0001.ogg^headers^          |   0
 {content => dom}/media/test/allowed.sjs       |   2 +-
 {content => dom}/media/test/audio-gaps.ogg    | Bin
 .../media/test/audio-gaps.ogg^headers^        |   0
 .../media/test/audio-overhang.ogg             | Bin
 .../media/test/audio-overhang.ogg^headers^    |   0
 {content => dom}/media/test/audio.wav         | Bin
 .../media/test/audio.wav^headers^             |   0
 {content => dom}/media/test/bad-signature.vtt |   0
 {content => dom}/media/test/badtags.ogg       | Bin
 .../media/test/badtags.ogg^headers^           |   0
 {content => dom}/media/test/basic.vtt         |   0
 .../media/test/beta-phrasebook.ogg            | Bin
 .../media/test/beta-phrasebook.ogg^headers^   |   0
 {content => dom}/media/test/big.wav           | Bin
 {content => dom}/media/test/big.wav^headers^  |   0
 {content => dom}/media/test/bogus.duh         |   0
 {content => dom}/media/test/bogus.ogv         |   0
 .../media/test/bogus.ogv^headers^             |   0
 {content => dom}/media/test/bogus.wav         |   0
 .../media/test/bogus.wav^headers^             |   0
 {content => dom}/media/test/bug1066943.webm   | Bin
 .../media/test/bug1066943.webm^headers^       |   0
 {content => dom}/media/test/bug461281.ogg     | Bin
 .../media/test/bug461281.ogg^headers^         |   0
 .../media/test/bug482461-theora.ogv           | Bin
 .../media/test/bug482461-theora.ogv^headers^  |   0
 {content => dom}/media/test/bug482461.ogv     | Bin
 .../media/test/bug482461.ogv^headers^         |   0
 {content => dom}/media/test/bug495129.ogv     | Bin
 .../media/test/bug495129.ogv^headers^         |   0
 {content => dom}/media/test/bug495794.ogg     | Bin
 .../media/test/bug495794.ogg^headers^         |   0
 {content => dom}/media/test/bug498380.ogv     | Bin
 .../media/test/bug498380.ogv^headers^         |   0
 {content => dom}/media/test/bug498855-1.ogv   | Bin
 .../media/test/bug498855-1.ogv^headers^       |   0
 {content => dom}/media/test/bug498855-2.ogv   | Bin
 .../media/test/bug498855-2.ogv^headers^       |   0
 {content => dom}/media/test/bug498855-3.ogv   | Bin
 .../media/test/bug498855-3.ogv^headers^       |   0
 {content => dom}/media/test/bug499519.ogv     | Bin
 .../media/test/bug499519.ogv^headers^         |   0
 {content => dom}/media/test/bug500311.ogv     | Bin
 .../media/test/bug500311.ogv^headers^         |   0
 {content => dom}/media/test/bug501279.ogg     | Bin
 .../media/test/bug501279.ogg^headers^         |   0
 {content => dom}/media/test/bug504613.ogv     | Bin
 .../media/test/bug504613.ogv^headers^         |   0
 {content => dom}/media/test/bug504644.ogv     | Bin
 .../media/test/bug504644.ogv^headers^         |   0
 {content => dom}/media/test/bug504843.ogv     | Bin
 .../media/test/bug504843.ogv^headers^         |   0
 {content => dom}/media/test/bug506094.ogv     | Bin
 .../media/test/bug506094.ogv^headers^         |   0
 .../media/test/bug516323.indexed.ogv          | Bin
 .../media/test/bug516323.indexed.ogv^headers^ |   0
 {content => dom}/media/test/bug516323.ogv     | Bin
 .../media/test/bug516323.ogv^headers^         |   0
 {content => dom}/media/test/bug520493.ogg     | Bin
 .../media/test/bug520493.ogg^headers^         |   0
 {content => dom}/media/test/bug520500.ogg     | Bin
 .../media/test/bug520500.ogg^headers^         |   0
 {content => dom}/media/test/bug520908.ogv     | Bin
 .../media/test/bug520908.ogv^headers^         |   0
 {content => dom}/media/test/bug523816.ogv     | Bin
 .../media/test/bug523816.ogv^headers^         |   0
 {content => dom}/media/test/bug533822.ogg     | Bin
 .../media/test/bug533822.ogg^headers^         |   0
 {content => dom}/media/test/bug556821.ogv     | Bin
 .../media/test/bug556821.ogv^headers^         |   0
 {content => dom}/media/test/bug557094.ogv     | Bin
 .../media/test/bug557094.ogv^headers^         |   0
 {content => dom}/media/test/bug580982.webm    | Bin
 .../media/test/bug580982.webm^headers^        |   0
 {content => dom}/media/test/bug603918.webm    | Bin
 .../media/test/bug603918.webm^headers^        |   0
 {content => dom}/media/test/bug604067.webm    | Bin
 .../media/test/bug604067.webm^headers^        |   0
 {content => dom}/media/test/bug883173.vtt     |   0
 .../media/test/can_play_type_dash.js          |   0
 .../media/test/can_play_type_ogg.js           |   0
 .../media/test/can_play_type_wave.js          |   0
 .../media/test/can_play_type_webm.js          |   0
 .../media/test/cancellable_request.sjs        |   0
 {content => dom}/media/test/chain.ogg         | Bin
 .../media/test/chain.ogg^headers^             |   0
 {content => dom}/media/test/chain.ogv         | Bin
 .../media/test/chain.ogv^headers^             |   0
 {content => dom}/media/test/chain.opus        | Bin
 .../media/test/chain.opus^headers^            |   0
 .../media/test/chained-audio-video.ogg        | Bin
 .../test/chained-audio-video.ogg^headers^     |   0
 {content => dom}/media/test/chained-video.ogv | Bin
 .../media/test/chained-video.ogv^headers^     |   0
 {content => dom}/media/test/chrome.ini        |   0
 .../media/test/contentDuration1.sjs           |   2 +-
 .../media/test/contentDuration2.sjs           |   2 +-
 .../media/test/contentDuration3.sjs           |   2 +-
 .../media/test/contentDuration4.sjs           |   2 +-
 .../media/test/contentDuration5.sjs           |   2 +-
 .../media/test/contentDuration6.sjs           |   2 +-
 .../media/test/contentDuration7.sjs           |   2 +-
 {content => dom}/media/test/contentType.sjs   |   2 +-
 .../media/test/crashtests/0-timescale.html    |   0
 .../media/test/crashtests/0-timescale.mp4     | Bin
 .../media/test/crashtests/1015662.html        |   0
 .../media/test/crashtests/1028458.html        |   0
 .../media/test/crashtests/1080986.html        |   0
 .../media/test/crashtests/1080986.wav         | Bin
 .../media/test/crashtests/459439-1.html       |   0
 .../media/test/crashtests/466607-1.html       |   0
 .../media/test/crashtests/466945-1.html       |   0
 .../media/test/crashtests/468763-1.html       |   0
 .../media/test/crashtests/474744-1.html       |   0
 .../media/test/crashtests/481136-1.html       |   0
 .../media/test/crashtests/492286-1.xhtml      |   0
 .../media/test/crashtests/493915-1.html       |   0
 .../media/test/crashtests/495794-1.html       |   0
 .../media/test/crashtests/495794-1.ogg        | Bin
 .../media/test/crashtests/576612-1.html       |   0
 .../media/test/crashtests/691096-1.html       |   0
 .../media/test/crashtests/752784-1.html       |   0
 .../media/test/crashtests/789075-1.html       |   0
 .../media/test/crashtests/789075.webm         | Bin
 .../media/test/crashtests/795892-1.html       |   0
 .../media/test/crashtests/844563.html         |   0
 .../media/test/crashtests/846612.html         |   0
 .../media/test/crashtests/852838.html         |   0
 .../media/test/crashtests/865537-1.html       |   0
 .../media/test/crashtests/868504.html         |   0
 .../media/test/crashtests/874869.html         |   0
 .../media/test/crashtests/874915.html         |   0
 .../media/test/crashtests/874934.html         |   0
 .../media/test/crashtests/874952.html         |   0
 .../media/test/crashtests/875144.html         |   0
 .../media/test/crashtests/875596.html         |   0
 .../media/test/crashtests/875911.html         |   0
 .../media/test/crashtests/876024-1.html       |   0
 .../media/test/crashtests/876024-2.html       |   0
 .../media/test/crashtests/876118.html         |   0
 .../media/test/crashtests/876207.html         |   0
 .../media/test/crashtests/876215.html         |   0
 .../media/test/crashtests/876249.html         |   0
 .../media/test/crashtests/876252.html         |   0
 .../media/test/crashtests/876834.html         |   0
 .../media/test/crashtests/877527.html         |   0
 .../media/test/crashtests/877820.html         |   0
 .../media/test/crashtests/878014.html         |   0
 .../media/test/crashtests/878328.html         |   0
 .../media/test/crashtests/878407.html         |   0
 .../media/test/crashtests/878478.html         |   0
 .../media/test/crashtests/880129.html         |   0
 .../media/test/crashtests/880202.html         |   0
 .../media/test/crashtests/880342-1.html       |   0
 .../media/test/crashtests/880342-2.html       |   0
 .../media/test/crashtests/880384.html         |   0
 .../media/test/crashtests/880404.html         |   0
 .../media/test/crashtests/880724.html         |   0
 .../media/test/crashtests/881775.html         |   0
 .../media/test/crashtests/882549.html         |   0
 .../media/test/crashtests/882956.html         |   0
 .../media/test/crashtests/884459.html         |   0
 .../media/test/crashtests/889042.html         |   0
 .../media/test/crashtests/894104.html         |   0
 .../media/test/crashtests/907986-1.html       |   0
 .../media/test/crashtests/907986-2.html       |   0
 .../media/test/crashtests/907986-3.html       |   0
 .../media/test/crashtests/907986-4.html       |   0
 .../media/test/crashtests/910171-1.html       |   0
 .../media/test/crashtests/920987.html         |   0
 .../media/test/crashtests/925619-1.html       |   0
 .../media/test/crashtests/925619-2.html       |   0
 .../media/test/crashtests/926619.html         |   0
 .../media/test/crashtests/933151.html         |   0
 .../media/test/crashtests/933156.html         |   0
 .../media/test/crashtests/944851.html         |   0
 .../media/test/crashtests/952756.html         |   0
 .../media/test/crashtests/966636.html         |   0
 .../media/test/crashtests/986901.html         |   0
 .../media/test/crashtests/990794.html         |   0
 .../crashtests/buffer-source-ended-1.html     |   0
 .../media/test/crashtests/cors.webm           | Bin
 .../media/test/crashtests/cors.webm^headers^  |   0
 .../media/test/crashtests/crashtests.list     |   0
 .../media-element-source-seek-1.html          |   0
 .../offline-buffer-source-ended-1.html        |   0
 .../test/crashtests/oscillator-ended-1.html   |   0
 .../test/crashtests/oscillator-ended-2.html   |   0
 .../media/test/crashtests/sound.ogg           | Bin
 .../test/dash/dash-manifest-garbled-webm.mpd  |   0
 .../media/test/dash/dash-manifest-garbled.mpd |   0
 .../media/test/dash/dash-manifest-sjs.mpd     |   0
 .../media/test/dash/dash-manifest.mpd         |   0
 .../media/test/dash/dash-webm-audio-128k.webm | Bin
 .../test/dash/dash-webm-video-320x180.webm    | Bin
 .../test/dash/dash-webm-video-428x240.webm    | Bin
 {content => dom}/media/test/dash/garbled.webm |   0
 .../media/test/dash_detect_stream_switch.sjs  |   2 +-
 {content => dom}/media/test/detodos.opus      | Bin
 .../media/test/detodos.opus^headers^          |   0
 {content => dom}/media/test/detodos.webm      | Bin
 .../media/test/detodos.webm^headers^          |   0
 {content => dom}/media/test/dirac.ogg         | Bin
 .../media/test/dirac.ogg^headers^             |   0
 .../media/test/dynamic_redirect.sjs           |   4 +-
 .../media/test/dynamic_resource.sjs           |   2 +-
 .../media/test/file_access_controls.html      |  18 +-
 .../media/test/fragment_noplay.js             |   0
 {content => dom}/media/test/fragment_play.js  |   0
 .../media/test/gizmo-frag-cenc.xml            |   0
 .../media/test/gizmo-frag-cenc1.m4s           | Bin
 .../media/test/gizmo-frag-cenc2.m4s           | Bin
 .../media/test/gizmo-frag-cencinit.mp4        | Bin
 {content => dom}/media/test/gizmo.mp4         | Bin
 .../media/test/gizmo.mp4^headers^             |   0
 {content => dom}/media/test/graph_latency.py  |   0
 {content => dom}/media/test/huge-id3.mp3      | Bin
 .../media/test/huge-id3.mp3^headers^          |   0
 {content => dom}/media/test/id3tags.mp3       | Bin
 .../media/test/id3tags.mp3^headers^           |   0
 .../media/test/invalid-cmap-s0c0.opus         | Bin
 .../test/invalid-cmap-s0c0.opus^headers^      |   0
 .../media/test/invalid-cmap-s0c2.opus         | Bin
 .../test/invalid-cmap-s0c2.opus^headers^      |   0
 .../media/test/invalid-cmap-s1c2.opus         | Bin
 .../test/invalid-cmap-s1c2.opus^headers^      |   0
 .../media/test/invalid-cmap-short.opus        | Bin
 .../test/invalid-cmap-short.opus^headers^     |   0
 .../test/invalid-discard_on_multi_blocks.webm | Bin
 ...alid-discard_on_multi_blocks.webm^headers^ |   0
 .../media/test/invalid-excess_discard.webm    | Bin
 .../test/invalid-excess_discard.webm^headers^ |   0
 .../test/invalid-excess_neg_discard.webm      | Bin
 .../invalid-excess_neg_discard.webm^headers^  |   0
 {content => dom}/media/test/invalid-m0c0.opus | Bin
 .../media/test/invalid-m0c0.opus^headers^     |   0
 {content => dom}/media/test/invalid-m0c3.opus | Bin
 .../media/test/invalid-m0c3.opus^headers^     |   0
 {content => dom}/media/test/invalid-m1c0.opus | Bin
 .../media/test/invalid-m1c0.opus^headers^     |   0
 {content => dom}/media/test/invalid-m1c9.opus | Bin
 .../media/test/invalid-m1c9.opus^headers^     |   0
 {content => dom}/media/test/invalid-m2c0.opus | Bin
 .../media/test/invalid-m2c0.opus^headers^     |   0
 {content => dom}/media/test/invalid-m2c1.opus | Bin
 .../media/test/invalid-m2c1.opus^headers^     |   0
 .../media/test/invalid-neg_discard.webm       | Bin
 .../test/invalid-neg_discard.webm^headers^    |   0
 .../media/test/invalid-preskip.webm           | Bin
 .../media/test/invalid-preskip.webm^headers^  |   0
 {content => dom}/media/test/long.vtt          |   0
 {content => dom}/media/test/make-headers.sh   |   0
 {content => dom}/media/test/manifest.js       |  20 +-
 {content => dom}/media/test/mochitest.ini     |   0
 .../test/multiple-bos-more-header-fileds.ogg  | Bin
 ...ltiple-bos-more-header-fileds.ogg^headers^ |   0
 {content => dom}/media/test/multiple-bos.ogg  | Bin
 .../media/test/multiple-bos.ogg^headers^      |   0
 {content => dom}/media/test/no-cues.webm      | Bin
 .../media/test/no-cues.webm^headers^          |   0
 .../media/test/noContentLength.sjs            |   2 +-
 {content => dom}/media/test/notags.mp3        | Bin
 .../media/test/notags.mp3^headers^            |   0
 .../media/test/owl-funnier-id3.mp3            | Bin
 .../media/test/owl-funnier-id3.mp3^headers^   |   0
 {content => dom}/media/test/owl-funny-id3.mp3 | Bin
 .../media/test/owl-funny-id3.mp3^headers^     |   0
 {content => dom}/media/test/owl.mp3           | Bin
 {content => dom}/media/test/owl.mp3^headers^  |   0
 {content => dom}/media/test/parser.vtt        |   0
 .../media/test/pixel_aspect_ratio.mp4         | Bin
 .../media/test/r11025_msadpcm_c1.wav          | Bin
 .../media/test/r11025_msadpcm_c1.wav^headers^ |   0
 {content => dom}/media/test/r11025_s16_c1.wav | Bin
 .../media/test/r11025_s16_c1.wav^headers^     |   0
 .../media/test/r11025_s16_c1_trailing.wav     | Bin
 .../test/r11025_s16_c1_trailing.wav^headers^  |   0
 {content => dom}/media/test/r11025_u8_c1.wav  | Bin
 .../media/test/r11025_u8_c1.wav^headers^      |   0
 .../media/test/r11025_u8_c1_trunc.wav         | Bin
 .../test/r11025_u8_c1_trunc.wav^headers^      |   0
 .../media/test/r16000_u8_c1_list.wav          | Bin
 .../media/test/r16000_u8_c1_list.wav^headers^ |   0
 .../media/test/reactivate_helper.html         |   0
 {content => dom}/media/test/redirect.sjs      |   2 +-
 {content => dom}/media/test/referer.sjs       |   4 +-
 {content => dom}/media/test/region.vtt        |   0
 .../media/test/sample-fisbone-skeleton4.ogv   | Bin
 .../sample-fisbone-skeleton4.ogv^headers^     |   0
 .../test/sample-fisbone-wrong-header.ogv      | Bin
 .../sample-fisbone-wrong-header.ogv^headers^  |   0
 {content => dom}/media/test/sample.3g2        | Bin
 {content => dom}/media/test/sample.3gp        | Bin
 {content => dom}/media/test/seek.ogv          | Bin
 {content => dom}/media/test/seek.ogv^headers^ |   0
 {content => dom}/media/test/seek.webm         | Bin
 .../media/test/seek.webm^headers^             |   0
 {content => dom}/media/test/seek.yuv          | Bin
 {content => dom}/media/test/seekLies.sjs      |   2 +-
 {content => dom}/media/test/seek_support.js   |   0
 .../media/test/seek_with_sound.ogg            | Bin
 .../media/test/seek_with_sound.ogg^headers^   |   0
 {content => dom}/media/test/short-cenc.mp4    | Bin
 {content => dom}/media/test/short-cenc.xml    |   0
 {content => dom}/media/test/short-video.ogv   | Bin
 .../media/test/short-video.ogv^headers^       |   0
 {content => dom}/media/test/short.mp4         | Bin
 .../media/test/small-shot-mp3.mp4             | Bin
 .../media/test/small-shot-mp3.mp4^headers^    |   0
 {content => dom}/media/test/small-shot.m4a    | Bin
 {content => dom}/media/test/small-shot.mp3    | Bin
 .../media/test/small-shot.mp3^headers^        |   0
 {content => dom}/media/test/small-shot.ogg    | Bin
 .../media/test/small-shot.ogg^headers^        |   0
 {content => dom}/media/test/sound.ogg         | Bin
 .../media/test/sound.ogg^headers^             |   0
 .../media/test/spacestorm-1000Hz-100ms.ogg    | Bin
 .../test/spacestorm-1000Hz-100ms.ogg^headers^ |   0
 {content => dom}/media/test/split.webm        | Bin
 .../media/test/split.webm^headers^            |   0
 {content => dom}/media/test/street.mp4        | Bin
 .../media/test/street.mp4^headers^            |   0
 {content => dom}/media/test/test-1-mono.opus  | Bin
 .../media/test/test-1-mono.opus^headers^      |   0
 .../media/test/test-2-stereo.opus             | Bin
 .../media/test/test-2-stereo.opus^headers^    |   0
 {content => dom}/media/test/test-3-LCR.opus   | Bin
 .../media/test/test-3-LCR.opus^headers^       |   0
 {content => dom}/media/test/test-4-quad.opus  | Bin
 .../media/test/test-4-quad.opus^headers^      |   0
 {content => dom}/media/test/test-5-5.0.opus   | Bin
 .../media/test/test-5-5.0.opus^headers^       |   0
 {content => dom}/media/test/test-6-5.1.opus   | Bin
 .../media/test/test-6-5.1.opus^headers^       |   0
 {content => dom}/media/test/test-7-6.1.opus   | Bin
 .../media/test/test-7-6.1.opus^headers^       |   0
 {content => dom}/media/test/test-8-7.1.opus   | Bin
 .../media/test/test-8-7.1.opus^headers^       |   0
 .../media/test/test_VideoPlaybackQuality.html |   0
 .../test_VideoPlaybackQuality_disabled.html   |   0
 .../media/test/test_access_control.html       |   2 +-
 .../media/test/test_aspectratio_mp4.html      |   0
 {content => dom}/media/test/test_audio1.html  |   0
 {content => dom}/media/test/test_audio2.html  |   0
 .../media/test/test_audioDocumentTitle.html   |   0
 .../media/test/test_autoplay.html             |   0
 .../test/test_autoplay_contentEditable.html   |   0
 .../media/test/test_buffered.html             |   0
 .../media/test/test_bug1018933.html           |   0
 .../media/test/test_bug448534.html            |   0
 .../media/test/test_bug463162.xhtml           |   0
 .../media/test/test_bug465498.html            |   0
 .../media/test/test_bug493187.html            |   0
 .../media/test/test_bug495145.html            |   0
 .../media/test/test_bug495300.html            |   0
 .../media/test/test_bug654550.html            |   0
 .../media/test/test_bug686942.html            |   0
 .../media/test/test_bug726904.html            |   2 +-
 .../media/test/test_bug874897.html            |   0
 .../media/test/test_bug883173.html            |   0
 .../media/test/test_bug895091.html            |   0
 .../media/test/test_bug895305.html            |   0
 .../media/test/test_bug919265.html            |   0
 .../media/test/test_bug957847.html            |   0
 .../media/test/test_can_play_type.html        |   0
 .../media/test/test_can_play_type_mpeg.html   |   0
 .../media/test/test_can_play_type_no_ogg.html |   0
 .../test/test_can_play_type_no_wave.html      |   0
 .../test/test_can_play_type_no_webm.html      |   0
 .../media/test/test_can_play_type_ogg.html    |   0
 .../media/test/test_can_play_type_wave.html   |   0
 .../media/test/test_can_play_type_webm.html   |   0
 .../media/test/test_chaining.html             |   0
 .../media/test/test_clone_media_element.html  |   0
 .../media/test/test_closing_connections.html  |   0
 .../media/test/test_constants.html            |   0
 .../media/test/test_contentDuration1.html     |   0
 .../media/test/test_contentDuration2.html     |   0
 .../media/test/test_contentDuration3.html     |   0
 .../media/test/test_contentDuration4.html     |   0
 .../media/test/test_contentDuration5.html     |   0
 .../media/test/test_contentDuration6.html     |   0
 .../media/test/test_contentDuration7.html     |   0
 .../media/test/test_controls.html             |   0
 .../media/test/test_currentTime.html          |   0
 .../media/test/test_decode_error.html         |   0
 .../media/test/test_decoder_disable.html      |   0
 .../media/test/test_defaultMuted.html         |   2 +-
 .../media/test/test_delay_load.html           |   0
 .../test/test_encryptedMediaExtensions.html   |   0
 .../test/test_error_in_video_document.html    |   0
 .../media/test/test_error_on_404.html         |   0
 .../media/test/test_fastSeek-forwards.html    |   0
 .../media/test/test_fastSeek.html             |   0
 .../media/test/test_fragment_noplay.html      |   0
 .../media/test/test_fragment_play.html        |   0
 .../media/test/test_imagecapture.html         |   0
 .../media/test/test_info_leak.html            |   0
 .../media/test/test_invalid_reject.html       |   0
 .../media/test/test_invalid_reject_play.html  |   0
 .../media/test/test_invalid_seek.html         |   0
 {content => dom}/media/test/test_load.html    |   0
 .../media/test/test_load_candidates.html      |   0
 .../media/test/test_load_same_resource.html   |   0
 .../media/test/test_load_source.html          |   0
 {content => dom}/media/test/test_loop.html    |   0
 .../media/test/test_media_selection.html      |   0
 .../media/test/test_media_sniffer.html        |   0
 .../test_mediarecorder_avoid_recursion.html   |   0
 .../test/test_mediarecorder_creation.html     |   0
 .../test_mediarecorder_creation_fail.html     |   0
 .../test_mediarecorder_getencodeddata.html    |   0
 ...mediarecorder_record_4ch_audiocontext.html |   0
 ...est_mediarecorder_record_audiocontext.html |   0
 ...mediarecorder_record_audiocontext_mlk.html |   0
 .../test_mediarecorder_record_audionode.html  |   0
 ...diarecorder_record_getdata_afterstart.html |   0
 ...iarecorder_record_gum_video_timeslice.html |   0
 ...t_mediarecorder_record_immediate_stop.html |   0
 ...est_mediarecorder_record_no_timeslice.html |   0
 .../test/test_mediarecorder_record_nosrc.html |   0
 .../test_mediarecorder_record_session.html    |   0
 ...t_mediarecorder_record_startstopstart.html |   0
 .../test_mediarecorder_record_stopms.html     |   0
 .../test_mediarecorder_record_timeslice.html  |   0
 .../test/test_mediarecorder_reload_crash.html |   0
 .../test_mediarecorder_state_transition.html  |   0
 .../test_mediarecorder_unsupported_src.html   |   0
 ...st_mediatrack_consuming_mediaresource.html |   0
 ...test_mediatrack_consuming_mediastream.html |   0
 .../media/test/test_mediatrack_events.html    |   0
 .../test/test_mediatrack_parsing_ogg.html     |   0
 .../test/test_mediatrack_replay_from_end.html |   0
 .../media/test/test_metadata.html             |   0
 .../media/test/test_mixed_principals.html     |   4 +-
 .../media/test/test_mozHasAudio.html          |   0
 .../media/test/test_networkState.html         |   0
 .../media/test/test_new_audio.html            |   0
 .../media/test/test_no_load_event.html        |   0
 {content => dom}/media/test/test_paused.html  |   0
 .../media/test/test_paused_after_ended.html   |   0
 .../media/test/test_play_events.html          |   0
 .../media/test/test_play_events_2.html        |   0
 .../media/test/test_play_twice.html           |   0
 .../media/test/test_playback.html             |   0
 .../media/test/test_playback_errors.html      |   0
 .../media/test/test_playback_rate.html        |   0
 .../test/test_playback_rate_playpause.html    |   0
 {content => dom}/media/test/test_played.html  |   0
 .../media/test/test_preload_actions.html      |   0
 .../media/test/test_preload_attribute.html    |   0
 .../media/test/test_preload_suspend.html      |   0
 .../media/test/test_progress.html             |   0
 .../media/test/test_reactivate.html           |   0
 .../media/test/test_readyState.html           |   0
 {content => dom}/media/test/test_referer.html |   0
 .../media/test/test_replay_metadata.html      |   0
 .../media/test/test_reset_events_async.html   |   0
 .../media/test/test_reset_src.html            |   0
 {content => dom}/media/test/test_resume.html  |   0
 {content => dom}/media/test/test_seek-1.html  |   0
 {content => dom}/media/test/test_seek-10.html |   0
 {content => dom}/media/test/test_seek-11.html |   0
 {content => dom}/media/test/test_seek-12.html |   0
 {content => dom}/media/test/test_seek-13.html |   0
 {content => dom}/media/test/test_seek-2.html  |   0
 {content => dom}/media/test/test_seek-3.html  |   0
 {content => dom}/media/test/test_seek-4.html  |   0
 {content => dom}/media/test/test_seek-5.html  |   0
 {content => dom}/media/test/test_seek-6.html  |   0
 {content => dom}/media/test/test_seek-7.html  |   0
 {content => dom}/media/test/test_seek-8.html  |   0
 {content => dom}/media/test/test_seek-9.html  |   0
 .../media/test/test_seekLies.html             |   0
 .../media/test/test_seek_out_of_range.html    |   0
 .../media/test/test_seekable1.html            |   0
 .../media/test/test_seekable2.html            |   0
 .../media/test/test_seekable3.html            |   0
 {content => dom}/media/test/test_source.html  |   0
 .../media/test/test_source_media.html         |   2 +-
 .../media/test/test_source_null.html          |   0
 .../media/test/test_source_write.html         |   0
 .../media/test/test_standalone.html           |   0
 .../media/test/test_streams_autoplay.html     |   0
 .../test/test_streams_element_capture.html    |   0
 ...reams_element_capture_createObjectURL.html |   0
 ...test_streams_element_capture_playback.html |   0
 .../test_streams_element_capture_reset.html   |   0
 .../media/test/test_streams_gc.html           |   0
 .../media/test/test_streams_srcObject.html    |   0
 .../media/test/test_streams_tracks.html       |   0
 .../media/test/test_texttrack.html            |   0
 .../media/test/test_texttrack_chrome.html     |   0
 .../media/test/test_texttrackcue.html         |   0
 .../media/test/test_texttrackcue_chrome.html  |   0
 .../media/test/test_texttracklist.html        |   0
 .../media/test/test_texttracklist_chrome.html |   0
 .../media/test/test_texttrackregion.html      |   0
 .../test/test_timeupdate_small_files.html     |   0
 .../media/test/test_trackelementevent.html    |   0
 .../media/test/test_trackevent.html           |   0
 .../media/test/test_unseekable.html           |   0
 .../media/test/test_videoDocumentTitle.html   |   0
 .../test/test_video_in_audio_element.html     |   0
 .../media/test/test_video_to_canvas.html      |   0
 {content => dom}/media/test/test_volume.html  |   0
 .../media/test/test_vttparser.html            |   0
 .../media/test/test_wav_ended1.html           |   0
 .../media/test/test_wav_ended2.html           |   0
 .../media/test/test_webvtt_disabled.html      |   0
 .../media/test/variable-channel.ogg           | Bin
 .../media/test/variable-channel.ogg^headers^  |   0
 .../media/test/variable-channel.opus          | Bin
 .../media/test/variable-channel.opus^headers^ |   0
 .../media/test/variable-preskip.opus          | Bin
 .../media/test/variable-preskip.opus^headers^ |   0
 .../media/test/variable-samplerate.ogg        | Bin
 .../test/variable-samplerate.ogg^headers^     |   0
 .../media/test/variable-samplerate.opus       | Bin
 .../test/variable-samplerate.opus^headers^    |   0
 {content => dom}/media/test/vbr-head.mp3      | Bin
 .../media/test/vbr-head.mp3^headers^          |   0
 {content => dom}/media/test/vbr.mp3           | Bin
 {content => dom}/media/test/vbr.mp3^headers^  |   0
 .../media/test/video-overhang.ogg             | Bin
 .../media/test/video-overhang.ogg^headers^    |   0
 {content => dom}/media/test/vp9.webm          | Bin
 {content => dom}/media/test/vp9.webm^headers^ |   0
 {content => dom}/media/test/vp9cake.webm      | Bin
 .../media/test/vp9cake.webm^headers^          |   0
 {content => dom}/media/test/wave_metadata.wav | Bin
 .../media/test/wave_metadata.wav^headers^     |   0
 .../media/test/wave_metadata_bad_len.wav      | Bin
 .../test/wave_metadata_bad_len.wav^headers^   |   0
 .../media/test/wave_metadata_bad_no_null.wav  | Bin
 .../wave_metadata_bad_no_null.wav^headers^    |   0
 .../media/test/wave_metadata_bad_utf8.wav     | Bin
 .../test/wave_metadata_bad_utf8.wav^headers^  |   0
 .../media/test/wave_metadata_unknown_tag.wav  | Bin
 .../wave_metadata_unknown_tag.wav^headers^    |   0
 .../media/test/wave_metadata_utf8.wav         | Bin
 .../test/wave_metadata_utf8.wav^headers^      |   0
 {content => dom}/media/test/wavedata_s16.wav  | Bin
 .../media/test/wavedata_s16.wav^headers^      |   0
 {content => dom}/media/test/wavedata_u8.wav   | Bin
 .../media/test/wavedata_u8.wav^headers^       |   0
 {content => dom}/media/wave/WaveDecoder.cpp   |   0
 {content => dom}/media/wave/WaveDecoder.h     |   0
 {content => dom}/media/wave/WaveReader.cpp    |   0
 {content => dom}/media/wave/WaveReader.h      |   0
 {content => dom}/media/wave/moz.build         |   0
 .../media/webaudio/AnalyserNode.cpp           |   0
 .../media/webaudio/AnalyserNode.h             |   0
 .../media/webaudio/AudioBuffer.cpp            |   0
 {content => dom}/media/webaudio/AudioBuffer.h |   0
 .../media/webaudio/AudioBufferSourceNode.cpp  |   0
 .../media/webaudio/AudioBufferSourceNode.h    |   0
 .../media/webaudio/AudioContext.cpp           |   0
 .../media/webaudio/AudioContext.h             |   2 +-
 .../media/webaudio/AudioDestinationNode.cpp   |   0
 .../media/webaudio/AudioDestinationNode.h     |   0
 .../media/webaudio/AudioEventTimeline.h       |   0
 .../media/webaudio/AudioListener.cpp          |   0
 .../media/webaudio/AudioListener.h            |   0
 {content => dom}/media/webaudio/AudioNode.cpp |   0
 {content => dom}/media/webaudio/AudioNode.h   |   0
 .../media/webaudio/AudioNodeEngine.cpp        |   0
 .../media/webaudio/AudioNodeEngine.h          |   0
 .../media/webaudio/AudioNodeEngineNEON.cpp    |   0
 .../media/webaudio/AudioNodeEngineNEON.h      |   0
 .../webaudio/AudioNodeExternalInputStream.cpp |   0
 .../webaudio/AudioNodeExternalInputStream.h   |   0
 .../media/webaudio/AudioNodeStream.cpp        |   0
 .../media/webaudio/AudioNodeStream.h          |   0
 .../media/webaudio/AudioParam.cpp             |   0
 {content => dom}/media/webaudio/AudioParam.h  |   0
 .../media/webaudio/AudioParamTimeline.h       |   0
 .../media/webaudio/AudioProcessingEvent.cpp   |   0
 .../media/webaudio/AudioProcessingEvent.h     |   0
 .../media/webaudio/BiquadFilterNode.cpp       |   0
 .../media/webaudio/BiquadFilterNode.h         |   0
 .../media/webaudio/BufferDecoder.cpp          |   0
 .../media/webaudio/BufferDecoder.h            |   0
 .../media/webaudio/ChannelMergerNode.cpp      |   0
 .../media/webaudio/ChannelMergerNode.h        |   0
 .../media/webaudio/ChannelSplitterNode.cpp    |   0
 .../media/webaudio/ChannelSplitterNode.h      |   0
 .../media/webaudio/ConvolverNode.cpp          |   0
 .../media/webaudio/ConvolverNode.h            |   0
 .../media/webaudio/DelayBuffer.cpp            |   0
 {content => dom}/media/webaudio/DelayBuffer.h |   0
 {content => dom}/media/webaudio/DelayNode.cpp |   0
 {content => dom}/media/webaudio/DelayNode.h   |   0
 .../media/webaudio/DynamicsCompressorNode.cpp |   0
 .../media/webaudio/DynamicsCompressorNode.h   |   0
 {content => dom}/media/webaudio/FFTBlock.cpp  |   0
 {content => dom}/media/webaudio/FFTBlock.h    |   0
 {content => dom}/media/webaudio/GainNode.cpp  |   0
 {content => dom}/media/webaudio/GainNode.h    |   0
 .../media/webaudio/MediaBufferDecoder.cpp     |   0
 .../media/webaudio/MediaBufferDecoder.h       |   0
 .../webaudio/MediaElementAudioSourceNode.cpp  |   0
 .../webaudio/MediaElementAudioSourceNode.h    |   0
 .../MediaStreamAudioDestinationNode.cpp       |   0
 .../MediaStreamAudioDestinationNode.h         |   0
 .../webaudio/MediaStreamAudioSourceNode.cpp   |   0
 .../webaudio/MediaStreamAudioSourceNode.h     |   0
 .../webaudio/OfflineAudioCompletionEvent.cpp  |   0
 .../webaudio/OfflineAudioCompletionEvent.h    |   0
 .../media/webaudio/OscillatorNode.cpp         |   0
 .../media/webaudio/OscillatorNode.h           |   0
 .../media/webaudio/PannerNode.cpp             |   0
 {content => dom}/media/webaudio/PannerNode.h  |   0
 .../media/webaudio/PeriodicWave.cpp           |   0
 .../media/webaudio/PeriodicWave.h             |   0
 .../media/webaudio/PlayingRefChangeHandler.h  |   0
 .../media/webaudio/ReportDecodeResultTask.h   |   0
 .../media/webaudio/ScriptProcessorNode.cpp    |   0
 .../media/webaudio/ScriptProcessorNode.h      |   0
 .../media/webaudio/ThreeDPoint.cpp            |   0
 {content => dom}/media/webaudio/ThreeDPoint.h |   0
 .../media/webaudio/WaveShaperNode.cpp         |   0
 .../media/webaudio/WaveShaperNode.h           |   0
 .../media/webaudio/WebAudioUtils.cpp          |   0
 .../media/webaudio/WebAudioUtils.h            |   0
 .../media/webaudio/blink/Biquad.cpp           |   0
 .../media/webaudio/blink/Biquad.h             |   0
 .../media/webaudio/blink/DenormalDisabler.h   |   0
 .../media/webaudio/blink/DirectConvolver.cpp  |   0
 .../media/webaudio/blink/DirectConvolver.h    |   0
 .../webaudio/blink/DynamicsCompressor.cpp     |   0
 .../media/webaudio/blink/DynamicsCompressor.h |   0
 .../blink/DynamicsCompressorKernel.cpp        |   0
 .../webaudio/blink/DynamicsCompressorKernel.h |   0
 .../media/webaudio/blink/FFTConvolver.cpp     |   0
 .../media/webaudio/blink/FFTConvolver.h       |   0
 .../media/webaudio/blink/HRTFDatabase.cpp     |   0
 .../media/webaudio/blink/HRTFDatabase.h       |   0
 .../webaudio/blink/HRTFDatabaseLoader.cpp     |   0
 .../media/webaudio/blink/HRTFDatabaseLoader.h |   0
 .../media/webaudio/blink/HRTFElevation.cpp    |   0
 .../media/webaudio/blink/HRTFElevation.h      |   0
 .../media/webaudio/blink/HRTFKernel.cpp       |   0
 .../media/webaudio/blink/HRTFKernel.h         |   0
 .../media/webaudio/blink/HRTFPanner.cpp       |   0
 .../media/webaudio/blink/HRTFPanner.h         |   0
 .../blink/IRC_Composite_C_R0195-incl.cpp      |   0
 .../media/webaudio/blink/PeriodicWave.cpp     |   0
 .../media/webaudio/blink/PeriodicWave.h       |   0
 {content => dom}/media/webaudio/blink/README  |   0
 .../media/webaudio/blink/Reverb.cpp           |   0
 .../media/webaudio/blink/Reverb.h             |   0
 .../blink/ReverbAccumulationBuffer.cpp        |   0
 .../webaudio/blink/ReverbAccumulationBuffer.h |   0
 .../media/webaudio/blink/ReverbConvolver.cpp  |   0
 .../media/webaudio/blink/ReverbConvolver.h    |   0
 .../webaudio/blink/ReverbConvolverStage.cpp   |   0
 .../webaudio/blink/ReverbConvolverStage.h     |   0
 .../webaudio/blink/ReverbInputBuffer.cpp      |   0
 .../media/webaudio/blink/ReverbInputBuffer.h  |   0
 .../media/webaudio/blink/ZeroPole.cpp         |   0
 .../media/webaudio/blink/ZeroPole.h           |   0
 .../media/webaudio/blink/moz.build            |   2 +-
 .../compiledtest/TestAudioEventTimeline.cpp   |   0
 .../media/webaudio/compiledtest/moz.build     |   0
 {content => dom}/media/webaudio/moz.build     |   0
 .../media/webaudio/test/audio-expected.wav    | Bin
 .../webaudio/test/audio-mono-expected-2.wav   | Bin
 .../webaudio/test/audio-mono-expected.wav     | Bin
 .../media/webaudio/test/audio-quad.wav        | Bin
 .../media/webaudio/test/audio.ogv             | Bin
 .../audioBufferSourceNodeNeutered_worker.js   |   0
 .../media/webaudio/test/blink/README          |   0
 .../webaudio/test/blink/audio-testing.js      |   0
 .../test/blink/convolution-testing.js         |   0
 .../media/webaudio/test/blink/mochitest.ini   |   0
 .../test/blink/panner-model-testing.js        |   0
 .../media/webaudio/test/browser.ini           |   0
 .../test/browser_mozAudioChannel.html         |   0
 .../webaudio/test/browser_mozAudioChannel.js  |   2 +-
 .../test/browser_mozAudioChannel_muted.html   |   0
 .../test/browser_mozAudioChannel_muted.js     |   2 +-
 .../media/webaudio/test/chrome.ini            |   0
 .../media/webaudio/test/invalid.txt           |   0
 .../media/webaudio/test/layouttest-glue.js    |   0
 .../media/webaudio/test/mochitest.ini         |   0
 .../media/webaudio/test/noaudio.webm          | Bin
 .../webaudio/test/small-shot-expected.wav     | Bin
 .../test/small-shot-mono-expected.wav         | Bin
 .../media/webaudio/test/small-shot.mp3        | Bin
 .../media/webaudio/test/small-shot.ogg        | Bin
 .../media/webaudio/test/test_AudioBuffer.html |   0
 .../webaudio/test/test_AudioContext.html      |   0
 .../webaudio/test/test_AudioListener.html     |   0
 .../test/test_AudioNodeDevtoolsAPI.html       |   0
 .../test/test_OfflineAudioContext.html        |   0
 .../webaudio/test/test_analyserNode.html      |   0
 .../test/test_analyserNodeOutput.html         |   0
 .../test/test_analyserNodePassThrough.html    |   0
 .../test/test_audioBufferSourceNode.html      |   0
 .../test/test_audioBufferSourceNodeEnded.html |   0
 ...st_audioBufferSourceNodeLazyLoopParam.html |   0
 .../test/test_audioBufferSourceNodeLoop.html  |   0
 ...est_audioBufferSourceNodeLoopStartEnd.html |   0
 ...audioBufferSourceNodeLoopStartEndSame.html |   0
 .../test_audioBufferSourceNodeNeutered.html   |   0
 .../test_audioBufferSourceNodeNoStart.html    |   0
 .../test_audioBufferSourceNodeNullBuffer.html |   0
 .../test_audioBufferSourceNodeOffset.html     |   0
 ...test_audioBufferSourceNodePassThrough.html |   0
 .../test/test_audioDestinationNode.html       |   0
 .../test/test_audioParamExponentialRamp.html  |   0
 .../webaudio/test/test_audioParamGain.html    |   0
 .../test/test_audioParamLinearRamp.html       |   0
 .../test/test_audioParamSetCurveAtTime.html   |   0
 ..._audioParamSetCurveAtTimeZeroDuration.html |   0
 .../test/test_audioParamSetTargetAtTime.html  |   0
 .../test/test_audioParamSetValueAtTime.html   |   0
 ...t_audioParamTimelineDestinationOffset.html |   0
 .../media/webaudio/test/test_badConnect.html  |   0
 .../webaudio/test/test_biquadFilterNode.html  |   0
 .../test_biquadFilterNodePassThrough.html     |   0
 .../test/test_biquadFilterNodeWithGain.html   |   0
 .../media/webaudio/test/test_bug1056032.html  |   0
 .../media/webaudio/test/test_bug808374.html   |   0
 .../media/webaudio/test/test_bug827541.html   |   0
 .../media/webaudio/test/test_bug839753.html   |   0
 .../media/webaudio/test/test_bug845960.html   |   0
 .../media/webaudio/test/test_bug856771.html   |   0
 .../media/webaudio/test/test_bug866570.html   |   0
 .../media/webaudio/test/test_bug866737.html   |   0
 .../media/webaudio/test/test_bug867089.html   |   0
 .../media/webaudio/test/test_bug867104.html   |   0
 .../media/webaudio/test/test_bug867174.html   |   0
 .../media/webaudio/test/test_bug867203.html   |   0
 .../media/webaudio/test/test_bug875221.html   |   0
 .../media/webaudio/test/test_bug875402.html   |   0
 .../media/webaudio/test/test_bug894150.html   |   0
 .../media/webaudio/test/test_bug956489.html   |   0
 .../media/webaudio/test/test_bug964376.html   |   0
 .../media/webaudio/test/test_bug972678.html   |   0
 .../webaudio/test/test_channelMergerNode.html |   0
 .../test_channelMergerNodeWithVolume.html     |   0
 .../test/test_channelSplitterNode.html        |   0
 .../test_channelSplitterNodeWithVolume.html   |   0
 .../webaudio/test/test_convolverNode.html     |   0
 .../test/test_convolverNodeChannelCount.html  |   0
 .../test/test_convolverNodePassThrough.html   |   0
 .../test/test_convolverNodeWithGain.html      |   0
 .../test/test_convolverNode_mono_mono.html    |   0
 .../media/webaudio/test/test_currentTime.html |   0
 .../test/test_decodeMultichannel.html         |   0
 .../media/webaudio/test/test_delayNode.html   |   0
 .../webaudio/test/test_delayNodeAtMax.html    |   0
 .../test/test_delayNodeChannelChanges.html    |   0
 .../webaudio/test/test_delayNodeCycles.html   |   0
 .../test/test_delayNodePassThrough.html       |   0
 .../test/test_delayNodeSmallMaxDelay.html     |   0
 .../test/test_delayNodeTailIncrease.html      |   0
 .../test_delayNodeTailWithDisconnect.html     |   0
 .../test/test_delayNodeTailWithGain.html      |   0
 .../test/test_delayNodeTailWithReconnect.html |   0
 .../webaudio/test/test_delayNodeWithGain.html |   0
 .../test/test_dynamicsCompressorNode.html     |   0
 ...est_dynamicsCompressorNodePassThrough.html |   0
 .../media/webaudio/test/test_gainNode.html    |   0
 .../webaudio/test/test_gainNodeInLoop.html    |   0
 .../test/test_gainNodePassThrough.html        |   0
 .../webaudio/test/test_maxChannelCount.html   |   0
 .../webaudio/test/test_mediaDecoding.html     |   0
 .../test_mediaElementAudioSourceNode.html     |   0
 ...ediaElementAudioSourceNodePassThrough.html |   0
 .../test_mediaStreamAudioDestinationNode.html |   0
 .../test/test_mediaStreamAudioSourceNode.html |   0
 ...mediaStreamAudioSourceNodeCrossOrigin.html |   2 +-
 ...mediaStreamAudioSourceNodePassThrough.html |   0
 ..._mediaStreamAudioSourceNodeResampling.html |   0
 .../media/webaudio/test/test_mixingRules.html |   0
 .../webaudio/test/test_mozaudiochannel.html   |   0
 .../test/test_nodeToParamConnection.html      |   0
 ...st_offlineDestinationChannelCountLess.html |   0
 ...st_offlineDestinationChannelCountMore.html |   0
 .../webaudio/test/test_oscillatorNode.html    |   0
 .../webaudio/test/test_oscillatorNode2.html   |   0
 .../test/test_oscillatorNodePassThrough.html  |   0
 .../test/test_oscillatorNodeStart.html        |   0
 .../test/test_oscillatorTypeChange.html       |   0
 .../media/webaudio/test/test_pannerNode.html  |   0
 .../webaudio/test/test_pannerNodeAbove.html   |   0
 .../test/test_pannerNodeChannelCount.html     |   0
 .../test/test_pannerNodeHRTFSymmetry.html     |   0
 .../test/test_pannerNodePassThrough.html      |   0
 .../webaudio/test/test_pannerNodeTail.html    |   0
 .../test/test_pannerNode_equalPower.html      |   0
 .../webaudio/test/test_periodicWave.html      |   0
 .../test/test_scriptProcessorNode.html        |   0
 .../test_scriptProcessorNodeChannelCount.html |   0
 .../test_scriptProcessorNodeNotConnected.html |   0
 .../test_scriptProcessorNodePassThrough.html  |   0
 ...st_scriptProcessorNodeZeroInputOutput.html |   0
 ...est_scriptProcessorNode_playbackTime1.html |   0
 .../webaudio/test/test_singleSourceDest.html  |   0
 .../test/test_stereoPanningWithGain.html      |   0
 .../media/webaudio/test/test_waveDecoder.html |   0
 .../media/webaudio/test/test_waveShaper.html  |   0
 .../webaudio/test/test_waveShaperNoCurve.html |   0
 .../test/test_waveShaperPassThrough.html      |   0
 .../test/test_waveShaperZeroLengthCurve.html  |   0
 .../media/webaudio/test/ting-44.1k-1ch.ogg    | Bin
 .../media/webaudio/test/ting-44.1k-1ch.wav    | Bin
 .../media/webaudio/test/ting-44.1k-2ch.ogg    | Bin
 .../media/webaudio/test/ting-44.1k-2ch.wav    | Bin
 .../media/webaudio/test/ting-48k-1ch.ogg      | Bin
 .../media/webaudio/test/ting-48k-1ch.wav      | Bin
 .../media/webaudio/test/ting-48k-2ch.ogg      | Bin
 .../media/webaudio/test/ting-48k-2ch.wav      | Bin
 .../webaudio/test/ting-dualchannel44.1.wav    | Bin
 .../webaudio/test/ting-dualchannel48.wav      | Bin
 .../media/webaudio/test/webaudio.js           |   0
 {content => dom}/media/webm/EbmlComposer.cpp  |   0
 {content => dom}/media/webm/EbmlComposer.h    |   0
 .../media/webm/WebMBufferedParser.cpp         |   0
 .../media/webm/WebMBufferedParser.h           |   0
 {content => dom}/media/webm/WebMDecoder.cpp   |   0
 {content => dom}/media/webm/WebMDecoder.h     |   0
 {content => dom}/media/webm/WebMReader.cpp    |   0
 {content => dom}/media/webm/WebMReader.h      |   0
 {content => dom}/media/webm/WebMWriter.cpp    |   0
 {content => dom}/media/webm/WebMWriter.h      |   0
 {content => dom}/media/webm/moz.build         |   0
 .../media/webrtc/AudioOutputObserver.h        |   0
 {content => dom}/media/webrtc/MediaEngine.h   |   0
 .../webrtc/MediaEngineCameraVideoSource.cpp   |   0
 .../webrtc/MediaEngineCameraVideoSource.h     |   0
 .../media/webrtc/MediaEngineDefault.cpp       |   0
 .../media/webrtc/MediaEngineDefault.h         |   0
 .../webrtc/MediaEngineGonkVideoSource.cpp     |   0
 .../media/webrtc/MediaEngineGonkVideoSource.h |   0
 .../webrtc/MediaEngineTabVideoSource.cpp      |   0
 .../media/webrtc/MediaEngineTabVideoSource.h  |   0
 .../media/webrtc/MediaEngineWebRTC.cpp        |   0
 .../media/webrtc/MediaEngineWebRTC.h          |   0
 .../media/webrtc/MediaEngineWebRTCAudio.cpp   |   0
 .../media/webrtc/MediaEngineWebRTCVideo.cpp   |   0
 .../media/webrtc/MediaTrackConstraints.h      |   0
 .../media/webrtc/PeerIdentity.cpp             |   0
 {content => dom}/media/webrtc/PeerIdentity.h  |   0
 {content => dom}/media/webrtc/moz.build       |   0
 .../media/webrtc/nsITabSource.idl             |   0
 {content => dom}/media/webspeech/moz.build    |   0
 .../webspeech/recognition/SpeechGrammar.cpp   |   0
 .../webspeech/recognition/SpeechGrammar.h     |   0
 .../recognition/SpeechGrammarList.cpp         |   0
 .../webspeech/recognition/SpeechGrammarList.h |   0
 .../recognition/SpeechRecognition.cpp         |   0
 .../webspeech/recognition/SpeechRecognition.h |   0
 .../SpeechRecognitionAlternative.cpp          |   0
 .../SpeechRecognitionAlternative.h            |   0
 .../recognition/SpeechRecognitionResult.cpp   |   0
 .../recognition/SpeechRecognitionResult.h     |   0
 .../SpeechRecognitionResultList.cpp           |   0
 .../recognition/SpeechRecognitionResultList.h |   0
 .../recognition/SpeechStreamListener.cpp      |   0
 .../recognition/SpeechStreamListener.h        |   0
 .../media/webspeech/recognition/endpointer.cc |   0
 .../media/webspeech/recognition/endpointer.h  |   0
 .../recognition/energy_endpointer.cc          |   0
 .../webspeech/recognition/energy_endpointer.h |   0
 .../recognition/energy_endpointer_params.cc   |   0
 .../recognition/energy_endpointer_params.h    |   0
 .../media/webspeech/recognition/moz.build     |   0
 .../nsISpeechRecognitionService.idl           |   0
 .../test/FakeSpeechRecognitionService.cpp     |   0
 .../test/FakeSpeechRecognitionService.h       |   0
 .../media/webspeech/recognition/test/head.js  |   0
 .../webspeech/recognition/test/hello.ogg      | Bin
 .../recognition/test/hello.ogg^headers^       |   0
 .../webspeech/recognition/test/mochitest.ini  |   0
 .../webspeech/recognition/test/silence.ogg    | Bin
 .../recognition/test/silence.ogg^headers^     |   0
 .../recognition/test/test_abort.html          |   0
 .../test/test_audio_capture_error.html        |   0
 .../test_call_start_from_end_handler.html     |   0
 .../test/test_nested_eventloop.html           |   0
 .../test/test_preference_enable.html          |   0
 .../test/test_recognition_service_error.html  |   0
 ...t_success_without_recognition_service.html |   0
 .../recognition/test/test_timeout.html        |   0
 .../media/webspeech/synth/SpeechSynthesis.cpp |   0
 .../media/webspeech/synth/SpeechSynthesis.h   |   0
 .../synth/SpeechSynthesisUtterance.cpp        |   0
 .../synth/SpeechSynthesisUtterance.h          |   0
 .../webspeech/synth/SpeechSynthesisVoice.cpp  |   0
 .../webspeech/synth/SpeechSynthesisVoice.h    |   0
 .../webspeech/synth/ipc/PSpeechSynthesis.ipdl |   0
 .../synth/ipc/PSpeechSynthesisRequest.ipdl    |   0
 .../synth/ipc/SpeechSynthesisChild.cpp        |   0
 .../synth/ipc/SpeechSynthesisChild.h          |   0
 .../synth/ipc/SpeechSynthesisParent.cpp       |   0
 .../synth/ipc/SpeechSynthesisParent.h         |   0
 .../webspeech/synth/ipc/test/file_ipc.html    |   0
 .../webspeech/synth/ipc/test/mochitest.ini    |   0
 .../webspeech/synth/ipc/test/test_ipc.html    |   0
 .../media/webspeech/synth/moz.build           |   0
 .../webspeech/synth/nsISpeechService.idl      |   0
 .../webspeech/synth/nsISynthVoiceRegistry.idl |   0
 .../media/webspeech/synth/nsSpeechTask.cpp    |   0
 .../media/webspeech/synth/nsSpeechTask.h      |   0
 .../webspeech/synth/nsSynthVoiceRegistry.cpp  |   0
 .../webspeech/synth/nsSynthVoiceRegistry.h    |   0
 .../media/webspeech/synth/pico/PicoModule.cpp |   0
 .../media/webspeech/synth/pico/moz.build      |   0
 .../webspeech/synth/pico/nsPicoService.cpp    |   0
 .../webspeech/synth/pico/nsPicoService.h      |   0
 .../media/webspeech/synth/test/common.js      |   0
 .../webspeech/synth/test/file_setup.html      |   0
 .../synth/test/file_speech_queue.html         |   0
 .../synth/test/file_speech_simple.html        |   0
 .../media/webspeech/synth/test/mochitest.ini  |   0
 .../webspeech/synth/test/test_setup.html      |   0
 .../synth/test/test_speech_queue.html         |   0
 .../synth/test/test_speech_simple.html        |   0
 {content => dom}/media/webvtt/WebVTT.manifest |   0
 .../media/webvtt/WebVTTParserWrapper.js       |   0
 {content => dom}/media/webvtt/moz.build       |   0
 .../media/webvtt/nsIWebVTTListener.idl        |   0
 .../media/webvtt/nsIWebVTTParserWrapper.idl   |   0
 {content => dom}/media/webvtt/package.json    |   0
 .../media/webvtt/update-webvtt.js             |   0
 {content => dom}/media/webvtt/vtt.jsm         |   0
 {content => dom}/media/wmf/DXVA2Manager.cpp   |   0
 {content => dom}/media/wmf/DXVA2Manager.h     |   0
 {content => dom}/media/wmf/WMF.h              |   0
 {content => dom}/media/wmf/WMFByteStream.cpp  |   0
 {content => dom}/media/wmf/WMFByteStream.h    |   0
 {content => dom}/media/wmf/WMFDecoder.cpp     |   0
 {content => dom}/media/wmf/WMFDecoder.h       |   0
 {content => dom}/media/wmf/WMFReader.cpp      |   0
 {content => dom}/media/wmf/WMFReader.h        |   0
 .../media/wmf/WMFSourceReaderCallback.cpp     |   0
 .../media/wmf/WMFSourceReaderCallback.h       |   0
 {content => dom}/media/wmf/WMFUtils.cpp       |   0
 {content => dom}/media/wmf/WMFUtils.h         |   0
 {content => dom}/media/wmf/moz.build          |   0
 layout/build/moz.build                        |   2 +-
 layout/generic/test/file_IconTestServer.sjs   |   2 +-
 media/gmp-clearkey/0.1/moz.build              |   2 +-
 media/webrtc/signaling/signaling.gyp          |   4 +-
 testing/crashtest/crashtests.list             |   2 +-
 testing/mochitest/androidx86.json             |  14 +-
 testing/mochitest/manifests/emulator-jb.ini   |   2 +-
 toolkit/content/license.html                  |   4 +-
 widget/gonk/moz.build                         |   2 +-
 1677 files changed, 316 insertions(+), 325 deletions(-)
 delete mode 100644 content/media/moz.build
 rename {content => dom}/media/AbstractMediaDecoder.h (100%)
 rename {content => dom}/media/AudioBufferUtils.h (100%)
 rename {content => dom}/media/AudioChannelFormat.cpp (100%)
 rename {content => dom}/media/AudioChannelFormat.h (100%)
 rename {content => dom}/media/AudioCompactor.cpp (100%)
 rename {content => dom}/media/AudioCompactor.h (100%)
 rename {content => dom}/media/AudioMixer.h (100%)
 rename {content => dom}/media/AudioSampleFormat.h (100%)
 rename {content => dom}/media/AudioSegment.cpp (100%)
 rename {content => dom}/media/AudioSegment.h (100%)
 rename {content => dom}/media/AudioSink.cpp (100%)
 rename {content => dom}/media/AudioSink.h (100%)
 rename {content => dom}/media/AudioStream.cpp (100%)
 rename {content => dom}/media/AudioStream.h (100%)
 rename {content => dom}/media/AudioStreamTrack.cpp (100%)
 rename {content => dom}/media/AudioStreamTrack.h (100%)
 rename {content => dom}/media/AudioTrack.cpp (100%)
 rename {content => dom}/media/AudioTrack.h (100%)
 rename {content => dom}/media/AudioTrackList.cpp (100%)
 rename {content => dom}/media/AudioTrackList.h (100%)
 rename {content => dom}/media/BufferMediaResource.h (100%)
 rename {content => dom}/media/CubebUtils.cpp (100%)
 rename {content => dom}/media/CubebUtils.h (100%)
 rename {content => dom}/media/DOMMediaStream.cpp (100%)
 rename {content => dom}/media/DOMMediaStream.h (99%)
 rename {content => dom}/media/DecoderTraits.cpp (100%)
 rename {content => dom}/media/DecoderTraits.h (100%)
 rename {content => dom}/media/EncodedBufferCache.cpp (100%)
 rename {content => dom}/media/EncodedBufferCache.h (100%)
 rename {content => dom}/media/FileBlockCache.cpp (100%)
 rename {content => dom}/media/FileBlockCache.h (100%)
 rename {content => dom}/media/GraphDriver.cpp (100%)
 rename {content => dom}/media/GraphDriver.h (100%)
 rename {content => dom}/media/Latency.cpp (100%)
 rename {content => dom}/media/Latency.h (100%)
 rename {content => dom}/media/MP3FrameParser.cpp (100%)
 rename {content => dom}/media/MP3FrameParser.h (100%)
 rename {content => dom}/media/MediaCache.cpp (100%)
 rename {content => dom}/media/MediaCache.h (100%)
 rename {content => dom}/media/MediaData.cpp (100%)
 rename {content => dom}/media/MediaData.h (100%)
 rename {content => dom}/media/MediaDataDecodedListener.h (100%)
 rename {content => dom}/media/MediaDecoder.cpp (100%)
 rename {content => dom}/media/MediaDecoder.h (100%)
 rename {content => dom}/media/MediaDecoderOwner.h (100%)
 rename {content => dom}/media/MediaDecoderReader.cpp (100%)
 rename {content => dom}/media/MediaDecoderReader.h (100%)
 rename {content => dom}/media/MediaDecoderStateMachine.cpp (100%)
 rename {content => dom}/media/MediaDecoderStateMachine.h (100%)
 rename {content => dom}/media/MediaDecoderStateMachineScheduler.cpp (100%)
 rename {content => dom}/media/MediaDecoderStateMachineScheduler.h (100%)
 rename {content => dom}/media/MediaInfo.h (100%)
 rename {content => dom}/media/MediaMetadataManager.h (100%)
 rename {content => dom}/media/MediaQueue.h (100%)
 rename {content => dom}/media/MediaRecorder.cpp (99%)
 rename {content => dom}/media/MediaRecorder.h (100%)
 rename {content => dom}/media/MediaResource.cpp (100%)
 rename {content => dom}/media/MediaResource.h (100%)
 rename {content => dom}/media/MediaSegment.h (100%)
 rename {content => dom}/media/MediaShutdownManager.cpp (100%)
 rename {content => dom}/media/MediaShutdownManager.h (100%)
 rename {content => dom}/media/MediaStreamGraph.cpp (100%)
 rename {content => dom}/media/MediaStreamGraph.h (100%)
 rename {content => dom}/media/MediaStreamGraphImpl.h (100%)
 rename {content => dom}/media/MediaStreamTrack.cpp (100%)
 rename {content => dom}/media/MediaStreamTrack.h (100%)
 rename {content => dom}/media/MediaTaskQueue.cpp (100%)
 rename {content => dom}/media/MediaTaskQueue.h (100%)
 rename {content => dom}/media/MediaTrack.cpp (100%)
 rename {content => dom}/media/MediaTrack.h (100%)
 rename {content => dom}/media/MediaTrackList.cpp (100%)
 rename {content => dom}/media/MediaTrackList.h (100%)
 rename {content => dom}/media/RtspMediaResource.cpp (100%)
 rename {content => dom}/media/RtspMediaResource.h (100%)
 rename {content => dom}/media/SharedBuffer.h (100%)
 rename {content => dom}/media/SharedThreadPool.cpp (100%)
 rename {content => dom}/media/SharedThreadPool.h (100%)
 rename {content => dom}/media/StreamBuffer.cpp (100%)
 rename {content => dom}/media/StreamBuffer.h (100%)
 rename {content => dom}/media/TextTrack.cpp (100%)
 rename {content => dom}/media/TextTrack.h (100%)
 rename {content => dom}/media/TextTrackCue.cpp (100%)
 rename {content => dom}/media/TextTrackCue.h (100%)
 rename {content => dom}/media/TextTrackCueList.cpp (100%)
 rename {content => dom}/media/TextTrackCueList.h (100%)
 rename {content => dom}/media/TextTrackList.cpp (100%)
 rename {content => dom}/media/TextTrackList.h (100%)
 rename {content => dom}/media/TextTrackRegion.cpp (100%)
 rename {content => dom}/media/TextTrackRegion.h (100%)
 rename {content => dom}/media/ThreadPoolCOMListener.cpp (100%)
 rename {content => dom}/media/ThreadPoolCOMListener.h (100%)
 rename {content => dom}/media/TimeVarying.h (100%)
 rename {content => dom}/media/TrackUnionStream.cpp (99%)
 rename {content => dom}/media/TrackUnionStream.h (100%)
 rename {content => dom}/media/VideoFrameContainer.cpp (100%)
 rename {content => dom}/media/VideoFrameContainer.h (100%)
 rename {content => dom}/media/VideoPlaybackQuality.cpp (100%)
 rename {content => dom}/media/VideoPlaybackQuality.h (100%)
 rename {content => dom}/media/VideoSegment.cpp (100%)
 rename {content => dom}/media/VideoSegment.h (100%)
 rename {content => dom}/media/VideoStreamTrack.cpp (100%)
 rename {content => dom}/media/VideoStreamTrack.h (100%)
 rename {content => dom}/media/VideoTrack.cpp (100%)
 rename {content => dom}/media/VideoTrack.h (100%)
 rename {content => dom}/media/VideoTrackList.cpp (100%)
 rename {content => dom}/media/VideoTrackList.h (100%)
 rename {content => dom}/media/VideoUtils.cpp (100%)
 rename {content => dom}/media/VideoUtils.h (100%)
 rename {content => dom}/media/VorbisUtils.h (100%)
 rename {content => dom}/media/WebVTTListener.cpp (100%)
 rename {content => dom}/media/WebVTTListener.h (100%)
 rename {content => dom}/media/android/AndroidMediaDecoder.cpp (100%)
 rename {content => dom}/media/android/AndroidMediaDecoder.h (100%)
 rename {content => dom}/media/android/AndroidMediaPluginHost.cpp (100%)
 rename {content => dom}/media/android/AndroidMediaPluginHost.h (100%)
 rename {content => dom}/media/android/AndroidMediaReader.cpp (100%)
 rename {content => dom}/media/android/AndroidMediaReader.h (100%)
 rename {content => dom}/media/android/AndroidMediaResourceServer.cpp (100%)
 rename {content => dom}/media/android/AndroidMediaResourceServer.h (100%)
 rename {content => dom}/media/android/MPAPI.h (100%)
 rename {content => dom}/media/android/moz.build (100%)
 rename {content => dom}/media/apple/AppleDecoder.cpp (100%)
 rename {content => dom}/media/apple/AppleDecoder.h (100%)
 rename {content => dom}/media/apple/AppleMP3Reader.cpp (100%)
 rename {content => dom}/media/apple/AppleMP3Reader.h (100%)
 rename {content => dom}/media/apple/moz.build (100%)
 rename {content => dom}/media/compiledtest/TestAudioBuffers.cpp (100%)
 rename {content => dom}/media/compiledtest/TestAudioMixer.cpp (100%)
 rename {content => dom}/media/compiledtest/moz.build (100%)
 rename {content => dom}/media/directshow/AudioSinkFilter.cpp (100%)
 rename {content => dom}/media/directshow/AudioSinkFilter.h (100%)
 rename {content => dom}/media/directshow/AudioSinkInputPin.cpp (100%)
 rename {content => dom}/media/directshow/AudioSinkInputPin.h (100%)
 rename {content => dom}/media/directshow/DirectShowDecoder.cpp (100%)
 rename {content => dom}/media/directshow/DirectShowDecoder.h (100%)
 rename {content => dom}/media/directshow/DirectShowReader.cpp (100%)
 rename {content => dom}/media/directshow/DirectShowReader.h (100%)
 rename {content => dom}/media/directshow/DirectShowUtils.cpp (100%)
 rename {content => dom}/media/directshow/DirectShowUtils.h (100%)
 rename {content => dom}/media/directshow/SampleSink.cpp (100%)
 rename {content => dom}/media/directshow/SampleSink.h (100%)
 rename {content => dom}/media/directshow/SourceFilter.cpp (100%)
 rename {content => dom}/media/directshow/SourceFilter.h (100%)
 rename {content => dom}/media/directshow/moz.build (100%)
 rename {content => dom}/media/eme/CDMCallbackProxy.cpp (100%)
 rename {content => dom}/media/eme/CDMCallbackProxy.h (100%)
 rename {content => dom}/media/eme/CDMCaps.cpp (100%)
 rename {content => dom}/media/eme/CDMCaps.h (100%)
 rename {content => dom}/media/eme/CDMProxy.cpp (100%)
 rename {content => dom}/media/eme/CDMProxy.h (100%)
 rename {content => dom}/media/eme/EMELog.cpp (100%)
 rename {content => dom}/media/eme/EMELog.h (100%)
 rename {content => dom}/media/eme/MediaEncryptedEvent.cpp (100%)
 rename {content => dom}/media/eme/MediaEncryptedEvent.h (100%)
 rename {content => dom}/media/eme/MediaKeyError.cpp (100%)
 rename {content => dom}/media/eme/MediaKeyError.h (100%)
 rename {content => dom}/media/eme/MediaKeyMessageEvent.cpp (100%)
 rename {content => dom}/media/eme/MediaKeyMessageEvent.h (100%)
 rename {content => dom}/media/eme/MediaKeySession.cpp (100%)
 rename {content => dom}/media/eme/MediaKeySession.h (100%)
 rename {content => dom}/media/eme/MediaKeys.cpp (100%)
 rename {content => dom}/media/eme/MediaKeys.h (100%)
 rename {content => dom}/media/eme/moz.build (100%)
 rename {content => dom}/media/encoder/ContainerWriter.h (100%)
 rename {content => dom}/media/encoder/EncodedFrameContainer.h (100%)
 rename {content => dom}/media/encoder/MediaEncoder.cpp (100%)
 rename {content => dom}/media/encoder/MediaEncoder.h (100%)
 rename {content => dom}/media/encoder/OmxTrackEncoder.cpp (100%)
 rename {content => dom}/media/encoder/OmxTrackEncoder.h (100%)
 rename {content => dom}/media/encoder/OpusTrackEncoder.cpp (100%)
 rename {content => dom}/media/encoder/OpusTrackEncoder.h (100%)
 rename {content => dom}/media/encoder/TrackEncoder.cpp (100%)
 rename {content => dom}/media/encoder/TrackEncoder.h (100%)
 rename {content => dom}/media/encoder/TrackMetadataBase.h (100%)
 rename {content => dom}/media/encoder/VP8TrackEncoder.cpp (100%)
 rename {content => dom}/media/encoder/VP8TrackEncoder.h (100%)
 rename {content => dom}/media/encoder/VorbisTrackEncoder.cpp (100%)
 rename {content => dom}/media/encoder/VorbisTrackEncoder.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/AMRBox.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/AMRBox.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/AVCBox.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/AVCBox.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOControl.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOControl.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOMediaBoxes.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOMediaBoxes.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOMediaWriter.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOMediaWriter.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/ISOTrackMetadata.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/MP4ESDS.cpp (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/MP4ESDS.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/MuxerOperation.h (100%)
 rename {content => dom}/media/encoder/fmp4_muxer/moz.build (100%)
 rename {content => dom}/media/encoder/moz.build (100%)
 rename {content => dom}/media/fmp4/BlankDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/MP4Decoder.cpp (100%)
 rename {content => dom}/media/fmp4/MP4Decoder.h (100%)
 rename {content => dom}/media/fmp4/MP4Reader.cpp (100%)
 rename {content => dom}/media/fmp4/MP4Reader.h (100%)
 rename {content => dom}/media/fmp4/PlatformDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/PlatformDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/android/AndroidDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/android/AndroidDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleATDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleATDecoder.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleCMFunctions.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleCMLinker.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleCMLinker.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleUtils.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleUtils.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVDADecoder.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleVDADecoder.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVDAFunctions.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVDALinker.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleVDALinker.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVTDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleVTDecoder.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVTFunctions.h (100%)
 rename {content => dom}/media/fmp4/apple/AppleVTLinker.cpp (100%)
 rename {content => dom}/media/fmp4/apple/AppleVTLinker.h (100%)
 rename {content => dom}/media/fmp4/apple/ReorderQueue.h (100%)
 rename {content => dom}/media/fmp4/apple/VideoDecodeAcceleration/VDADecoder.h (100%)
 rename {content => dom}/media/fmp4/apple/VideoToolbox/VideoToolbox.h (100%)
 rename {content => dom}/media/fmp4/eme/EMEAudioDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/eme/EMEAudioDecoder.h (100%)
 rename {content => dom}/media/fmp4/eme/EMEDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/eme/EMEDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/eme/EMEH264Decoder.cpp (100%)
 rename {content => dom}/media/fmp4/eme/EMEH264Decoder.h (100%)
 rename {content => dom}/media/fmp4/eme/moz.build (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegAudioDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegAudioDecoder.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegDataDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegDataDecoder.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegFunctionList.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegH264Decoder.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegH264Decoder.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegLibs.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegLog.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegLog.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegRuntimeLinker.cpp (100%)
 rename {content => dom}/media/fmp4/ffmpeg/FFmpegRuntimeLinker.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/README_mozilla (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/COPYING.LGPLv2.1 (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/avcodec.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/avfft.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/dxva2.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/old_codec_ids.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/opt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/vaapi.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/vda.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/vdpau.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavcodec/xvmc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavformat/avformat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavformat/avio.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavformat/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/adler32.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/aes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/attributes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/audio_fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/audioconvert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/avassert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/avconfig.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/avstring.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/avutil.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/base64.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/blowfish.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/bprint.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/bswap.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/common.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/cpu.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/crc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/dict.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/error.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/eval.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/file.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/imgutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/intfloat_readwrite.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/intreadwrite.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/lfg.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/log.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/lzo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/mathematics.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/md5.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/mem.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/old_pix_fmts.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/opt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/parseutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/pixdesc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/pixfmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/random_seed.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/rational.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/samplefmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/sha.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/time.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/timecode.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/timestamp.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/include/libavutil/xtea.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav53/moz.build (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/COPYING.LGPLv2.1 (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/avcodec.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/avfft.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/dxva2.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/old_codec_ids.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/vaapi.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/vda.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/vdpau.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavcodec/xvmc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavformat/avformat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavformat/avio.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavformat/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/adler32.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/aes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/attributes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/audio_fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/audioconvert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/avassert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/avconfig.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/avstring.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/avutil.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/base64.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/blowfish.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/bswap.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/channel_layout.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/common.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/cpu.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/crc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/dict.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/error.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/eval.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/file.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/imgutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/intfloat_readwrite.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/intreadwrite.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/lfg.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/log.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/lzo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/mathematics.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/md5.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/mem.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/old_pix_fmts.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/opt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/parseutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/pixdesc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/pixfmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/random_seed.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/rational.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/samplefmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/sha.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/time.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/include/libavutil/xtea.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav54/moz.build (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/COPYING.LGPLv2.1 (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/avcodec.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/avfft.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/dxva2.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/vaapi.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/vda.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/vdpau.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavcodec/xvmc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavformat/avformat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavformat/avio.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavformat/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/adler32.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/aes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/attributes.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/audio_fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/audioconvert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/avassert.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/avconfig.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/avstring.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/avutil.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/base64.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/blowfish.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/bswap.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/buffer.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/channel_layout.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/common.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/cpu.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/crc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/dict.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/downmix_info.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/error.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/eval.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/fifo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/file.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/frame.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/hmac.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/imgutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/intfloat.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/intreadwrite.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/lfg.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/log.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/lzo.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/macros.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/mathematics.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/md5.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/mem.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/old_pix_fmts.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/opt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/parseutils.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/pixdesc.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/pixfmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/random_seed.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/rational.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/samplefmt.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/sha.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/stereo3d.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/time.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/version.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/include/libavutil/xtea.h (100%)
 rename {content => dom}/media/fmp4/ffmpeg/libav55/moz.build (100%)
 rename {content => dom}/media/fmp4/gonk/GonkAudioDecoderManager.cpp (100%)
 rename {content => dom}/media/fmp4/gonk/GonkAudioDecoderManager.h (100%)
 rename {content => dom}/media/fmp4/gonk/GonkDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/gonk/GonkDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/gonk/GonkMediaDataDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/gonk/GonkMediaDataDecoder.h (100%)
 rename {content => dom}/media/fmp4/gonk/GonkVideoDecoderManager.cpp (100%)
 rename {content => dom}/media/fmp4/gonk/GonkVideoDecoderManager.h (100%)
 rename {content => dom}/media/fmp4/gonk/moz.build (91%)
 rename {content => dom}/media/fmp4/moz.build (100%)
 rename {content => dom}/media/fmp4/wmf/MFTDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/wmf/MFTDecoder.h (100%)
 rename {content => dom}/media/fmp4/wmf/WMFAudioMFTManager.cpp (100%)
 rename {content => dom}/media/fmp4/wmf/WMFAudioMFTManager.h (100%)
 rename {content => dom}/media/fmp4/wmf/WMFDecoderModule.cpp (100%)
 rename {content => dom}/media/fmp4/wmf/WMFDecoderModule.h (100%)
 rename {content => dom}/media/fmp4/wmf/WMFMediaDataDecoder.cpp (100%)
 rename {content => dom}/media/fmp4/wmf/WMFMediaDataDecoder.h (100%)
 rename {content => dom}/media/fmp4/wmf/WMFVideoMFTManager.cpp (100%)
 rename {content => dom}/media/fmp4/wmf/WMFVideoMFTManager.h (100%)
 rename {content => dom}/media/fmp4/wmf/moz.build (100%)
 rename {content => dom}/media/gmp/GMPAudioDecoderChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPAudioDecoderChild.h (100%)
 rename {content => dom}/media/gmp/GMPAudioDecoderParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPAudioDecoderParent.h (100%)
 rename {content => dom}/media/gmp/GMPAudioDecoderProxy.h (100%)
 rename {content => dom}/media/gmp/GMPAudioHost.cpp (100%)
 rename {content => dom}/media/gmp/GMPAudioHost.h (100%)
 rename {content => dom}/media/gmp/GMPCallbackBase.h (100%)
 rename {content => dom}/media/gmp/GMPChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPChild.h (100%)
 rename {content => dom}/media/gmp/GMPDecryptorChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPDecryptorChild.h (100%)
 rename {content => dom}/media/gmp/GMPDecryptorParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPDecryptorParent.h (100%)
 rename {content => dom}/media/gmp/GMPDecryptorProxy.h (100%)
 rename {content => dom}/media/gmp/GMPEncryptedBufferDataImpl.cpp (100%)
 rename {content => dom}/media/gmp/GMPEncryptedBufferDataImpl.h (100%)
 rename {content => dom}/media/gmp/GMPMessageUtils.h (100%)
 rename {content => dom}/media/gmp/GMPParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPParent.h (100%)
 rename {content => dom}/media/gmp/GMPPlatform.cpp (100%)
 rename {content => dom}/media/gmp/GMPPlatform.h (100%)
 rename {content => dom}/media/gmp/GMPProcessChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPProcessChild.h (100%)
 rename {content => dom}/media/gmp/GMPProcessParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPProcessParent.h (100%)
 rename {content => dom}/media/gmp/GMPService.cpp (100%)
 rename {content => dom}/media/gmp/GMPService.h (100%)
 rename {content => dom}/media/gmp/GMPSharedMemManager.cpp (100%)
 rename {content => dom}/media/gmp/GMPSharedMemManager.h (100%)
 rename {content => dom}/media/gmp/GMPStorageChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPStorageChild.h (100%)
 rename {content => dom}/media/gmp/GMPStorageParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPStorageParent.h (100%)
 rename {content => dom}/media/gmp/GMPTimerChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPTimerChild.h (100%)
 rename {content => dom}/media/gmp/GMPTimerParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPTimerParent.h (100%)
 rename {content => dom}/media/gmp/GMPTypes.ipdlh (100%)
 rename {content => dom}/media/gmp/GMPVideoDecoderChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoDecoderChild.h (100%)
 rename {content => dom}/media/gmp/GMPVideoDecoderParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoDecoderParent.h (100%)
 rename {content => dom}/media/gmp/GMPVideoDecoderProxy.h (100%)
 rename {content => dom}/media/gmp/GMPVideoEncodedFrameImpl.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoEncodedFrameImpl.h (100%)
 rename {content => dom}/media/gmp/GMPVideoEncoderChild.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoEncoderChild.h (100%)
 rename {content => dom}/media/gmp/GMPVideoEncoderParent.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoEncoderParent.h (100%)
 rename {content => dom}/media/gmp/GMPVideoEncoderProxy.h (100%)
 rename {content => dom}/media/gmp/GMPVideoHost.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoHost.h (100%)
 rename {content => dom}/media/gmp/GMPVideoPlaneImpl.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoPlaneImpl.h (100%)
 rename {content => dom}/media/gmp/GMPVideoi420FrameImpl.cpp (100%)
 rename {content => dom}/media/gmp/GMPVideoi420FrameImpl.h (100%)
 rename {content => dom}/media/gmp/PGMP.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPAudioDecoder.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPDecryptor.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPStorage.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPTimer.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPVideoDecoder.ipdl (100%)
 rename {content => dom}/media/gmp/PGMPVideoEncoder.ipdl (100%)
 rename {content => dom}/media/gmp/README.txt (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-async-shutdown.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-audio-codec.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-audio-decode.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-audio-host.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-audio-samples.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-decryption.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-entrypoints.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-errors.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-platform.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-storage.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-codec.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-decode.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-encode.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-frame-encoded.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-frame-i420.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-frame.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-host.h (100%)
 rename {content => dom}/media/gmp/gmp-api/gmp-video-plane.h (100%)
 rename {content => dom}/media/gmp/moz.build (100%)
 rename {content => dom}/media/gmp/mozIGeckoMediaPluginService.idl (100%)
 rename {content => dom}/media/gmp/rlz/COPYING (100%)
 rename {content => dom}/media/gmp/rlz/README.mozilla (100%)
 rename {content => dom}/media/gmp/rlz/base/memory/scoped_ptr.h (100%)
 rename {content => dom}/media/gmp/rlz/base/string16.h (100%)
 rename {content => dom}/media/gmp/rlz/lib/assert.h (100%)
 rename {content => dom}/media/gmp/rlz/lib/machine_id.h (100%)
 rename {content => dom}/media/gmp/rlz/lib/string_utils.cc (100%)
 rename {content => dom}/media/gmp/rlz/lib/string_utils.h (100%)
 rename {content => dom}/media/gmp/rlz/moz.build (100%)
 rename {content => dom}/media/gmp/rlz/win/lib/machine_id_win.cc (100%)
 rename {content => dom}/media/gstreamer/GStreamerAllocator.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerAllocator.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerDecoder.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerDecoder.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerFormatHelper.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerFormatHelper.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerFunctionList.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerLoader.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerLoader.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerMozVideoBuffer.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerMozVideoBuffer.h (100%)
 rename {content => dom}/media/gstreamer/GStreamerReader-0.10.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerReader.cpp (100%)
 rename {content => dom}/media/gstreamer/GStreamerReader.h (100%)
 rename {content => dom}/media/gstreamer/moz.build (100%)
 rename {content => dom}/media/gtest/MockMediaDecoderOwner.h (100%)
 rename {content => dom}/media/gtest/MockMediaResource.cpp (100%)
 rename {content => dom}/media/gtest/MockMediaResource.h (100%)
 rename {content => dom}/media/gtest/TestAudioCompactor.cpp (100%)
 rename {content => dom}/media/gtest/TestGMPCrossOrigin.cpp (100%)
 rename {content => dom}/media/gtest/TestMP4Reader.cpp (100%)
 rename {content => dom}/media/gtest/TestTrackEncoder.cpp (100%)
 rename {content => dom}/media/gtest/TestVideoSegment.cpp (100%)
 rename {content => dom}/media/gtest/TestVideoTrackEncoder.cpp (100%)
 rename {content => dom}/media/gtest/TestVorbisTrackEncoder.cpp (100%)
 rename {content => dom}/media/gtest/TestWebMBuffered.cpp (100%)
 rename {content => dom}/media/gtest/TestWebMWriter.cpp (100%)
 rename {content => dom}/media/gtest/mediasource_test.mp4 (100%)
 rename {content => dom}/media/gtest/moz.build (76%)
 rename {content => dom}/media/gtest/test.webm (100%)
 rename {content => dom}/media/imagecapture/CaptureTask.cpp (100%)
 rename {content => dom}/media/imagecapture/CaptureTask.h (100%)
 rename {content => dom}/media/imagecapture/ImageCapture.cpp (100%)
 rename {content => dom}/media/imagecapture/ImageCapture.h (100%)
 rename {content => dom}/media/imagecapture/moz.build (100%)
 rename {content => dom}/media/mediasource/AsyncEventRunner.h (100%)
 rename {content => dom}/media/mediasource/ContainerParser.cpp (100%)
 rename {content => dom}/media/mediasource/ContainerParser.h (100%)
 rename {content => dom}/media/mediasource/MediaSource.cpp (100%)
 rename {content => dom}/media/mediasource/MediaSource.h (100%)
 rename {content => dom}/media/mediasource/MediaSourceDecoder.cpp (100%)
 rename {content => dom}/media/mediasource/MediaSourceDecoder.h (100%)
 rename {content => dom}/media/mediasource/MediaSourceReader.cpp (100%)
 rename {content => dom}/media/mediasource/MediaSourceReader.h (100%)
 rename {content => dom}/media/mediasource/MediaSourceResource.h (100%)
 rename {content => dom}/media/mediasource/MediaSourceUtils.cpp (100%)
 rename {content => dom}/media/mediasource/MediaSourceUtils.h (100%)
 rename {content => dom}/media/mediasource/ResourceQueue.h (100%)
 rename {content => dom}/media/mediasource/SourceBuffer.cpp (100%)
 rename {content => dom}/media/mediasource/SourceBuffer.h (100%)
 rename {content => dom}/media/mediasource/SourceBufferDecoder.cpp (100%)
 rename {content => dom}/media/mediasource/SourceBufferDecoder.h (100%)
 rename {content => dom}/media/mediasource/SourceBufferList.cpp (100%)
 rename {content => dom}/media/mediasource/SourceBufferList.h (100%)
 rename {content => dom}/media/mediasource/SourceBufferResource.cpp (100%)
 rename {content => dom}/media/mediasource/SourceBufferResource.h (100%)
 rename {content => dom}/media/mediasource/TrackBuffer.cpp (100%)
 rename {content => dom}/media/mediasource/TrackBuffer.h (100%)
 rename {content => dom}/media/mediasource/moz.build (100%)
 rename {content => dom}/media/mediasource/test/crashtests/1005366.html (100%)
 rename {content => dom}/media/mediasource/test/crashtests/1059035.html (100%)
 rename {content => dom}/media/mediasource/test/crashtests/926665.html (100%)
 rename {content => dom}/media/mediasource/test/crashtests/931388.html (100%)
 rename {content => dom}/media/mediasource/test/crashtests/crashtests.list (100%)
 rename {content => dom}/media/mediasource/test/mediasource.js (100%)
 rename {content => dom}/media/mediasource/test/mochitest.ini (100%)
 rename {content => dom}/media/mediasource/test/seek.webm (100%)
 rename {content => dom}/media/mediasource/test/seek.webm^headers^ (100%)
 rename {content => dom}/media/mediasource/test/seek_lowres.webm (100%)
 rename {content => dom}/media/mediasource/test/seek_lowres.webm^headers^ (100%)
 rename {content => dom}/media/mediasource/test/test_BufferedSeek.html (100%)
 rename {content => dom}/media/mediasource/test/test_FrameSelection.html (100%)
 rename {content => dom}/media/mediasource/test/test_HaveMetadataUnbufferedSeek.html (100%)
 rename {content => dom}/media/mediasource/test/test_MediaSource.html (100%)
 rename {content => dom}/media/mediasource/test/test_MediaSource_disabled.html (100%)
 rename {content => dom}/media/mediasource/test/test_SeekableAfterEndOfStream.html (100%)
 rename {content => dom}/media/mediasource/test/test_SeekableAfterEndOfStreamSplit.html (100%)
 rename {content => dom}/media/mediasource/test/test_SeekableBeforeEndOfStream.html (100%)
 rename {content => dom}/media/mediasource/test/test_SeekableBeforeEndOfStreamSplit.html (100%)
 rename {content => dom}/media/mediasource/test/test_SplitAppend.html (100%)
 rename {content => dom}/media/mediasource/test/test_SplitAppendDelay.html (100%)
 rename {content => dom}/media/nsIDocumentActivity.h (100%)
 rename {content => dom}/media/ogg/OggCodecState.cpp (100%)
 rename {content => dom}/media/ogg/OggCodecState.h (100%)
 rename {content => dom}/media/ogg/OggDecoder.cpp (100%)
 rename {content => dom}/media/ogg/OggDecoder.h (100%)
 rename {content => dom}/media/ogg/OggReader.cpp (100%)
 rename {content => dom}/media/ogg/OggReader.h (100%)
 rename {content => dom}/media/ogg/OggWriter.cpp (100%)
 rename {content => dom}/media/ogg/OggWriter.h (100%)
 rename {content => dom}/media/ogg/OpusParser.cpp (100%)
 rename {content => dom}/media/ogg/OpusParser.h (100%)
 rename {content => dom}/media/ogg/moz.build (100%)
 rename {content => dom}/media/omx/AudioOffloadPlayer.cpp (100%)
 rename {content => dom}/media/omx/AudioOffloadPlayer.h (100%)
 rename {content => dom}/media/omx/AudioOffloadPlayerBase.h (100%)
 rename {content => dom}/media/omx/AudioOutput.cpp (100%)
 rename {content => dom}/media/omx/AudioOutput.h (100%)
 rename {content => dom}/media/omx/AudioSink.h (100%)
 rename {content => dom}/media/omx/I420ColorConverterHelper.cpp (100%)
 rename {content => dom}/media/omx/I420ColorConverterHelper.h (100%)
 rename {content => dom}/media/omx/MPAPI.h (100%)
 rename {content => dom}/media/omx/MediaCodecDecoder.cpp (100%)
 rename {content => dom}/media/omx/MediaCodecDecoder.h (100%)
 rename {content => dom}/media/omx/MediaCodecProxy.cpp (100%)
 rename {content => dom}/media/omx/MediaCodecProxy.h (100%)
 rename {content => dom}/media/omx/MediaCodecReader.cpp (100%)
 rename {content => dom}/media/omx/MediaCodecReader.h (100%)
 rename {content => dom}/media/omx/MediaOmxCommonDecoder.cpp (100%)
 rename {content => dom}/media/omx/MediaOmxCommonDecoder.h (100%)
 rename {content => dom}/media/omx/MediaOmxCommonReader.cpp (100%)
 rename {content => dom}/media/omx/MediaOmxCommonReader.h (100%)
 rename {content => dom}/media/omx/MediaOmxDecoder.cpp (100%)
 rename {content => dom}/media/omx/MediaOmxDecoder.h (100%)
 rename {content => dom}/media/omx/MediaOmxReader.cpp (100%)
 rename {content => dom}/media/omx/MediaOmxReader.h (100%)
 rename {content => dom}/media/omx/MediaStreamSource.cpp (100%)
 rename {content => dom}/media/omx/MediaStreamSource.h (100%)
 rename {content => dom}/media/omx/OMXCodecDescriptorUtil.cpp (100%)
 rename {content => dom}/media/omx/OMXCodecDescriptorUtil.h (100%)
 rename {content => dom}/media/omx/OMXCodecProxy.cpp (100%)
 rename {content => dom}/media/omx/OMXCodecProxy.h (100%)
 rename {content => dom}/media/omx/OMXCodecWrapper.cpp (100%)
 rename {content => dom}/media/omx/OMXCodecWrapper.h (100%)
 rename {content => dom}/media/omx/OmxDecoder.cpp (100%)
 rename {content => dom}/media/omx/OmxDecoder.h (100%)
 rename {content => dom}/media/omx/RtspExtractor.cpp (100%)
 rename {content => dom}/media/omx/RtspExtractor.h (100%)
 rename {content => dom}/media/omx/RtspMediaCodecDecoder.cpp (100%)
 rename {content => dom}/media/omx/RtspMediaCodecDecoder.h (100%)
 rename {content => dom}/media/omx/RtspMediaCodecReader.cpp (100%)
 rename {content => dom}/media/omx/RtspMediaCodecReader.h (100%)
 rename {content => dom}/media/omx/RtspOmxDecoder.cpp (100%)
 rename {content => dom}/media/omx/RtspOmxDecoder.h (100%)
 rename {content => dom}/media/omx/RtspOmxReader.cpp (100%)
 rename {content => dom}/media/omx/RtspOmxReader.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerClient.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerClient.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerDeathNotifier.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerService.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/IMediaResourceManagerService.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceHandler.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceHandler.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceManagerClient.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceManagerClient.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/MediaResourceManagerService.h (100%)
 rename {content => dom}/media/omx/mediaresourcemanager/moz.build (100%)
 rename {content => dom}/media/omx/moz.build (100%)
 rename {content => dom}/media/raw/RawDecoder.cpp (100%)
 rename {content => dom}/media/raw/RawDecoder.h (100%)
 rename {content => dom}/media/raw/RawReader.cpp (100%)
 rename {content => dom}/media/raw/RawReader.h (100%)
 rename {content => dom}/media/raw/RawStructs.h (100%)
 rename {content => dom}/media/raw/moz.build (100%)
 rename {content => dom}/media/systemservices/LoadManager.cpp (100%)
 rename {content => dom}/media/systemservices/LoadManager.h (100%)
 rename {content => dom}/media/systemservices/LoadManagerFactory.cpp (100%)
 rename {content => dom}/media/systemservices/LoadManagerFactory.h (100%)
 rename {content => dom}/media/systemservices/LoadMonitor.cpp (100%)
 rename {content => dom}/media/systemservices/LoadMonitor.h (100%)
 rename {content => dom}/media/systemservices/OSXRunLoopSingleton.cpp (100%)
 rename {content => dom}/media/systemservices/OSXRunLoopSingleton.h (100%)
 rename {content => dom}/media/systemservices/OpenSLESProvider.cpp (100%)
 rename {content => dom}/media/systemservices/OpenSLESProvider.h (100%)
 rename {content => dom}/media/systemservices/moz.build (100%)
 rename {content => dom}/media/test/320x240.ogv (100%)
 rename {content => dom}/media/test/320x240.ogv^headers^ (100%)
 rename {content => dom}/media/test/448636.ogv (100%)
 rename {content => dom}/media/test/448636.ogv^headers^ (100%)
 rename {content => dom}/media/test/VID_0001.ogg (100%)
 rename {content => dom}/media/test/VID_0001.ogg^headers^ (100%)
 rename {content => dom}/media/test/allowed.sjs (97%)
 rename {content => dom}/media/test/audio-gaps.ogg (100%)
 rename {content => dom}/media/test/audio-gaps.ogg^headers^ (100%)
 rename {content => dom}/media/test/audio-overhang.ogg (100%)
 rename {content => dom}/media/test/audio-overhang.ogg^headers^ (100%)
 rename {content => dom}/media/test/audio.wav (100%)
 rename {content => dom}/media/test/audio.wav^headers^ (100%)
 rename {content => dom}/media/test/bad-signature.vtt (100%)
 rename {content => dom}/media/test/badtags.ogg (100%)
 rename {content => dom}/media/test/badtags.ogg^headers^ (100%)
 rename {content => dom}/media/test/basic.vtt (100%)
 rename {content => dom}/media/test/beta-phrasebook.ogg (100%)
 rename {content => dom}/media/test/beta-phrasebook.ogg^headers^ (100%)
 rename {content => dom}/media/test/big.wav (100%)
 rename {content => dom}/media/test/big.wav^headers^ (100%)
 rename {content => dom}/media/test/bogus.duh (100%)
 rename {content => dom}/media/test/bogus.ogv (100%)
 rename {content => dom}/media/test/bogus.ogv^headers^ (100%)
 rename {content => dom}/media/test/bogus.wav (100%)
 rename {content => dom}/media/test/bogus.wav^headers^ (100%)
 rename {content => dom}/media/test/bug1066943.webm (100%)
 rename {content => dom}/media/test/bug1066943.webm^headers^ (100%)
 rename {content => dom}/media/test/bug461281.ogg (100%)
 rename {content => dom}/media/test/bug461281.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug482461-theora.ogv (100%)
 rename {content => dom}/media/test/bug482461-theora.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug482461.ogv (100%)
 rename {content => dom}/media/test/bug482461.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug495129.ogv (100%)
 rename {content => dom}/media/test/bug495129.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug495794.ogg (100%)
 rename {content => dom}/media/test/bug495794.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug498380.ogv (100%)
 rename {content => dom}/media/test/bug498380.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug498855-1.ogv (100%)
 rename {content => dom}/media/test/bug498855-1.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug498855-2.ogv (100%)
 rename {content => dom}/media/test/bug498855-2.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug498855-3.ogv (100%)
 rename {content => dom}/media/test/bug498855-3.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug499519.ogv (100%)
 rename {content => dom}/media/test/bug499519.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug500311.ogv (100%)
 rename {content => dom}/media/test/bug500311.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug501279.ogg (100%)
 rename {content => dom}/media/test/bug501279.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug504613.ogv (100%)
 rename {content => dom}/media/test/bug504613.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug504644.ogv (100%)
 rename {content => dom}/media/test/bug504644.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug504843.ogv (100%)
 rename {content => dom}/media/test/bug504843.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug506094.ogv (100%)
 rename {content => dom}/media/test/bug506094.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug516323.indexed.ogv (100%)
 rename {content => dom}/media/test/bug516323.indexed.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug516323.ogv (100%)
 rename {content => dom}/media/test/bug516323.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug520493.ogg (100%)
 rename {content => dom}/media/test/bug520493.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug520500.ogg (100%)
 rename {content => dom}/media/test/bug520500.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug520908.ogv (100%)
 rename {content => dom}/media/test/bug520908.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug523816.ogv (100%)
 rename {content => dom}/media/test/bug523816.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug533822.ogg (100%)
 rename {content => dom}/media/test/bug533822.ogg^headers^ (100%)
 rename {content => dom}/media/test/bug556821.ogv (100%)
 rename {content => dom}/media/test/bug556821.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug557094.ogv (100%)
 rename {content => dom}/media/test/bug557094.ogv^headers^ (100%)
 rename {content => dom}/media/test/bug580982.webm (100%)
 rename {content => dom}/media/test/bug580982.webm^headers^ (100%)
 rename {content => dom}/media/test/bug603918.webm (100%)
 rename {content => dom}/media/test/bug603918.webm^headers^ (100%)
 rename {content => dom}/media/test/bug604067.webm (100%)
 rename {content => dom}/media/test/bug604067.webm^headers^ (100%)
 rename {content => dom}/media/test/bug883173.vtt (100%)
 rename {content => dom}/media/test/can_play_type_dash.js (100%)
 rename {content => dom}/media/test/can_play_type_ogg.js (100%)
 rename {content => dom}/media/test/can_play_type_wave.js (100%)
 rename {content => dom}/media/test/can_play_type_webm.js (100%)
 rename {content => dom}/media/test/cancellable_request.sjs (100%)
 rename {content => dom}/media/test/chain.ogg (100%)
 rename {content => dom}/media/test/chain.ogg^headers^ (100%)
 rename {content => dom}/media/test/chain.ogv (100%)
 rename {content => dom}/media/test/chain.ogv^headers^ (100%)
 rename {content => dom}/media/test/chain.opus (100%)
 rename {content => dom}/media/test/chain.opus^headers^ (100%)
 rename {content => dom}/media/test/chained-audio-video.ogg (100%)
 rename {content => dom}/media/test/chained-audio-video.ogg^headers^ (100%)
 rename {content => dom}/media/test/chained-video.ogv (100%)
 rename {content => dom}/media/test/chained-video.ogv^headers^ (100%)
 rename {content => dom}/media/test/chrome.ini (100%)
 rename {content => dom}/media/test/contentDuration1.sjs (95%)
 rename {content => dom}/media/test/contentDuration2.sjs (95%)
 rename {content => dom}/media/test/contentDuration3.sjs (95%)
 rename {content => dom}/media/test/contentDuration4.sjs (95%)
 rename {content => dom}/media/test/contentDuration5.sjs (95%)
 rename {content => dom}/media/test/contentDuration6.sjs (95%)
 rename {content => dom}/media/test/contentDuration7.sjs (95%)
 rename {content => dom}/media/test/contentType.sjs (98%)
 rename {content => dom}/media/test/crashtests/0-timescale.html (100%)
 rename {content => dom}/media/test/crashtests/0-timescale.mp4 (100%)
 rename {content => dom}/media/test/crashtests/1015662.html (100%)
 rename {content => dom}/media/test/crashtests/1028458.html (100%)
 rename {content => dom}/media/test/crashtests/1080986.html (100%)
 rename {content => dom}/media/test/crashtests/1080986.wav (100%)
 rename {content => dom}/media/test/crashtests/459439-1.html (100%)
 rename {content => dom}/media/test/crashtests/466607-1.html (100%)
 rename {content => dom}/media/test/crashtests/466945-1.html (100%)
 rename {content => dom}/media/test/crashtests/468763-1.html (100%)
 rename {content => dom}/media/test/crashtests/474744-1.html (100%)
 rename {content => dom}/media/test/crashtests/481136-1.html (100%)
 rename {content => dom}/media/test/crashtests/492286-1.xhtml (100%)
 rename {content => dom}/media/test/crashtests/493915-1.html (100%)
 rename {content => dom}/media/test/crashtests/495794-1.html (100%)
 rename {content => dom}/media/test/crashtests/495794-1.ogg (100%)
 rename {content => dom}/media/test/crashtests/576612-1.html (100%)
 rename {content => dom}/media/test/crashtests/691096-1.html (100%)
 rename {content => dom}/media/test/crashtests/752784-1.html (100%)
 rename {content => dom}/media/test/crashtests/789075-1.html (100%)
 rename {content => dom}/media/test/crashtests/789075.webm (100%)
 rename {content => dom}/media/test/crashtests/795892-1.html (100%)
 rename {content => dom}/media/test/crashtests/844563.html (100%)
 rename {content => dom}/media/test/crashtests/846612.html (100%)
 rename {content => dom}/media/test/crashtests/852838.html (100%)
 rename {content => dom}/media/test/crashtests/865537-1.html (100%)
 rename {content => dom}/media/test/crashtests/868504.html (100%)
 rename {content => dom}/media/test/crashtests/874869.html (100%)
 rename {content => dom}/media/test/crashtests/874915.html (100%)
 rename {content => dom}/media/test/crashtests/874934.html (100%)
 rename {content => dom}/media/test/crashtests/874952.html (100%)
 rename {content => dom}/media/test/crashtests/875144.html (100%)
 rename {content => dom}/media/test/crashtests/875596.html (100%)
 rename {content => dom}/media/test/crashtests/875911.html (100%)
 rename {content => dom}/media/test/crashtests/876024-1.html (100%)
 rename {content => dom}/media/test/crashtests/876024-2.html (100%)
 rename {content => dom}/media/test/crashtests/876118.html (100%)
 rename {content => dom}/media/test/crashtests/876207.html (100%)
 rename {content => dom}/media/test/crashtests/876215.html (100%)
 rename {content => dom}/media/test/crashtests/876249.html (100%)
 rename {content => dom}/media/test/crashtests/876252.html (100%)
 rename {content => dom}/media/test/crashtests/876834.html (100%)
 rename {content => dom}/media/test/crashtests/877527.html (100%)
 rename {content => dom}/media/test/crashtests/877820.html (100%)
 rename {content => dom}/media/test/crashtests/878014.html (100%)
 rename {content => dom}/media/test/crashtests/878328.html (100%)
 rename {content => dom}/media/test/crashtests/878407.html (100%)
 rename {content => dom}/media/test/crashtests/878478.html (100%)
 rename {content => dom}/media/test/crashtests/880129.html (100%)
 rename {content => dom}/media/test/crashtests/880202.html (100%)
 rename {content => dom}/media/test/crashtests/880342-1.html (100%)
 rename {content => dom}/media/test/crashtests/880342-2.html (100%)
 rename {content => dom}/media/test/crashtests/880384.html (100%)
 rename {content => dom}/media/test/crashtests/880404.html (100%)
 rename {content => dom}/media/test/crashtests/880724.html (100%)
 rename {content => dom}/media/test/crashtests/881775.html (100%)
 rename {content => dom}/media/test/crashtests/882549.html (100%)
 rename {content => dom}/media/test/crashtests/882956.html (100%)
 rename {content => dom}/media/test/crashtests/884459.html (100%)
 rename {content => dom}/media/test/crashtests/889042.html (100%)
 rename {content => dom}/media/test/crashtests/894104.html (100%)
 rename {content => dom}/media/test/crashtests/907986-1.html (100%)
 rename {content => dom}/media/test/crashtests/907986-2.html (100%)
 rename {content => dom}/media/test/crashtests/907986-3.html (100%)
 rename {content => dom}/media/test/crashtests/907986-4.html (100%)
 rename {content => dom}/media/test/crashtests/910171-1.html (100%)
 rename {content => dom}/media/test/crashtests/920987.html (100%)
 rename {content => dom}/media/test/crashtests/925619-1.html (100%)
 rename {content => dom}/media/test/crashtests/925619-2.html (100%)
 rename {content => dom}/media/test/crashtests/926619.html (100%)
 rename {content => dom}/media/test/crashtests/933151.html (100%)
 rename {content => dom}/media/test/crashtests/933156.html (100%)
 rename {content => dom}/media/test/crashtests/944851.html (100%)
 rename {content => dom}/media/test/crashtests/952756.html (100%)
 rename {content => dom}/media/test/crashtests/966636.html (100%)
 rename {content => dom}/media/test/crashtests/986901.html (100%)
 rename {content => dom}/media/test/crashtests/990794.html (100%)
 rename {content => dom}/media/test/crashtests/buffer-source-ended-1.html (100%)
 rename {content => dom}/media/test/crashtests/cors.webm (100%)
 rename {content => dom}/media/test/crashtests/cors.webm^headers^ (100%)
 rename {content => dom}/media/test/crashtests/crashtests.list (100%)
 rename {content => dom}/media/test/crashtests/media-element-source-seek-1.html (100%)
 rename {content => dom}/media/test/crashtests/offline-buffer-source-ended-1.html (100%)
 rename {content => dom}/media/test/crashtests/oscillator-ended-1.html (100%)
 rename {content => dom}/media/test/crashtests/oscillator-ended-2.html (100%)
 rename {content => dom}/media/test/crashtests/sound.ogg (100%)
 rename {content => dom}/media/test/dash/dash-manifest-garbled-webm.mpd (100%)
 rename {content => dom}/media/test/dash/dash-manifest-garbled.mpd (100%)
 rename {content => dom}/media/test/dash/dash-manifest-sjs.mpd (100%)
 rename {content => dom}/media/test/dash/dash-manifest.mpd (100%)
 rename {content => dom}/media/test/dash/dash-webm-audio-128k.webm (100%)
 rename {content => dom}/media/test/dash/dash-webm-video-320x180.webm (100%)
 rename {content => dom}/media/test/dash/dash-webm-video-428x240.webm (100%)
 rename {content => dom}/media/test/dash/garbled.webm (100%)
 rename {content => dom}/media/test/dash_detect_stream_switch.sjs (98%)
 rename {content => dom}/media/test/detodos.opus (100%)
 rename {content => dom}/media/test/detodos.opus^headers^ (100%)
 rename {content => dom}/media/test/detodos.webm (100%)
 rename {content => dom}/media/test/detodos.webm^headers^ (100%)
 rename {content => dom}/media/test/dirac.ogg (100%)
 rename {content => dom}/media/test/dirac.ogg^headers^ (100%)
 rename {content => dom}/media/test/dynamic_redirect.sjs (95%)
 rename {content => dom}/media/test/dynamic_resource.sjs (97%)
 rename {content => dom}/media/test/file_access_controls.html (86%)
 rename {content => dom}/media/test/fragment_noplay.js (100%)
 rename {content => dom}/media/test/fragment_play.js (100%)
 rename {content => dom}/media/test/gizmo-frag-cenc.xml (100%)
 rename {content => dom}/media/test/gizmo-frag-cenc1.m4s (100%)
 rename {content => dom}/media/test/gizmo-frag-cenc2.m4s (100%)
 rename {content => dom}/media/test/gizmo-frag-cencinit.mp4 (100%)
 rename {content => dom}/media/test/gizmo.mp4 (100%)
 rename {content => dom}/media/test/gizmo.mp4^headers^ (100%)
 rename {content => dom}/media/test/graph_latency.py (100%)
 rename {content => dom}/media/test/huge-id3.mp3 (100%)
 rename {content => dom}/media/test/huge-id3.mp3^headers^ (100%)
 rename {content => dom}/media/test/id3tags.mp3 (100%)
 rename {content => dom}/media/test/id3tags.mp3^headers^ (100%)
 rename {content => dom}/media/test/invalid-cmap-s0c0.opus (100%)
 rename {content => dom}/media/test/invalid-cmap-s0c0.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-cmap-s0c2.opus (100%)
 rename {content => dom}/media/test/invalid-cmap-s0c2.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-cmap-s1c2.opus (100%)
 rename {content => dom}/media/test/invalid-cmap-s1c2.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-cmap-short.opus (100%)
 rename {content => dom}/media/test/invalid-cmap-short.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-discard_on_multi_blocks.webm (100%)
 rename {content => dom}/media/test/invalid-discard_on_multi_blocks.webm^headers^ (100%)
 rename {content => dom}/media/test/invalid-excess_discard.webm (100%)
 rename {content => dom}/media/test/invalid-excess_discard.webm^headers^ (100%)
 rename {content => dom}/media/test/invalid-excess_neg_discard.webm (100%)
 rename {content => dom}/media/test/invalid-excess_neg_discard.webm^headers^ (100%)
 rename {content => dom}/media/test/invalid-m0c0.opus (100%)
 rename {content => dom}/media/test/invalid-m0c0.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-m0c3.opus (100%)
 rename {content => dom}/media/test/invalid-m0c3.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-m1c0.opus (100%)
 rename {content => dom}/media/test/invalid-m1c0.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-m1c9.opus (100%)
 rename {content => dom}/media/test/invalid-m1c9.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-m2c0.opus (100%)
 rename {content => dom}/media/test/invalid-m2c0.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-m2c1.opus (100%)
 rename {content => dom}/media/test/invalid-m2c1.opus^headers^ (100%)
 rename {content => dom}/media/test/invalid-neg_discard.webm (100%)
 rename {content => dom}/media/test/invalid-neg_discard.webm^headers^ (100%)
 rename {content => dom}/media/test/invalid-preskip.webm (100%)
 rename {content => dom}/media/test/invalid-preskip.webm^headers^ (100%)
 rename {content => dom}/media/test/long.vtt (100%)
 rename {content => dom}/media/test/make-headers.sh (100%)
 rename {content => dom}/media/test/manifest.js (98%)
 rename {content => dom}/media/test/mochitest.ini (100%)
 rename {content => dom}/media/test/multiple-bos-more-header-fileds.ogg (100%)
 rename {content => dom}/media/test/multiple-bos-more-header-fileds.ogg^headers^ (100%)
 rename {content => dom}/media/test/multiple-bos.ogg (100%)
 rename {content => dom}/media/test/multiple-bos.ogg^headers^ (100%)
 rename {content => dom}/media/test/no-cues.webm (100%)
 rename {content => dom}/media/test/no-cues.webm^headers^ (100%)
 rename {content => dom}/media/test/noContentLength.sjs (95%)
 rename {content => dom}/media/test/notags.mp3 (100%)
 rename {content => dom}/media/test/notags.mp3^headers^ (100%)
 rename {content => dom}/media/test/owl-funnier-id3.mp3 (100%)
 rename {content => dom}/media/test/owl-funnier-id3.mp3^headers^ (100%)
 rename {content => dom}/media/test/owl-funny-id3.mp3 (100%)
 rename {content => dom}/media/test/owl-funny-id3.mp3^headers^ (100%)
 rename {content => dom}/media/test/owl.mp3 (100%)
 rename {content => dom}/media/test/owl.mp3^headers^ (100%)
 rename {content => dom}/media/test/parser.vtt (100%)
 rename {content => dom}/media/test/pixel_aspect_ratio.mp4 (100%)
 rename {content => dom}/media/test/r11025_msadpcm_c1.wav (100%)
 rename {content => dom}/media/test/r11025_msadpcm_c1.wav^headers^ (100%)
 rename {content => dom}/media/test/r11025_s16_c1.wav (100%)
 rename {content => dom}/media/test/r11025_s16_c1.wav^headers^ (100%)
 rename {content => dom}/media/test/r11025_s16_c1_trailing.wav (100%)
 rename {content => dom}/media/test/r11025_s16_c1_trailing.wav^headers^ (100%)
 rename {content => dom}/media/test/r11025_u8_c1.wav (100%)
 rename {content => dom}/media/test/r11025_u8_c1.wav^headers^ (100%)
 rename {content => dom}/media/test/r11025_u8_c1_trunc.wav (100%)
 rename {content => dom}/media/test/r11025_u8_c1_trunc.wav^headers^ (100%)
 rename {content => dom}/media/test/r16000_u8_c1_list.wav (100%)
 rename {content => dom}/media/test/r16000_u8_c1_list.wav^headers^ (100%)
 rename {content => dom}/media/test/reactivate_helper.html (100%)
 rename {content => dom}/media/test/redirect.sjs (85%)
 rename {content => dom}/media/test/referer.sjs (92%)
 rename {content => dom}/media/test/region.vtt (100%)
 rename {content => dom}/media/test/sample-fisbone-skeleton4.ogv (100%)
 rename {content => dom}/media/test/sample-fisbone-skeleton4.ogv^headers^ (100%)
 rename {content => dom}/media/test/sample-fisbone-wrong-header.ogv (100%)
 rename {content => dom}/media/test/sample-fisbone-wrong-header.ogv^headers^ (100%)
 rename {content => dom}/media/test/sample.3g2 (100%)
 rename {content => dom}/media/test/sample.3gp (100%)
 rename {content => dom}/media/test/seek.ogv (100%)
 rename {content => dom}/media/test/seek.ogv^headers^ (100%)
 rename {content => dom}/media/test/seek.webm (100%)
 rename {content => dom}/media/test/seek.webm^headers^ (100%)
 rename {content => dom}/media/test/seek.yuv (100%)
 rename {content => dom}/media/test/seekLies.sjs (95%)
 rename {content => dom}/media/test/seek_support.js (100%)
 rename {content => dom}/media/test/seek_with_sound.ogg (100%)
 rename {content => dom}/media/test/seek_with_sound.ogg^headers^ (100%)
 rename {content => dom}/media/test/short-cenc.mp4 (100%)
 rename {content => dom}/media/test/short-cenc.xml (100%)
 rename {content => dom}/media/test/short-video.ogv (100%)
 rename {content => dom}/media/test/short-video.ogv^headers^ (100%)
 rename {content => dom}/media/test/short.mp4 (100%)
 rename {content => dom}/media/test/small-shot-mp3.mp4 (100%)
 rename {content => dom}/media/test/small-shot-mp3.mp4^headers^ (100%)
 rename {content => dom}/media/test/small-shot.m4a (100%)
 rename {content => dom}/media/test/small-shot.mp3 (100%)
 rename {content => dom}/media/test/small-shot.mp3^headers^ (100%)
 rename {content => dom}/media/test/small-shot.ogg (100%)
 rename {content => dom}/media/test/small-shot.ogg^headers^ (100%)
 rename {content => dom}/media/test/sound.ogg (100%)
 rename {content => dom}/media/test/sound.ogg^headers^ (100%)
 rename {content => dom}/media/test/spacestorm-1000Hz-100ms.ogg (100%)
 rename {content => dom}/media/test/spacestorm-1000Hz-100ms.ogg^headers^ (100%)
 rename {content => dom}/media/test/split.webm (100%)
 rename {content => dom}/media/test/split.webm^headers^ (100%)
 rename {content => dom}/media/test/street.mp4 (100%)
 rename {content => dom}/media/test/street.mp4^headers^ (100%)
 rename {content => dom}/media/test/test-1-mono.opus (100%)
 rename {content => dom}/media/test/test-1-mono.opus^headers^ (100%)
 rename {content => dom}/media/test/test-2-stereo.opus (100%)
 rename {content => dom}/media/test/test-2-stereo.opus^headers^ (100%)
 rename {content => dom}/media/test/test-3-LCR.opus (100%)
 rename {content => dom}/media/test/test-3-LCR.opus^headers^ (100%)
 rename {content => dom}/media/test/test-4-quad.opus (100%)
 rename {content => dom}/media/test/test-4-quad.opus^headers^ (100%)
 rename {content => dom}/media/test/test-5-5.0.opus (100%)
 rename {content => dom}/media/test/test-5-5.0.opus^headers^ (100%)
 rename {content => dom}/media/test/test-6-5.1.opus (100%)
 rename {content => dom}/media/test/test-6-5.1.opus^headers^ (100%)
 rename {content => dom}/media/test/test-7-6.1.opus (100%)
 rename {content => dom}/media/test/test-7-6.1.opus^headers^ (100%)
 rename {content => dom}/media/test/test-8-7.1.opus (100%)
 rename {content => dom}/media/test/test-8-7.1.opus^headers^ (100%)
 rename {content => dom}/media/test/test_VideoPlaybackQuality.html (100%)
 rename {content => dom}/media/test/test_VideoPlaybackQuality_disabled.html (100%)
 rename {content => dom}/media/test/test_access_control.html (90%)
 rename {content => dom}/media/test/test_aspectratio_mp4.html (100%)
 rename {content => dom}/media/test/test_audio1.html (100%)
 rename {content => dom}/media/test/test_audio2.html (100%)
 rename {content => dom}/media/test/test_audioDocumentTitle.html (100%)
 rename {content => dom}/media/test/test_autoplay.html (100%)
 rename {content => dom}/media/test/test_autoplay_contentEditable.html (100%)
 rename {content => dom}/media/test/test_buffered.html (100%)
 rename {content => dom}/media/test/test_bug1018933.html (100%)
 rename {content => dom}/media/test/test_bug448534.html (100%)
 rename {content => dom}/media/test/test_bug463162.xhtml (100%)
 rename {content => dom}/media/test/test_bug465498.html (100%)
 rename {content => dom}/media/test/test_bug493187.html (100%)
 rename {content => dom}/media/test/test_bug495145.html (100%)
 rename {content => dom}/media/test/test_bug495300.html (100%)
 rename {content => dom}/media/test/test_bug654550.html (100%)
 rename {content => dom}/media/test/test_bug686942.html (100%)
 rename {content => dom}/media/test/test_bug726904.html (95%)
 rename {content => dom}/media/test/test_bug874897.html (100%)
 rename {content => dom}/media/test/test_bug883173.html (100%)
 rename {content => dom}/media/test/test_bug895091.html (100%)
 rename {content => dom}/media/test/test_bug895305.html (100%)
 rename {content => dom}/media/test/test_bug919265.html (100%)
 rename {content => dom}/media/test/test_bug957847.html (100%)
 rename {content => dom}/media/test/test_can_play_type.html (100%)
 rename {content => dom}/media/test/test_can_play_type_mpeg.html (100%)
 rename {content => dom}/media/test/test_can_play_type_no_ogg.html (100%)
 rename {content => dom}/media/test/test_can_play_type_no_wave.html (100%)
 rename {content => dom}/media/test/test_can_play_type_no_webm.html (100%)
 rename {content => dom}/media/test/test_can_play_type_ogg.html (100%)
 rename {content => dom}/media/test/test_can_play_type_wave.html (100%)
 rename {content => dom}/media/test/test_can_play_type_webm.html (100%)
 rename {content => dom}/media/test/test_chaining.html (100%)
 rename {content => dom}/media/test/test_clone_media_element.html (100%)
 rename {content => dom}/media/test/test_closing_connections.html (100%)
 rename {content => dom}/media/test/test_constants.html (100%)
 rename {content => dom}/media/test/test_contentDuration1.html (100%)
 rename {content => dom}/media/test/test_contentDuration2.html (100%)
 rename {content => dom}/media/test/test_contentDuration3.html (100%)
 rename {content => dom}/media/test/test_contentDuration4.html (100%)
 rename {content => dom}/media/test/test_contentDuration5.html (100%)
 rename {content => dom}/media/test/test_contentDuration6.html (100%)
 rename {content => dom}/media/test/test_contentDuration7.html (100%)
 rename {content => dom}/media/test/test_controls.html (100%)
 rename {content => dom}/media/test/test_currentTime.html (100%)
 rename {content => dom}/media/test/test_decode_error.html (100%)
 rename {content => dom}/media/test/test_decoder_disable.html (100%)
 rename {content => dom}/media/test/test_defaultMuted.html (95%)
 rename {content => dom}/media/test/test_delay_load.html (100%)
 rename {content => dom}/media/test/test_encryptedMediaExtensions.html (100%)
 rename {content => dom}/media/test/test_error_in_video_document.html (100%)
 rename {content => dom}/media/test/test_error_on_404.html (100%)
 rename {content => dom}/media/test/test_fastSeek-forwards.html (100%)
 rename {content => dom}/media/test/test_fastSeek.html (100%)
 rename {content => dom}/media/test/test_fragment_noplay.html (100%)
 rename {content => dom}/media/test/test_fragment_play.html (100%)
 rename {content => dom}/media/test/test_imagecapture.html (100%)
 rename {content => dom}/media/test/test_info_leak.html (100%)
 rename {content => dom}/media/test/test_invalid_reject.html (100%)
 rename {content => dom}/media/test/test_invalid_reject_play.html (100%)
 rename {content => dom}/media/test/test_invalid_seek.html (100%)
 rename {content => dom}/media/test/test_load.html (100%)
 rename {content => dom}/media/test/test_load_candidates.html (100%)
 rename {content => dom}/media/test/test_load_same_resource.html (100%)
 rename {content => dom}/media/test/test_load_source.html (100%)
 rename {content => dom}/media/test/test_loop.html (100%)
 rename {content => dom}/media/test/test_media_selection.html (100%)
 rename {content => dom}/media/test/test_media_sniffer.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_avoid_recursion.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_creation.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_creation_fail.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_getencodeddata.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_4ch_audiocontext.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_audiocontext.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_audiocontext_mlk.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_audionode.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_getdata_afterstart.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_gum_video_timeslice.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_immediate_stop.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_no_timeslice.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_nosrc.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_session.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_startstopstart.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_stopms.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_record_timeslice.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_reload_crash.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_state_transition.html (100%)
 rename {content => dom}/media/test/test_mediarecorder_unsupported_src.html (100%)
 rename {content => dom}/media/test/test_mediatrack_consuming_mediaresource.html (100%)
 rename {content => dom}/media/test/test_mediatrack_consuming_mediastream.html (100%)
 rename {content => dom}/media/test/test_mediatrack_events.html (100%)
 rename {content => dom}/media/test/test_mediatrack_parsing_ogg.html (100%)
 rename {content => dom}/media/test/test_mediatrack_replay_from_end.html (100%)
 rename {content => dom}/media/test/test_metadata.html (100%)
 rename {content => dom}/media/test/test_mixed_principals.html (90%)
 rename {content => dom}/media/test/test_mozHasAudio.html (100%)
 rename {content => dom}/media/test/test_networkState.html (100%)
 rename {content => dom}/media/test/test_new_audio.html (100%)
 rename {content => dom}/media/test/test_no_load_event.html (100%)
 rename {content => dom}/media/test/test_paused.html (100%)
 rename {content => dom}/media/test/test_paused_after_ended.html (100%)
 rename {content => dom}/media/test/test_play_events.html (100%)
 rename {content => dom}/media/test/test_play_events_2.html (100%)
 rename {content => dom}/media/test/test_play_twice.html (100%)
 rename {content => dom}/media/test/test_playback.html (100%)
 rename {content => dom}/media/test/test_playback_errors.html (100%)
 rename {content => dom}/media/test/test_playback_rate.html (100%)
 rename {content => dom}/media/test/test_playback_rate_playpause.html (100%)
 rename {content => dom}/media/test/test_played.html (100%)
 rename {content => dom}/media/test/test_preload_actions.html (100%)
 rename {content => dom}/media/test/test_preload_attribute.html (100%)
 rename {content => dom}/media/test/test_preload_suspend.html (100%)
 rename {content => dom}/media/test/test_progress.html (100%)
 rename {content => dom}/media/test/test_reactivate.html (100%)
 rename {content => dom}/media/test/test_readyState.html (100%)
 rename {content => dom}/media/test/test_referer.html (100%)
 rename {content => dom}/media/test/test_replay_metadata.html (100%)
 rename {content => dom}/media/test/test_reset_events_async.html (100%)
 rename {content => dom}/media/test/test_reset_src.html (100%)
 rename {content => dom}/media/test/test_resume.html (100%)
 rename {content => dom}/media/test/test_seek-1.html (100%)
 rename {content => dom}/media/test/test_seek-10.html (100%)
 rename {content => dom}/media/test/test_seek-11.html (100%)
 rename {content => dom}/media/test/test_seek-12.html (100%)
 rename {content => dom}/media/test/test_seek-13.html (100%)
 rename {content => dom}/media/test/test_seek-2.html (100%)
 rename {content => dom}/media/test/test_seek-3.html (100%)
 rename {content => dom}/media/test/test_seek-4.html (100%)
 rename {content => dom}/media/test/test_seek-5.html (100%)
 rename {content => dom}/media/test/test_seek-6.html (100%)
 rename {content => dom}/media/test/test_seek-7.html (100%)
 rename {content => dom}/media/test/test_seek-8.html (100%)
 rename {content => dom}/media/test/test_seek-9.html (100%)
 rename {content => dom}/media/test/test_seekLies.html (100%)
 rename {content => dom}/media/test/test_seek_out_of_range.html (100%)
 rename {content => dom}/media/test/test_seekable1.html (100%)
 rename {content => dom}/media/test/test_seekable2.html (100%)
 rename {content => dom}/media/test/test_seekable3.html (100%)
 rename {content => dom}/media/test/test_source.html (100%)
 rename {content => dom}/media/test/test_source_media.html (95%)
 rename {content => dom}/media/test/test_source_null.html (100%)
 rename {content => dom}/media/test/test_source_write.html (100%)
 rename {content => dom}/media/test/test_standalone.html (100%)
 rename {content => dom}/media/test/test_streams_autoplay.html (100%)
 rename {content => dom}/media/test/test_streams_element_capture.html (100%)
 rename {content => dom}/media/test/test_streams_element_capture_createObjectURL.html (100%)
 rename {content => dom}/media/test/test_streams_element_capture_playback.html (100%)
 rename {content => dom}/media/test/test_streams_element_capture_reset.html (100%)
 rename {content => dom}/media/test/test_streams_gc.html (100%)
 rename {content => dom}/media/test/test_streams_srcObject.html (100%)
 rename {content => dom}/media/test/test_streams_tracks.html (100%)
 rename {content => dom}/media/test/test_texttrack.html (100%)
 rename {content => dom}/media/test/test_texttrack_chrome.html (100%)
 rename {content => dom}/media/test/test_texttrackcue.html (100%)
 rename {content => dom}/media/test/test_texttrackcue_chrome.html (100%)
 rename {content => dom}/media/test/test_texttracklist.html (100%)
 rename {content => dom}/media/test/test_texttracklist_chrome.html (100%)
 rename {content => dom}/media/test/test_texttrackregion.html (100%)
 rename {content => dom}/media/test/test_timeupdate_small_files.html (100%)
 rename {content => dom}/media/test/test_trackelementevent.html (100%)
 rename {content => dom}/media/test/test_trackevent.html (100%)
 rename {content => dom}/media/test/test_unseekable.html (100%)
 rename {content => dom}/media/test/test_videoDocumentTitle.html (100%)
 rename {content => dom}/media/test/test_video_in_audio_element.html (100%)
 rename {content => dom}/media/test/test_video_to_canvas.html (100%)
 rename {content => dom}/media/test/test_volume.html (100%)
 rename {content => dom}/media/test/test_vttparser.html (100%)
 rename {content => dom}/media/test/test_wav_ended1.html (100%)
 rename {content => dom}/media/test/test_wav_ended2.html (100%)
 rename {content => dom}/media/test/test_webvtt_disabled.html (100%)
 rename {content => dom}/media/test/variable-channel.ogg (100%)
 rename {content => dom}/media/test/variable-channel.ogg^headers^ (100%)
 rename {content => dom}/media/test/variable-channel.opus (100%)
 rename {content => dom}/media/test/variable-channel.opus^headers^ (100%)
 rename {content => dom}/media/test/variable-preskip.opus (100%)
 rename {content => dom}/media/test/variable-preskip.opus^headers^ (100%)
 rename {content => dom}/media/test/variable-samplerate.ogg (100%)
 rename {content => dom}/media/test/variable-samplerate.ogg^headers^ (100%)
 rename {content => dom}/media/test/variable-samplerate.opus (100%)
 rename {content => dom}/media/test/variable-samplerate.opus^headers^ (100%)
 rename {content => dom}/media/test/vbr-head.mp3 (100%)
 rename {content => dom}/media/test/vbr-head.mp3^headers^ (100%)
 rename {content => dom}/media/test/vbr.mp3 (100%)
 rename {content => dom}/media/test/vbr.mp3^headers^ (100%)
 rename {content => dom}/media/test/video-overhang.ogg (100%)
 rename {content => dom}/media/test/video-overhang.ogg^headers^ (100%)
 rename {content => dom}/media/test/vp9.webm (100%)
 rename {content => dom}/media/test/vp9.webm^headers^ (100%)
 rename {content => dom}/media/test/vp9cake.webm (100%)
 rename {content => dom}/media/test/vp9cake.webm^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata.wav (100%)
 rename {content => dom}/media/test/wave_metadata.wav^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata_bad_len.wav (100%)
 rename {content => dom}/media/test/wave_metadata_bad_len.wav^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata_bad_no_null.wav (100%)
 rename {content => dom}/media/test/wave_metadata_bad_no_null.wav^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata_bad_utf8.wav (100%)
 rename {content => dom}/media/test/wave_metadata_bad_utf8.wav^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata_unknown_tag.wav (100%)
 rename {content => dom}/media/test/wave_metadata_unknown_tag.wav^headers^ (100%)
 rename {content => dom}/media/test/wave_metadata_utf8.wav (100%)
 rename {content => dom}/media/test/wave_metadata_utf8.wav^headers^ (100%)
 rename {content => dom}/media/test/wavedata_s16.wav (100%)
 rename {content => dom}/media/test/wavedata_s16.wav^headers^ (100%)
 rename {content => dom}/media/test/wavedata_u8.wav (100%)
 rename {content => dom}/media/test/wavedata_u8.wav^headers^ (100%)
 rename {content => dom}/media/wave/WaveDecoder.cpp (100%)
 rename {content => dom}/media/wave/WaveDecoder.h (100%)
 rename {content => dom}/media/wave/WaveReader.cpp (100%)
 rename {content => dom}/media/wave/WaveReader.h (100%)
 rename {content => dom}/media/wave/moz.build (100%)
 rename {content => dom}/media/webaudio/AnalyserNode.cpp (100%)
 rename {content => dom}/media/webaudio/AnalyserNode.h (100%)
 rename {content => dom}/media/webaudio/AudioBuffer.cpp (100%)
 rename {content => dom}/media/webaudio/AudioBuffer.h (100%)
 rename {content => dom}/media/webaudio/AudioBufferSourceNode.cpp (100%)
 rename {content => dom}/media/webaudio/AudioBufferSourceNode.h (100%)
 rename {content => dom}/media/webaudio/AudioContext.cpp (100%)
 rename {content => dom}/media/webaudio/AudioContext.h (99%)
 rename {content => dom}/media/webaudio/AudioDestinationNode.cpp (100%)
 rename {content => dom}/media/webaudio/AudioDestinationNode.h (100%)
 rename {content => dom}/media/webaudio/AudioEventTimeline.h (100%)
 rename {content => dom}/media/webaudio/AudioListener.cpp (100%)
 rename {content => dom}/media/webaudio/AudioListener.h (100%)
 rename {content => dom}/media/webaudio/AudioNode.cpp (100%)
 rename {content => dom}/media/webaudio/AudioNode.h (100%)
 rename {content => dom}/media/webaudio/AudioNodeEngine.cpp (100%)
 rename {content => dom}/media/webaudio/AudioNodeEngine.h (100%)
 rename {content => dom}/media/webaudio/AudioNodeEngineNEON.cpp (100%)
 rename {content => dom}/media/webaudio/AudioNodeEngineNEON.h (100%)
 rename {content => dom}/media/webaudio/AudioNodeExternalInputStream.cpp (100%)
 rename {content => dom}/media/webaudio/AudioNodeExternalInputStream.h (100%)
 rename {content => dom}/media/webaudio/AudioNodeStream.cpp (100%)
 rename {content => dom}/media/webaudio/AudioNodeStream.h (100%)
 rename {content => dom}/media/webaudio/AudioParam.cpp (100%)
 rename {content => dom}/media/webaudio/AudioParam.h (100%)
 rename {content => dom}/media/webaudio/AudioParamTimeline.h (100%)
 rename {content => dom}/media/webaudio/AudioProcessingEvent.cpp (100%)
 rename {content => dom}/media/webaudio/AudioProcessingEvent.h (100%)
 rename {content => dom}/media/webaudio/BiquadFilterNode.cpp (100%)
 rename {content => dom}/media/webaudio/BiquadFilterNode.h (100%)
 rename {content => dom}/media/webaudio/BufferDecoder.cpp (100%)
 rename {content => dom}/media/webaudio/BufferDecoder.h (100%)
 rename {content => dom}/media/webaudio/ChannelMergerNode.cpp (100%)
 rename {content => dom}/media/webaudio/ChannelMergerNode.h (100%)
 rename {content => dom}/media/webaudio/ChannelSplitterNode.cpp (100%)
 rename {content => dom}/media/webaudio/ChannelSplitterNode.h (100%)
 rename {content => dom}/media/webaudio/ConvolverNode.cpp (100%)
 rename {content => dom}/media/webaudio/ConvolverNode.h (100%)
 rename {content => dom}/media/webaudio/DelayBuffer.cpp (100%)
 rename {content => dom}/media/webaudio/DelayBuffer.h (100%)
 rename {content => dom}/media/webaudio/DelayNode.cpp (100%)
 rename {content => dom}/media/webaudio/DelayNode.h (100%)
 rename {content => dom}/media/webaudio/DynamicsCompressorNode.cpp (100%)
 rename {content => dom}/media/webaudio/DynamicsCompressorNode.h (100%)
 rename {content => dom}/media/webaudio/FFTBlock.cpp (100%)
 rename {content => dom}/media/webaudio/FFTBlock.h (100%)
 rename {content => dom}/media/webaudio/GainNode.cpp (100%)
 rename {content => dom}/media/webaudio/GainNode.h (100%)
 rename {content => dom}/media/webaudio/MediaBufferDecoder.cpp (100%)
 rename {content => dom}/media/webaudio/MediaBufferDecoder.h (100%)
 rename {content => dom}/media/webaudio/MediaElementAudioSourceNode.cpp (100%)
 rename {content => dom}/media/webaudio/MediaElementAudioSourceNode.h (100%)
 rename {content => dom}/media/webaudio/MediaStreamAudioDestinationNode.cpp (100%)
 rename {content => dom}/media/webaudio/MediaStreamAudioDestinationNode.h (100%)
 rename {content => dom}/media/webaudio/MediaStreamAudioSourceNode.cpp (100%)
 rename {content => dom}/media/webaudio/MediaStreamAudioSourceNode.h (100%)
 rename {content => dom}/media/webaudio/OfflineAudioCompletionEvent.cpp (100%)
 rename {content => dom}/media/webaudio/OfflineAudioCompletionEvent.h (100%)
 rename {content => dom}/media/webaudio/OscillatorNode.cpp (100%)
 rename {content => dom}/media/webaudio/OscillatorNode.h (100%)
 rename {content => dom}/media/webaudio/PannerNode.cpp (100%)
 rename {content => dom}/media/webaudio/PannerNode.h (100%)
 rename {content => dom}/media/webaudio/PeriodicWave.cpp (100%)
 rename {content => dom}/media/webaudio/PeriodicWave.h (100%)
 rename {content => dom}/media/webaudio/PlayingRefChangeHandler.h (100%)
 rename {content => dom}/media/webaudio/ReportDecodeResultTask.h (100%)
 rename {content => dom}/media/webaudio/ScriptProcessorNode.cpp (100%)
 rename {content => dom}/media/webaudio/ScriptProcessorNode.h (100%)
 rename {content => dom}/media/webaudio/ThreeDPoint.cpp (100%)
 rename {content => dom}/media/webaudio/ThreeDPoint.h (100%)
 rename {content => dom}/media/webaudio/WaveShaperNode.cpp (100%)
 rename {content => dom}/media/webaudio/WaveShaperNode.h (100%)
 rename {content => dom}/media/webaudio/WebAudioUtils.cpp (100%)
 rename {content => dom}/media/webaudio/WebAudioUtils.h (100%)
 rename {content => dom}/media/webaudio/blink/Biquad.cpp (100%)
 rename {content => dom}/media/webaudio/blink/Biquad.h (100%)
 rename {content => dom}/media/webaudio/blink/DenormalDisabler.h (100%)
 rename {content => dom}/media/webaudio/blink/DirectConvolver.cpp (100%)
 rename {content => dom}/media/webaudio/blink/DirectConvolver.h (100%)
 rename {content => dom}/media/webaudio/blink/DynamicsCompressor.cpp (100%)
 rename {content => dom}/media/webaudio/blink/DynamicsCompressor.h (100%)
 rename {content => dom}/media/webaudio/blink/DynamicsCompressorKernel.cpp (100%)
 rename {content => dom}/media/webaudio/blink/DynamicsCompressorKernel.h (100%)
 rename {content => dom}/media/webaudio/blink/FFTConvolver.cpp (100%)
 rename {content => dom}/media/webaudio/blink/FFTConvolver.h (100%)
 rename {content => dom}/media/webaudio/blink/HRTFDatabase.cpp (100%)
 rename {content => dom}/media/webaudio/blink/HRTFDatabase.h (100%)
 rename {content => dom}/media/webaudio/blink/HRTFDatabaseLoader.cpp (100%)
 rename {content => dom}/media/webaudio/blink/HRTFDatabaseLoader.h (100%)
 rename {content => dom}/media/webaudio/blink/HRTFElevation.cpp (100%)
 rename {content => dom}/media/webaudio/blink/HRTFElevation.h (100%)
 rename {content => dom}/media/webaudio/blink/HRTFKernel.cpp (100%)
 rename {content => dom}/media/webaudio/blink/HRTFKernel.h (100%)
 rename {content => dom}/media/webaudio/blink/HRTFPanner.cpp (100%)
 rename {content => dom}/media/webaudio/blink/HRTFPanner.h (100%)
 rename {content => dom}/media/webaudio/blink/IRC_Composite_C_R0195-incl.cpp (100%)
 rename {content => dom}/media/webaudio/blink/PeriodicWave.cpp (100%)
 rename {content => dom}/media/webaudio/blink/PeriodicWave.h (100%)
 rename {content => dom}/media/webaudio/blink/README (100%)
 rename {content => dom}/media/webaudio/blink/Reverb.cpp (100%)
 rename {content => dom}/media/webaudio/blink/Reverb.h (100%)
 rename {content => dom}/media/webaudio/blink/ReverbAccumulationBuffer.cpp (100%)
 rename {content => dom}/media/webaudio/blink/ReverbAccumulationBuffer.h (100%)
 rename {content => dom}/media/webaudio/blink/ReverbConvolver.cpp (100%)
 rename {content => dom}/media/webaudio/blink/ReverbConvolver.h (100%)
 rename {content => dom}/media/webaudio/blink/ReverbConvolverStage.cpp (100%)
 rename {content => dom}/media/webaudio/blink/ReverbConvolverStage.h (100%)
 rename {content => dom}/media/webaudio/blink/ReverbInputBuffer.cpp (100%)
 rename {content => dom}/media/webaudio/blink/ReverbInputBuffer.h (100%)
 rename {content => dom}/media/webaudio/blink/ZeroPole.cpp (100%)
 rename {content => dom}/media/webaudio/blink/ZeroPole.h (100%)
 rename {content => dom}/media/webaudio/blink/moz.build (96%)
 rename {content => dom}/media/webaudio/compiledtest/TestAudioEventTimeline.cpp (100%)
 rename {content => dom}/media/webaudio/compiledtest/moz.build (100%)
 rename {content => dom}/media/webaudio/moz.build (100%)
 rename {content => dom}/media/webaudio/test/audio-expected.wav (100%)
 rename {content => dom}/media/webaudio/test/audio-mono-expected-2.wav (100%)
 rename {content => dom}/media/webaudio/test/audio-mono-expected.wav (100%)
 rename {content => dom}/media/webaudio/test/audio-quad.wav (100%)
 rename {content => dom}/media/webaudio/test/audio.ogv (100%)
 rename {content => dom}/media/webaudio/test/audioBufferSourceNodeNeutered_worker.js (100%)
 rename {content => dom}/media/webaudio/test/blink/README (100%)
 rename {content => dom}/media/webaudio/test/blink/audio-testing.js (100%)
 rename {content => dom}/media/webaudio/test/blink/convolution-testing.js (100%)
 rename {content => dom}/media/webaudio/test/blink/mochitest.ini (100%)
 rename {content => dom}/media/webaudio/test/blink/panner-model-testing.js (100%)
 rename {content => dom}/media/webaudio/test/browser.ini (100%)
 rename {content => dom}/media/webaudio/test/browser_mozAudioChannel.html (100%)
 rename {content => dom}/media/webaudio/test/browser_mozAudioChannel.js (97%)
 rename {content => dom}/media/webaudio/test/browser_mozAudioChannel_muted.html (100%)
 rename {content => dom}/media/webaudio/test/browser_mozAudioChannel_muted.js (97%)
 rename {content => dom}/media/webaudio/test/chrome.ini (100%)
 rename {content => dom}/media/webaudio/test/invalid.txt (100%)
 rename {content => dom}/media/webaudio/test/layouttest-glue.js (100%)
 rename {content => dom}/media/webaudio/test/mochitest.ini (100%)
 rename {content => dom}/media/webaudio/test/noaudio.webm (100%)
 rename {content => dom}/media/webaudio/test/small-shot-expected.wav (100%)
 rename {content => dom}/media/webaudio/test/small-shot-mono-expected.wav (100%)
 rename {content => dom}/media/webaudio/test/small-shot.mp3 (100%)
 rename {content => dom}/media/webaudio/test/small-shot.ogg (100%)
 rename {content => dom}/media/webaudio/test/test_AudioBuffer.html (100%)
 rename {content => dom}/media/webaudio/test/test_AudioContext.html (100%)
 rename {content => dom}/media/webaudio/test/test_AudioListener.html (100%)
 rename {content => dom}/media/webaudio/test/test_AudioNodeDevtoolsAPI.html (100%)
 rename {content => dom}/media/webaudio/test/test_OfflineAudioContext.html (100%)
 rename {content => dom}/media/webaudio/test/test_analyserNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_analyserNodeOutput.html (100%)
 rename {content => dom}/media/webaudio/test/test_analyserNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeEnded.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeLazyLoopParam.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeLoop.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeLoopStartEndSame.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeNeutered.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeNoStart.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeNullBuffer.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodeOffset.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioBufferSourceNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioDestinationNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamExponentialRamp.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamLinearRamp.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamSetCurveAtTime.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamSetCurveAtTimeZeroDuration.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamSetTargetAtTime.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamSetValueAtTime.html (100%)
 rename {content => dom}/media/webaudio/test/test_audioParamTimelineDestinationOffset.html (100%)
 rename {content => dom}/media/webaudio/test/test_badConnect.html (100%)
 rename {content => dom}/media/webaudio/test/test_biquadFilterNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_biquadFilterNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_biquadFilterNodeWithGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug1056032.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug808374.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug827541.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug839753.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug845960.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug856771.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug866570.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug866737.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug867089.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug867104.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug867174.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug867203.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug875221.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug875402.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug894150.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug956489.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug964376.html (100%)
 rename {content => dom}/media/webaudio/test/test_bug972678.html (100%)
 rename {content => dom}/media/webaudio/test/test_channelMergerNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_channelMergerNodeWithVolume.html (100%)
 rename {content => dom}/media/webaudio/test/test_channelSplitterNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_channelSplitterNodeWithVolume.html (100%)
 rename {content => dom}/media/webaudio/test/test_convolverNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_convolverNodeChannelCount.html (100%)
 rename {content => dom}/media/webaudio/test/test_convolverNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_convolverNodeWithGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_convolverNode_mono_mono.html (100%)
 rename {content => dom}/media/webaudio/test/test_currentTime.html (100%)
 rename {content => dom}/media/webaudio/test/test_decodeMultichannel.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeAtMax.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeChannelChanges.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeCycles.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeSmallMaxDelay.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeTailIncrease.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeTailWithDisconnect.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeTailWithGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeTailWithReconnect.html (100%)
 rename {content => dom}/media/webaudio/test/test_delayNodeWithGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_dynamicsCompressorNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_dynamicsCompressorNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_gainNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_gainNodeInLoop.html (100%)
 rename {content => dom}/media/webaudio/test/test_gainNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_maxChannelCount.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaDecoding.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaElementAudioSourceNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaElementAudioSourceNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaStreamAudioDestinationNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaStreamAudioSourceNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaStreamAudioSourceNodeCrossOrigin.html (93%)
 rename {content => dom}/media/webaudio/test/test_mediaStreamAudioSourceNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_mediaStreamAudioSourceNodeResampling.html (100%)
 rename {content => dom}/media/webaudio/test/test_mixingRules.html (100%)
 rename {content => dom}/media/webaudio/test/test_mozaudiochannel.html (100%)
 rename {content => dom}/media/webaudio/test/test_nodeToParamConnection.html (100%)
 rename {content => dom}/media/webaudio/test/test_offlineDestinationChannelCountLess.html (100%)
 rename {content => dom}/media/webaudio/test/test_offlineDestinationChannelCountMore.html (100%)
 rename {content => dom}/media/webaudio/test/test_oscillatorNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_oscillatorNode2.html (100%)
 rename {content => dom}/media/webaudio/test/test_oscillatorNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_oscillatorNodeStart.html (100%)
 rename {content => dom}/media/webaudio/test/test_oscillatorTypeChange.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNodeAbove.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNodeChannelCount.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNodeHRTFSymmetry.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNodeTail.html (100%)
 rename {content => dom}/media/webaudio/test/test_pannerNode_equalPower.html (100%)
 rename {content => dom}/media/webaudio/test/test_periodicWave.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNode.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNodeChannelCount.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNodeNotConnected.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNodePassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNodeZeroInputOutput.html (100%)
 rename {content => dom}/media/webaudio/test/test_scriptProcessorNode_playbackTime1.html (100%)
 rename {content => dom}/media/webaudio/test/test_singleSourceDest.html (100%)
 rename {content => dom}/media/webaudio/test/test_stereoPanningWithGain.html (100%)
 rename {content => dom}/media/webaudio/test/test_waveDecoder.html (100%)
 rename {content => dom}/media/webaudio/test/test_waveShaper.html (100%)
 rename {content => dom}/media/webaudio/test/test_waveShaperNoCurve.html (100%)
 rename {content => dom}/media/webaudio/test/test_waveShaperPassThrough.html (100%)
 rename {content => dom}/media/webaudio/test/test_waveShaperZeroLengthCurve.html (100%)
 rename {content => dom}/media/webaudio/test/ting-44.1k-1ch.ogg (100%)
 rename {content => dom}/media/webaudio/test/ting-44.1k-1ch.wav (100%)
 rename {content => dom}/media/webaudio/test/ting-44.1k-2ch.ogg (100%)
 rename {content => dom}/media/webaudio/test/ting-44.1k-2ch.wav (100%)
 rename {content => dom}/media/webaudio/test/ting-48k-1ch.ogg (100%)
 rename {content => dom}/media/webaudio/test/ting-48k-1ch.wav (100%)
 rename {content => dom}/media/webaudio/test/ting-48k-2ch.ogg (100%)
 rename {content => dom}/media/webaudio/test/ting-48k-2ch.wav (100%)
 rename {content => dom}/media/webaudio/test/ting-dualchannel44.1.wav (100%)
 rename {content => dom}/media/webaudio/test/ting-dualchannel48.wav (100%)
 rename {content => dom}/media/webaudio/test/webaudio.js (100%)
 rename {content => dom}/media/webm/EbmlComposer.cpp (100%)
 rename {content => dom}/media/webm/EbmlComposer.h (100%)
 rename {content => dom}/media/webm/WebMBufferedParser.cpp (100%)
 rename {content => dom}/media/webm/WebMBufferedParser.h (100%)
 rename {content => dom}/media/webm/WebMDecoder.cpp (100%)
 rename {content => dom}/media/webm/WebMDecoder.h (100%)
 rename {content => dom}/media/webm/WebMReader.cpp (100%)
 rename {content => dom}/media/webm/WebMReader.h (100%)
 rename {content => dom}/media/webm/WebMWriter.cpp (100%)
 rename {content => dom}/media/webm/WebMWriter.h (100%)
 rename {content => dom}/media/webm/moz.build (100%)
 rename {content => dom}/media/webrtc/AudioOutputObserver.h (100%)
 rename {content => dom}/media/webrtc/MediaEngine.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineCameraVideoSource.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineCameraVideoSource.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineDefault.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineDefault.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineGonkVideoSource.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineGonkVideoSource.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineTabVideoSource.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineTabVideoSource.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineWebRTC.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineWebRTC.h (100%)
 rename {content => dom}/media/webrtc/MediaEngineWebRTCAudio.cpp (100%)
 rename {content => dom}/media/webrtc/MediaEngineWebRTCVideo.cpp (100%)
 rename {content => dom}/media/webrtc/MediaTrackConstraints.h (100%)
 rename {content => dom}/media/webrtc/PeerIdentity.cpp (100%)
 rename {content => dom}/media/webrtc/PeerIdentity.h (100%)
 rename {content => dom}/media/webrtc/moz.build (100%)
 rename {content => dom}/media/webrtc/nsITabSource.idl (100%)
 rename {content => dom}/media/webspeech/moz.build (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechGrammar.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechGrammar.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechGrammarList.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechGrammarList.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognition.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognition.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionAlternative.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionAlternative.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionResult.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionResult.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionResultList.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechRecognitionResultList.h (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechStreamListener.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/SpeechStreamListener.h (100%)
 rename {content => dom}/media/webspeech/recognition/endpointer.cc (100%)
 rename {content => dom}/media/webspeech/recognition/endpointer.h (100%)
 rename {content => dom}/media/webspeech/recognition/energy_endpointer.cc (100%)
 rename {content => dom}/media/webspeech/recognition/energy_endpointer.h (100%)
 rename {content => dom}/media/webspeech/recognition/energy_endpointer_params.cc (100%)
 rename {content => dom}/media/webspeech/recognition/energy_endpointer_params.h (100%)
 rename {content => dom}/media/webspeech/recognition/moz.build (100%)
 rename {content => dom}/media/webspeech/recognition/nsISpeechRecognitionService.idl (100%)
 rename {content => dom}/media/webspeech/recognition/test/FakeSpeechRecognitionService.cpp (100%)
 rename {content => dom}/media/webspeech/recognition/test/FakeSpeechRecognitionService.h (100%)
 rename {content => dom}/media/webspeech/recognition/test/head.js (100%)
 rename {content => dom}/media/webspeech/recognition/test/hello.ogg (100%)
 rename {content => dom}/media/webspeech/recognition/test/hello.ogg^headers^ (100%)
 rename {content => dom}/media/webspeech/recognition/test/mochitest.ini (100%)
 rename {content => dom}/media/webspeech/recognition/test/silence.ogg (100%)
 rename {content => dom}/media/webspeech/recognition/test/silence.ogg^headers^ (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_abort.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_audio_capture_error.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_call_start_from_end_handler.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_nested_eventloop.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_preference_enable.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_recognition_service_error.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_success_without_recognition_service.html (100%)
 rename {content => dom}/media/webspeech/recognition/test/test_timeout.html (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesis.cpp (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesis.h (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesisUtterance.cpp (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesisUtterance.h (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesisVoice.cpp (100%)
 rename {content => dom}/media/webspeech/synth/SpeechSynthesisVoice.h (100%)
 rename {content => dom}/media/webspeech/synth/ipc/PSpeechSynthesis.ipdl (100%)
 rename {content => dom}/media/webspeech/synth/ipc/PSpeechSynthesisRequest.ipdl (100%)
 rename {content => dom}/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp (100%)
 rename {content => dom}/media/webspeech/synth/ipc/SpeechSynthesisChild.h (100%)
 rename {content => dom}/media/webspeech/synth/ipc/SpeechSynthesisParent.cpp (100%)
 rename {content => dom}/media/webspeech/synth/ipc/SpeechSynthesisParent.h (100%)
 rename {content => dom}/media/webspeech/synth/ipc/test/file_ipc.html (100%)
 rename {content => dom}/media/webspeech/synth/ipc/test/mochitest.ini (100%)
 rename {content => dom}/media/webspeech/synth/ipc/test/test_ipc.html (100%)
 rename {content => dom}/media/webspeech/synth/moz.build (100%)
 rename {content => dom}/media/webspeech/synth/nsISpeechService.idl (100%)
 rename {content => dom}/media/webspeech/synth/nsISynthVoiceRegistry.idl (100%)
 rename {content => dom}/media/webspeech/synth/nsSpeechTask.cpp (100%)
 rename {content => dom}/media/webspeech/synth/nsSpeechTask.h (100%)
 rename {content => dom}/media/webspeech/synth/nsSynthVoiceRegistry.cpp (100%)
 rename {content => dom}/media/webspeech/synth/nsSynthVoiceRegistry.h (100%)
 rename {content => dom}/media/webspeech/synth/pico/PicoModule.cpp (100%)
 rename {content => dom}/media/webspeech/synth/pico/moz.build (100%)
 rename {content => dom}/media/webspeech/synth/pico/nsPicoService.cpp (100%)
 rename {content => dom}/media/webspeech/synth/pico/nsPicoService.h (100%)
 rename {content => dom}/media/webspeech/synth/test/common.js (100%)
 rename {content => dom}/media/webspeech/synth/test/file_setup.html (100%)
 rename {content => dom}/media/webspeech/synth/test/file_speech_queue.html (100%)
 rename {content => dom}/media/webspeech/synth/test/file_speech_simple.html (100%)
 rename {content => dom}/media/webspeech/synth/test/mochitest.ini (100%)
 rename {content => dom}/media/webspeech/synth/test/test_setup.html (100%)
 rename {content => dom}/media/webspeech/synth/test/test_speech_queue.html (100%)
 rename {content => dom}/media/webspeech/synth/test/test_speech_simple.html (100%)
 rename {content => dom}/media/webvtt/WebVTT.manifest (100%)
 rename {content => dom}/media/webvtt/WebVTTParserWrapper.js (100%)
 rename {content => dom}/media/webvtt/moz.build (100%)
 rename {content => dom}/media/webvtt/nsIWebVTTListener.idl (100%)
 rename {content => dom}/media/webvtt/nsIWebVTTParserWrapper.idl (100%)
 rename {content => dom}/media/webvtt/package.json (100%)
 rename {content => dom}/media/webvtt/update-webvtt.js (100%)
 rename {content => dom}/media/webvtt/vtt.jsm (100%)
 rename {content => dom}/media/wmf/DXVA2Manager.cpp (100%)
 rename {content => dom}/media/wmf/DXVA2Manager.h (100%)
 rename {content => dom}/media/wmf/WMF.h (100%)
 rename {content => dom}/media/wmf/WMFByteStream.cpp (100%)
 rename {content => dom}/media/wmf/WMFByteStream.h (100%)
 rename {content => dom}/media/wmf/WMFDecoder.cpp (100%)
 rename {content => dom}/media/wmf/WMFDecoder.h (100%)
 rename {content => dom}/media/wmf/WMFReader.cpp (100%)
 rename {content => dom}/media/wmf/WMFReader.h (100%)
 rename {content => dom}/media/wmf/WMFSourceReaderCallback.cpp (100%)
 rename {content => dom}/media/wmf/WMFSourceReaderCallback.h (100%)
 rename {content => dom}/media/wmf/WMFUtils.cpp (100%)
 rename {content => dom}/media/wmf/WMFUtils.h (100%)
 rename {content => dom}/media/wmf/moz.build (100%)

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',

From b2cbe41716584d72896f14957dcec65584dbfb69 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:24:55 +0300
Subject: [PATCH 22/37] Bug 946065 - Part 11: Move content/html/ to dom/ and
 flatten subdirectories. r=peterv

--HG--
rename : content/html/document/src/HTMLAllCollection.cpp => dom/html/HTMLAllCollection.cpp
rename : content/html/document/src/HTMLAllCollection.h => dom/html/HTMLAllCollection.h
rename : content/html/content/src/HTMLAnchorElement.cpp => dom/html/HTMLAnchorElement.cpp
rename : content/html/content/src/HTMLAnchorElement.h => dom/html/HTMLAnchorElement.h
rename : content/html/content/src/HTMLAreaElement.cpp => dom/html/HTMLAreaElement.cpp
rename : content/html/content/src/HTMLAreaElement.h => dom/html/HTMLAreaElement.h
rename : content/html/content/src/HTMLAudioElement.cpp => dom/html/HTMLAudioElement.cpp
rename : content/html/content/public/HTMLAudioElement.h => dom/html/HTMLAudioElement.h
rename : content/html/content/src/HTMLBRElement.cpp => dom/html/HTMLBRElement.cpp
rename : content/html/content/src/HTMLBRElement.h => dom/html/HTMLBRElement.h
rename : content/html/content/src/HTMLBodyElement.cpp => dom/html/HTMLBodyElement.cpp
rename : content/html/content/src/HTMLBodyElement.h => dom/html/HTMLBodyElement.h
rename : content/html/content/src/HTMLButtonElement.cpp => dom/html/HTMLButtonElement.cpp
rename : content/html/content/src/HTMLButtonElement.h => dom/html/HTMLButtonElement.h
rename : content/html/content/src/HTMLCanvasElement.cpp => dom/html/HTMLCanvasElement.cpp
rename : content/html/content/public/HTMLCanvasElement.h => dom/html/HTMLCanvasElement.h
rename : content/html/content/src/HTMLContentElement.cpp => dom/html/HTMLContentElement.cpp
rename : content/html/content/src/HTMLContentElement.h => dom/html/HTMLContentElement.h
rename : content/html/content/src/HTMLDataElement.cpp => dom/html/HTMLDataElement.cpp
rename : content/html/content/src/HTMLDataElement.h => dom/html/HTMLDataElement.h
rename : content/html/content/src/HTMLDataListElement.cpp => dom/html/HTMLDataListElement.cpp
rename : content/html/content/src/HTMLDataListElement.h => dom/html/HTMLDataListElement.h
rename : content/html/content/src/HTMLDivElement.cpp => dom/html/HTMLDivElement.cpp
rename : content/html/content/src/HTMLDivElement.h => dom/html/HTMLDivElement.h
rename : content/html/content/src/HTMLElement.cpp => dom/html/HTMLElement.cpp
rename : content/html/content/src/HTMLFieldSetElement.cpp => dom/html/HTMLFieldSetElement.cpp
rename : content/html/content/src/HTMLFieldSetElement.h => dom/html/HTMLFieldSetElement.h
rename : content/html/content/src/HTMLFontElement.cpp => dom/html/HTMLFontElement.cpp
rename : content/html/content/src/HTMLFontElement.h => dom/html/HTMLFontElement.h
rename : content/html/content/src/HTMLFormControlsCollection.cpp => dom/html/HTMLFormControlsCollection.cpp
rename : content/html/content/src/HTMLFormControlsCollection.h => dom/html/HTMLFormControlsCollection.h
rename : content/html/content/src/HTMLFormElement.cpp => dom/html/HTMLFormElement.cpp
rename : content/html/content/src/HTMLFormElement.h => dom/html/HTMLFormElement.h
rename : content/html/content/src/HTMLFrameElement.cpp => dom/html/HTMLFrameElement.cpp
rename : content/html/content/src/HTMLFrameElement.h => dom/html/HTMLFrameElement.h
rename : content/html/content/src/HTMLFrameSetElement.cpp => dom/html/HTMLFrameSetElement.cpp
rename : content/html/content/src/HTMLFrameSetElement.h => dom/html/HTMLFrameSetElement.h
rename : content/html/content/src/HTMLHRElement.cpp => dom/html/HTMLHRElement.cpp
rename : content/html/content/src/HTMLHRElement.h => dom/html/HTMLHRElement.h
rename : content/html/content/src/HTMLHeadingElement.cpp => dom/html/HTMLHeadingElement.cpp
rename : content/html/content/src/HTMLHeadingElement.h => dom/html/HTMLHeadingElement.h
rename : content/html/content/src/HTMLIFrameElement.cpp => dom/html/HTMLIFrameElement.cpp
rename : content/html/content/src/HTMLIFrameElement.h => dom/html/HTMLIFrameElement.h
rename : content/html/content/src/HTMLImageElement.cpp => dom/html/HTMLImageElement.cpp
rename : content/html/content/src/HTMLImageElement.h => dom/html/HTMLImageElement.h
rename : content/html/content/src/HTMLInputElement.cpp => dom/html/HTMLInputElement.cpp
rename : content/html/content/src/HTMLInputElement.h => dom/html/HTMLInputElement.h
rename : content/html/content/src/HTMLLIElement.cpp => dom/html/HTMLLIElement.cpp
rename : content/html/content/src/HTMLLIElement.h => dom/html/HTMLLIElement.h
rename : content/html/content/src/HTMLLabelElement.cpp => dom/html/HTMLLabelElement.cpp
rename : content/html/content/src/HTMLLabelElement.h => dom/html/HTMLLabelElement.h
rename : content/html/content/src/HTMLLegendElement.cpp => dom/html/HTMLLegendElement.cpp
rename : content/html/content/src/HTMLLegendElement.h => dom/html/HTMLLegendElement.h
rename : content/html/content/src/HTMLLinkElement.cpp => dom/html/HTMLLinkElement.cpp
rename : content/html/content/src/HTMLLinkElement.h => dom/html/HTMLLinkElement.h
rename : content/html/content/src/HTMLMapElement.cpp => dom/html/HTMLMapElement.cpp
rename : content/html/content/src/HTMLMapElement.h => dom/html/HTMLMapElement.h
rename : content/html/content/src/HTMLMediaElement.cpp => dom/html/HTMLMediaElement.cpp
rename : content/html/content/public/HTMLMediaElement.h => dom/html/HTMLMediaElement.h
rename : content/html/content/src/HTMLMenuElement.cpp => dom/html/HTMLMenuElement.cpp
rename : content/html/content/src/HTMLMenuElement.h => dom/html/HTMLMenuElement.h
rename : content/html/content/src/HTMLMenuItemElement.cpp => dom/html/HTMLMenuItemElement.cpp
rename : content/html/content/src/HTMLMenuItemElement.h => dom/html/HTMLMenuItemElement.h
rename : content/html/content/src/HTMLMetaElement.cpp => dom/html/HTMLMetaElement.cpp
rename : content/html/content/src/HTMLMetaElement.h => dom/html/HTMLMetaElement.h
rename : content/html/content/src/HTMLMeterElement.cpp => dom/html/HTMLMeterElement.cpp
rename : content/html/content/src/HTMLMeterElement.h => dom/html/HTMLMeterElement.h
rename : content/html/content/src/HTMLModElement.cpp => dom/html/HTMLModElement.cpp
rename : content/html/content/src/HTMLModElement.h => dom/html/HTMLModElement.h
rename : content/html/content/src/HTMLObjectElement.cpp => dom/html/HTMLObjectElement.cpp
rename : content/html/content/src/HTMLObjectElement.h => dom/html/HTMLObjectElement.h
rename : content/html/content/src/HTMLOptGroupElement.cpp => dom/html/HTMLOptGroupElement.cpp
rename : content/html/content/src/HTMLOptGroupElement.h => dom/html/HTMLOptGroupElement.h
rename : content/html/content/src/HTMLOptionElement.cpp => dom/html/HTMLOptionElement.cpp
rename : content/html/content/src/HTMLOptionElement.h => dom/html/HTMLOptionElement.h
rename : content/html/content/src/HTMLOptionsCollection.cpp => dom/html/HTMLOptionsCollection.cpp
rename : content/html/content/src/HTMLOptionsCollection.h => dom/html/HTMLOptionsCollection.h
rename : content/html/content/src/HTMLOutputElement.cpp => dom/html/HTMLOutputElement.cpp
rename : content/html/content/src/HTMLOutputElement.h => dom/html/HTMLOutputElement.h
rename : content/html/content/src/HTMLParagraphElement.cpp => dom/html/HTMLParagraphElement.cpp
rename : content/html/content/src/HTMLParagraphElement.h => dom/html/HTMLParagraphElement.h
rename : content/html/content/src/HTMLPictureElement.cpp => dom/html/HTMLPictureElement.cpp
rename : content/html/content/src/HTMLPictureElement.h => dom/html/HTMLPictureElement.h
rename : content/html/content/src/HTMLPreElement.cpp => dom/html/HTMLPreElement.cpp
rename : content/html/content/src/HTMLPreElement.h => dom/html/HTMLPreElement.h
rename : content/html/content/src/HTMLProgressElement.cpp => dom/html/HTMLProgressElement.cpp
rename : content/html/content/src/HTMLProgressElement.h => dom/html/HTMLProgressElement.h
rename : content/html/content/src/HTMLPropertiesCollection.cpp => dom/html/HTMLPropertiesCollection.cpp
rename : content/html/content/src/HTMLPropertiesCollection.h => dom/html/HTMLPropertiesCollection.h
rename : content/html/content/src/HTMLScriptElement.cpp => dom/html/HTMLScriptElement.cpp
rename : content/html/content/src/HTMLScriptElement.h => dom/html/HTMLScriptElement.h
rename : content/html/content/src/HTMLSelectElement.cpp => dom/html/HTMLSelectElement.cpp
rename : content/html/content/src/HTMLSelectElement.h => dom/html/HTMLSelectElement.h
rename : content/html/content/src/HTMLShadowElement.cpp => dom/html/HTMLShadowElement.cpp
rename : content/html/content/src/HTMLShadowElement.h => dom/html/HTMLShadowElement.h
rename : content/html/content/src/HTMLSharedElement.cpp => dom/html/HTMLSharedElement.cpp
rename : content/html/content/src/HTMLSharedElement.h => dom/html/HTMLSharedElement.h
rename : content/html/content/src/HTMLSharedListElement.cpp => dom/html/HTMLSharedListElement.cpp
rename : content/html/content/src/HTMLSharedListElement.h => dom/html/HTMLSharedListElement.h
rename : content/html/content/src/HTMLSharedObjectElement.cpp => dom/html/HTMLSharedObjectElement.cpp
rename : content/html/content/src/HTMLSharedObjectElement.h => dom/html/HTMLSharedObjectElement.h
rename : content/html/content/src/HTMLSourceElement.cpp => dom/html/HTMLSourceElement.cpp
rename : content/html/content/src/HTMLSourceElement.h => dom/html/HTMLSourceElement.h
rename : content/html/content/src/HTMLSpanElement.cpp => dom/html/HTMLSpanElement.cpp
rename : content/html/content/src/HTMLSpanElement.h => dom/html/HTMLSpanElement.h
rename : content/html/content/src/HTMLStyleElement.cpp => dom/html/HTMLStyleElement.cpp
rename : content/html/content/src/HTMLStyleElement.h => dom/html/HTMLStyleElement.h
rename : content/html/content/src/HTMLTableCaptionElement.cpp => dom/html/HTMLTableCaptionElement.cpp
rename : content/html/content/src/HTMLTableCaptionElement.h => dom/html/HTMLTableCaptionElement.h
rename : content/html/content/src/HTMLTableCellElement.cpp => dom/html/HTMLTableCellElement.cpp
rename : content/html/content/src/HTMLTableCellElement.h => dom/html/HTMLTableCellElement.h
rename : content/html/content/src/HTMLTableColElement.cpp => dom/html/HTMLTableColElement.cpp
rename : content/html/content/src/HTMLTableColElement.h => dom/html/HTMLTableColElement.h
rename : content/html/content/src/HTMLTableElement.cpp => dom/html/HTMLTableElement.cpp
rename : content/html/content/src/HTMLTableElement.h => dom/html/HTMLTableElement.h
rename : content/html/content/src/HTMLTableRowElement.cpp => dom/html/HTMLTableRowElement.cpp
rename : content/html/content/src/HTMLTableRowElement.h => dom/html/HTMLTableRowElement.h
rename : content/html/content/src/HTMLTableSectionElement.cpp => dom/html/HTMLTableSectionElement.cpp
rename : content/html/content/src/HTMLTableSectionElement.h => dom/html/HTMLTableSectionElement.h
rename : content/html/content/src/HTMLTemplateElement.cpp => dom/html/HTMLTemplateElement.cpp
rename : content/html/content/src/HTMLTemplateElement.h => dom/html/HTMLTemplateElement.h
rename : content/html/content/src/HTMLTextAreaElement.cpp => dom/html/HTMLTextAreaElement.cpp
rename : content/html/content/src/HTMLTextAreaElement.h => dom/html/HTMLTextAreaElement.h
rename : content/html/content/src/HTMLTimeElement.cpp => dom/html/HTMLTimeElement.cpp
rename : content/html/content/src/HTMLTimeElement.h => dom/html/HTMLTimeElement.h
rename : content/html/content/src/HTMLTitleElement.cpp => dom/html/HTMLTitleElement.cpp
rename : content/html/content/src/HTMLTitleElement.h => dom/html/HTMLTitleElement.h
rename : content/html/content/src/HTMLTrackElement.cpp => dom/html/HTMLTrackElement.cpp
rename : content/html/content/src/HTMLTrackElement.h => dom/html/HTMLTrackElement.h
rename : content/html/content/src/HTMLUnknownElement.cpp => dom/html/HTMLUnknownElement.cpp
rename : content/html/content/src/HTMLUnknownElement.h => dom/html/HTMLUnknownElement.h
rename : content/html/content/src/HTMLVideoElement.cpp => dom/html/HTMLVideoElement.cpp
rename : content/html/content/public/HTMLVideoElement.h => dom/html/HTMLVideoElement.h
rename : content/html/document/src/ImageDocument.cpp => dom/html/ImageDocument.cpp
rename : content/html/document/src/ImageDocument.h => dom/html/ImageDocument.h
rename : content/html/document/src/MediaDocument.cpp => dom/html/MediaDocument.cpp
rename : content/html/document/src/MediaDocument.h => dom/html/MediaDocument.h
rename : content/html/content/src/MediaError.cpp => dom/html/MediaError.cpp
rename : content/html/content/src/MediaError.h => dom/html/MediaError.h
rename : content/html/document/src/PluginDocument.cpp => dom/html/PluginDocument.cpp
rename : content/html/content/src/RadioNodeList.cpp => dom/html/RadioNodeList.cpp
rename : content/html/content/src/RadioNodeList.h => dom/html/RadioNodeList.h
rename : content/html/content/src/TextTrackManager.cpp => dom/html/TextTrackManager.cpp
rename : content/html/content/src/TextTrackManager.h => dom/html/TextTrackManager.h
rename : content/html/content/src/TimeRanges.cpp => dom/html/TimeRanges.cpp
rename : content/html/content/src/TimeRanges.h => dom/html/TimeRanges.h
rename : content/html/content/src/UndoManager.cpp => dom/html/UndoManager.cpp
rename : content/html/content/src/UndoManager.h => dom/html/UndoManager.h
rename : content/html/content/src/ValidityState.cpp => dom/html/ValidityState.cpp
rename : content/html/content/src/ValidityState.h => dom/html/ValidityState.h
rename : content/html/document/src/VideoDocument.cpp => dom/html/VideoDocument.cpp
rename : content/html/content/crashtests/1032654.html => dom/html/crashtests/1032654.html
rename : content/html/content/crashtests/257818-1.html => dom/html/crashtests/257818-1.html
rename : content/html/document/crashtests/285166-1.html => dom/html/crashtests/285166-1.html
rename : content/html/document/crashtests/294235-1.html => dom/html/crashtests/294235-1.html
rename : content/html/content/crashtests/307616-1.html => dom/html/crashtests/307616-1.html
rename : content/html/content/crashtests/324918-1.xhtml => dom/html/crashtests/324918-1.xhtml
rename : content/html/content/crashtests/338649-1.xhtml => dom/html/crashtests/338649-1.xhtml
rename : content/html/content/crashtests/339501-1.xhtml => dom/html/crashtests/339501-1.xhtml
rename : content/html/content/crashtests/339501-2.xhtml => dom/html/crashtests/339501-2.xhtml
rename : content/html/document/crashtests/378993-1.xhtml => dom/html/crashtests/378993-1.xhtml
rename : content/html/content/crashtests/382568-1-inner.xhtml => dom/html/crashtests/382568-1-inner.xhtml
rename : content/html/content/crashtests/382568-1.html => dom/html/crashtests/382568-1.html
rename : content/html/content/crashtests/383137.xhtml => dom/html/crashtests/383137.xhtml
rename : content/html/document/crashtests/388183-1.html => dom/html/crashtests/388183-1.html
rename : content/html/document/crashtests/395340-1.html => dom/html/crashtests/395340-1.html
rename : content/html/document/crashtests/399694-1.html => dom/html/crashtests/399694-1.html
rename : content/html/document/crashtests/407053.html => dom/html/crashtests/407053.html
rename : content/html/content/crashtests/423371-1.html => dom/html/crashtests/423371-1.html
rename : content/html/document/crashtests/448564.html => dom/html/crashtests/448564.html
rename : content/html/content/crashtests/451123-1.html => dom/html/crashtests/451123-1.html
rename : content/html/content/crashtests/453406-1.html => dom/html/crashtests/453406-1.html
rename : content/html/content/crashtests/464197-1.html => dom/html/crashtests/464197-1.html
rename : content/html/content/crashtests/465466-1.xhtml => dom/html/crashtests/465466-1.xhtml
rename : content/html/document/crashtests/468562-1.html => dom/html/crashtests/468562-1.html
rename : content/html/document/crashtests/468562-2.html => dom/html/crashtests/468562-2.html
rename : content/html/document/crashtests/494225.html => dom/html/crashtests/494225.html
rename : content/html/document/crashtests/495543.svg => dom/html/crashtests/495543.svg
rename : content/html/content/crashtests/504183-1.html => dom/html/crashtests/504183-1.html
rename : content/html/content/crashtests/515829-1.html => dom/html/crashtests/515829-1.html
rename : content/html/content/crashtests/515829-2.html => dom/html/crashtests/515829-2.html
rename : content/html/document/crashtests/564461.xhtml => dom/html/crashtests/564461.xhtml
rename : content/html/content/crashtests/570566-1.html => dom/html/crashtests/570566-1.html
rename : content/html/content/crashtests/571428-1.html => dom/html/crashtests/571428-1.html
rename : content/html/content/crashtests/580507-1.xhtml => dom/html/crashtests/580507-1.xhtml
rename : content/html/content/crashtests/590387.html => dom/html/crashtests/590387.html
rename : content/html/content/crashtests/596785-1.html => dom/html/crashtests/596785-1.html
rename : content/html/content/crashtests/596785-2.html => dom/html/crashtests/596785-2.html
rename : content/html/document/crashtests/601422.html => dom/html/crashtests/601422.html
rename : content/html/content/crashtests/602117.html => dom/html/crashtests/602117.html
rename : content/html/content/crashtests/604807.html => dom/html/crashtests/604807.html
rename : content/html/content/crashtests/605264.html => dom/html/crashtests/605264.html
rename : content/html/content/crashtests/606430-1.html => dom/html/crashtests/606430-1.html
rename : content/html/content/crashtests/613027.html => dom/html/crashtests/613027.html
rename : content/html/content/crashtests/614279.html => dom/html/crashtests/614279.html
rename : content/html/content/crashtests/614988-1.html => dom/html/crashtests/614988-1.html
rename : content/html/content/crashtests/616401.html => dom/html/crashtests/616401.html
rename : content/html/content/crashtests/620078-1.html => dom/html/crashtests/620078-1.html
rename : content/html/content/crashtests/620078-2.html => dom/html/crashtests/620078-2.html
rename : content/html/document/crashtests/631421.html => dom/html/crashtests/631421.html
rename : content/html/document/crashtests/631421.png => dom/html/crashtests/631421.png
rename : content/html/content/crashtests/673853.html => dom/html/crashtests/673853.html
rename : content/html/content/crashtests/680922-1.xul => dom/html/crashtests/680922-1.xul
rename : content/html/content/crashtests/680922-binding.xml => dom/html/crashtests/680922-binding.xml
rename : content/html/content/crashtests/682058.xhtml => dom/html/crashtests/682058.xhtml
rename : content/html/content/crashtests/682460.html => dom/html/crashtests/682460.html
rename : content/html/content/crashtests/68912-1.html => dom/html/crashtests/68912-1.html
rename : content/html/content/crashtests/738744.xhtml => dom/html/crashtests/738744.xhtml
rename : content/html/document/crashtests/741218.json => dom/html/crashtests/741218.json
rename : content/html/document/crashtests/741218.json^headers^ => dom/html/crashtests/741218.json^headers^
rename : content/html/content/crashtests/741250.xhtml => dom/html/crashtests/741250.xhtml
rename : content/html/content/crashtests/795221-1.html => dom/html/crashtests/795221-1.html
rename : content/html/content/crashtests/795221-2.html => dom/html/crashtests/795221-2.html
rename : content/html/content/crashtests/795221-3.html => dom/html/crashtests/795221-3.html
rename : content/html/content/crashtests/795221-4.html => dom/html/crashtests/795221-4.html
rename : content/html/content/crashtests/795221-5.xml => dom/html/crashtests/795221-5.xml
rename : content/html/content/crashtests/798802-1.html => dom/html/crashtests/798802-1.html
rename : content/html/content/crashtests/811226.html => dom/html/crashtests/811226.html
rename : content/html/content/crashtests/819745.html => dom/html/crashtests/819745.html
rename : content/html/content/crashtests/828180.html => dom/html/crashtests/828180.html
rename : content/html/content/crashtests/828472.html => dom/html/crashtests/828472.html
rename : content/html/content/crashtests/837033.html => dom/html/crashtests/837033.html
rename : content/html/content/crashtests/838256-1.html => dom/html/crashtests/838256-1.html
rename : content/html/content/crashtests/862084.html => dom/html/crashtests/862084.html
rename : content/html/content/crashtests/865147.html => dom/html/crashtests/865147.html
rename : content/html/content/crashtests/877910.html => dom/html/crashtests/877910.html
rename : content/html/content/crashtests/903106.html => dom/html/crashtests/903106.html
rename : content/html/content/crashtests/916322-1.html => dom/html/crashtests/916322-1.html
rename : content/html/content/crashtests/916322-2.html => dom/html/crashtests/916322-2.html
rename : content/html/content/crashtests/crashtests.list => dom/html/crashtests/crashtests.list
rename : content/html/moz.build => dom/html/moz.build
rename : content/html/content/src/nsDOMStringMap.cpp => dom/html/nsDOMStringMap.cpp
rename : content/html/content/src/nsDOMStringMap.h => dom/html/nsDOMStringMap.h
rename : content/html/content/src/nsFormSubmission.cpp => dom/html/nsFormSubmission.cpp
rename : content/html/content/public/nsFormSubmission.h => dom/html/nsFormSubmission.h
rename : content/html/content/src/nsFormSubmissionConstants.h => dom/html/nsFormSubmissionConstants.h
rename : content/html/content/src/nsGenericHTMLElement.cpp => dom/html/nsGenericHTMLElement.cpp
rename : content/html/content/src/nsGenericHTMLElement.h => dom/html/nsGenericHTMLElement.h
rename : content/html/content/src/nsGenericHTMLFrameElement.cpp => dom/html/nsGenericHTMLFrameElement.cpp
rename : content/html/content/src/nsGenericHTMLFrameElement.h => dom/html/nsGenericHTMLFrameElement.h
rename : content/html/document/src/nsHTMLContentSink.cpp => dom/html/nsHTMLContentSink.cpp
rename : content/html/content/src/nsHTMLDNSPrefetch.cpp => dom/html/nsHTMLDNSPrefetch.cpp
rename : content/html/content/src/nsHTMLDNSPrefetch.h => dom/html/nsHTMLDNSPrefetch.h
rename : content/html/document/src/nsHTMLDocument.cpp => dom/html/nsHTMLDocument.cpp
rename : content/html/document/src/nsHTMLDocument.h => dom/html/nsHTMLDocument.h
rename : content/html/content/src/nsIConstraintValidation.cpp => dom/html/nsIConstraintValidation.cpp
rename : content/html/content/public/nsIConstraintValidation.h => dom/html/nsIConstraintValidation.h
rename : content/html/content/public/nsIForm.h => dom/html/nsIForm.h
rename : content/html/content/public/nsIFormControl.h => dom/html/nsIFormControl.h
rename : content/html/content/public/nsIFormProcessor.h => dom/html/nsIFormProcessor.h
rename : content/html/content/public/nsIFormSubmitObserver.idl => dom/html/nsIFormSubmitObserver.idl
rename : content/html/content/public/nsIHTMLCollection.h => dom/html/nsIHTMLCollection.h
rename : content/html/document/src/nsIHTMLDocument.h => dom/html/nsIHTMLDocument.h
rename : content/html/content/public/nsIHTMLMenu.idl => dom/html/nsIHTMLMenu.idl
rename : content/html/document/public/nsIImageDocument.idl => dom/html/nsIImageDocument.idl
rename : content/html/content/public/nsIMenuBuilder.idl => dom/html/nsIMenuBuilder.idl
rename : content/html/content/public/nsIPhonetic.idl => dom/html/nsIPhonetic.idl
rename : content/html/content/public/nsIRadioGroupContainer.h => dom/html/nsIRadioGroupContainer.h
rename : content/html/content/public/nsIRadioVisitor.h => dom/html/nsIRadioVisitor.h
rename : content/html/content/public/nsITextControlElement.h => dom/html/nsITextControlElement.h
rename : content/html/content/src/nsRadioVisitor.cpp => dom/html/nsRadioVisitor.cpp
rename : content/html/content/src/nsRadioVisitor.h => dom/html/nsRadioVisitor.h
rename : content/html/content/src/nsTextEditorState.cpp => dom/html/nsTextEditorState.cpp
rename : content/html/content/src/nsTextEditorState.h => dom/html/nsTextEditorState.h
rename : content/html/content/reftests/41464-1-ref.html => dom/html/reftests/41464-1-ref.html
rename : content/html/content/reftests/41464-1a.html => dom/html/reftests/41464-1a.html
rename : content/html/content/reftests/41464-1b.html => dom/html/reftests/41464-1b.html
rename : content/html/content/reftests/468263-1a.html => dom/html/reftests/468263-1a.html
rename : content/html/content/reftests/468263-1b.html => dom/html/reftests/468263-1b.html
rename : content/html/content/reftests/468263-1c.html => dom/html/reftests/468263-1c.html
rename : content/html/content/reftests/468263-1d.html => dom/html/reftests/468263-1d.html
rename : content/html/content/reftests/468263-2-alternate-ref.html => dom/html/reftests/468263-2-alternate-ref.html
rename : content/html/content/reftests/468263-2-ref.html => dom/html/reftests/468263-2-ref.html
rename : content/html/content/reftests/468263-2.html => dom/html/reftests/468263-2.html
rename : content/html/content/reftests/484200-1-ref.html => dom/html/reftests/484200-1-ref.html
rename : content/html/content/reftests/484200-1.html => dom/html/reftests/484200-1.html
rename : content/html/content/reftests/485377-ref.html => dom/html/reftests/485377-ref.html
rename : content/html/content/reftests/485377.html => dom/html/reftests/485377.html
rename : content/html/content/reftests/52019-1-ref.html => dom/html/reftests/52019-1-ref.html
rename : content/html/content/reftests/52019-1.html => dom/html/reftests/52019-1.html
rename : content/html/content/reftests/557840-ref.html => dom/html/reftests/557840-ref.html
rename : content/html/content/reftests/557840.html => dom/html/reftests/557840.html
rename : content/html/content/reftests/560059-video-dimensions-ref.html => dom/html/reftests/560059-video-dimensions-ref.html
rename : content/html/content/reftests/560059-video-dimensions.html => dom/html/reftests/560059-video-dimensions.html
rename : content/html/content/reftests/573322-no-quirks-ref.html => dom/html/reftests/573322-no-quirks-ref.html
rename : content/html/content/reftests/573322-no-quirks.html => dom/html/reftests/573322-no-quirks.html
rename : content/html/content/reftests/573322-quirks-ref.html => dom/html/reftests/573322-quirks-ref.html
rename : content/html/content/reftests/573322-quirks.html => dom/html/reftests/573322-quirks.html
rename : content/html/content/reftests/596455-1a.html => dom/html/reftests/596455-1a.html
rename : content/html/content/reftests/596455-1b.html => dom/html/reftests/596455-1b.html
rename : content/html/content/reftests/596455-2a.html => dom/html/reftests/596455-2a.html
rename : content/html/content/reftests/596455-2b.html => dom/html/reftests/596455-2b.html
rename : content/html/content/reftests/596455-ref-1.html => dom/html/reftests/596455-ref-1.html
rename : content/html/content/reftests/596455-ref-2.html => dom/html/reftests/596455-ref-2.html
rename : content/html/content/reftests/610935-ref.html => dom/html/reftests/610935-ref.html
rename : content/html/content/reftests/610935.html => dom/html/reftests/610935.html
rename : content/html/content/reftests/649134-1.html => dom/html/reftests/649134-1.html
rename : content/html/content/reftests/649134-2-ref.html => dom/html/reftests/649134-2-ref.html
rename : content/html/content/reftests/649134-2.html => dom/html/reftests/649134-2.html
rename : content/html/content/reftests/649134-ref.html => dom/html/reftests/649134-ref.html
rename : content/html/content/reftests/autofocus/autofocus-after-body-focus-ref.html => dom/html/reftests/autofocus/autofocus-after-body-focus-ref.html
rename : content/html/content/reftests/autofocus/autofocus-after-body-focus.html => dom/html/reftests/autofocus/autofocus-after-body-focus.html
rename : content/html/content/reftests/autofocus/autofocus-after-load-ref.html => dom/html/reftests/autofocus/autofocus-after-load-ref.html
rename : content/html/content/reftests/autofocus/autofocus-after-load.html => dom/html/reftests/autofocus/autofocus-after-load.html
rename : content/html/content/reftests/autofocus/autofocus-leaves-iframe-ref.html => dom/html/reftests/autofocus/autofocus-leaves-iframe-ref.html
rename : content/html/content/reftests/autofocus/autofocus-leaves-iframe.html => dom/html/reftests/autofocus/autofocus-leaves-iframe.html
rename : content/html/content/reftests/autofocus/button-create.html => dom/html/reftests/autofocus/button-create.html
rename : content/html/content/reftests/autofocus/button-load.html => dom/html/reftests/autofocus/button-load.html
rename : content/html/content/reftests/autofocus/button-ref.html => dom/html/reftests/autofocus/button-ref.html
rename : content/html/content/reftests/autofocus/input-create.html => dom/html/reftests/autofocus/input-create.html
rename : content/html/content/reftests/autofocus/input-load.html => dom/html/reftests/autofocus/input-load.html
rename : content/html/content/reftests/autofocus/input-number-ref.html => dom/html/reftests/autofocus/input-number-ref.html
rename : content/html/content/reftests/autofocus/input-number.html => dom/html/reftests/autofocus/input-number.html
rename : content/html/content/reftests/autofocus/input-ref.html => dom/html/reftests/autofocus/input-ref.html
rename : content/html/content/reftests/autofocus/reftest.list => dom/html/reftests/autofocus/reftest.list
rename : content/html/content/reftests/autofocus/select-create.html => dom/html/reftests/autofocus/select-create.html
rename : content/html/content/reftests/autofocus/select-load.html => dom/html/reftests/autofocus/select-load.html
rename : content/html/content/reftests/autofocus/select-ref.html => dom/html/reftests/autofocus/select-ref.html
rename : content/html/content/reftests/autofocus/style.css => dom/html/reftests/autofocus/style.css
rename : content/html/content/reftests/autofocus/textarea-create.html => dom/html/reftests/autofocus/textarea-create.html
rename : content/html/content/reftests/autofocus/textarea-load.html => dom/html/reftests/autofocus/textarea-load.html
rename : content/html/content/reftests/autofocus/textarea-ref.html => dom/html/reftests/autofocus/textarea-ref.html
rename : content/html/document/reftests/bug448564-1_ideal.html => dom/html/reftests/bug448564-1_ideal.html
rename : content/html/document/reftests/bug448564-1_malformed.html => dom/html/reftests/bug448564-1_malformed.html
rename : content/html/document/reftests/bug448564-1_well-formed.html => dom/html/reftests/bug448564-1_well-formed.html
rename : content/html/document/reftests/bug448564-4a.html => dom/html/reftests/bug448564-4a.html
rename : content/html/document/reftests/bug448564-4b.html => dom/html/reftests/bug448564-4b.html
rename : content/html/document/reftests/bug448564_forms.css => dom/html/reftests/bug448564_forms.css
rename : content/html/document/reftests/bug502168-1_malformed.html => dom/html/reftests/bug502168-1_malformed.html
rename : content/html/document/reftests/bug502168-1_well-formed.html => dom/html/reftests/bug502168-1_well-formed.html
rename : content/html/document/reftests/bug917595-1-ref.html => dom/html/reftests/bug917595-1-ref.html
rename : content/html/document/reftests/bug917595-exif-rotated.jpg => dom/html/reftests/bug917595-exif-rotated.jpg
rename : content/html/document/reftests/bug917595-iframe-1.html => dom/html/reftests/bug917595-iframe-1.html
rename : content/html/document/reftests/bug917595-pixel-rotated.jpg => dom/html/reftests/bug917595-pixel-rotated.jpg
rename : content/html/document/reftests/bug917595-unrotated.jpg => dom/html/reftests/bug917595-unrotated.jpg
rename : content/html/content/reftests/figure-ref.html => dom/html/reftests/figure-ref.html
rename : content/html/content/reftests/figure.html => dom/html/reftests/figure.html
rename : content/html/content/reftests/href-attr-change-restyles-ref.html => dom/html/reftests/href-attr-change-restyles-ref.html
rename : content/html/content/reftests/href-attr-change-restyles.html => dom/html/reftests/href-attr-change-restyles.html
rename : content/html/content/reftests/pass.png => dom/html/reftests/pass.png
rename : content/html/content/reftests/pre-1-ref.html => dom/html/reftests/pre-1-ref.html
rename : content/html/content/reftests/pre-1.html => dom/html/reftests/pre-1.html
rename : content/html/content/reftests/reftest.list => dom/html/reftests/reftest.list
rename : content/html/content/reftests/table-border-1-ref.html => dom/html/reftests/table-border-1-ref.html
rename : content/html/content/reftests/table-border-1.html => dom/html/reftests/table-border-1.html
rename : content/html/content/reftests/table-border-2-notref.html => dom/html/reftests/table-border-2-notref.html
rename : content/html/content/reftests/table-border-2-ref.html => dom/html/reftests/table-border-2-ref.html
rename : content/html/content/reftests/table-border-2.html => dom/html/reftests/table-border-2.html
rename : content/html/content/reftests/toblob-todataurl/blob.js => dom/html/reftests/toblob-todataurl/blob.js
rename : content/html/content/reftests/toblob-todataurl/dataurl.js => dom/html/reftests/toblob-todataurl/dataurl.js
rename : content/html/content/reftests/toblob-todataurl/images/original.png => dom/html/reftests/toblob-todataurl/images/original.png
rename : content/html/content/reftests/toblob-todataurl/images/q0.jpg => dom/html/reftests/toblob-todataurl/images/q0.jpg
rename : content/html/content/reftests/toblob-todataurl/images/q100.jpg => dom/html/reftests/toblob-todataurl/images/q100.jpg
rename : content/html/content/reftests/toblob-todataurl/images/q25.jpg => dom/html/reftests/toblob-todataurl/images/q25.jpg
rename : content/html/content/reftests/toblob-todataurl/images/q50.jpg => dom/html/reftests/toblob-todataurl/images/q50.jpg
rename : content/html/content/reftests/toblob-todataurl/images/q75.jpg => dom/html/reftests/toblob-todataurl/images/q75.jpg
rename : content/html/content/reftests/toblob-todataurl/images/q92.jpg => dom/html/reftests/toblob-todataurl/images/q92.jpg
rename : content/html/content/reftests/toblob-todataurl/quality-0-ref.html => dom/html/reftests/toblob-todataurl/quality-0-ref.html
rename : content/html/content/reftests/toblob-todataurl/quality-100-ref.html => dom/html/reftests/toblob-todataurl/quality-100-ref.html
rename : content/html/content/reftests/toblob-todataurl/quality-25-ref.html => dom/html/reftests/toblob-todataurl/quality-25-ref.html
rename : content/html/content/reftests/toblob-todataurl/quality-50-ref.html => dom/html/reftests/toblob-todataurl/quality-50-ref.html
rename : content/html/content/reftests/toblob-todataurl/quality-75-ref.html => dom/html/reftests/toblob-todataurl/quality-75-ref.html
rename : content/html/content/reftests/toblob-todataurl/quality-92-ref.html => dom/html/reftests/toblob-todataurl/quality-92-ref.html
rename : content/html/content/reftests/toblob-todataurl/reftest.list => dom/html/reftests/toblob-todataurl/reftest.list
rename : content/html/content/reftests/toblob-todataurl/sample.js => dom/html/reftests/toblob-todataurl/sample.js
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-0.html => dom/html/reftests/toblob-todataurl/toblob-quality-0.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-100.html => dom/html/reftests/toblob-todataurl/toblob-quality-100.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-25.html => dom/html/reftests/toblob-todataurl/toblob-quality-25.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-50.html => dom/html/reftests/toblob-todataurl/toblob-quality-50.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-75.html => dom/html/reftests/toblob-todataurl/toblob-quality-75.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-92.html => dom/html/reftests/toblob-todataurl/toblob-quality-92.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-default.html => dom/html/reftests/toblob-todataurl/toblob-quality-default.html
rename : content/html/content/reftests/toblob-todataurl/toblob-quality-undefined.html => dom/html/reftests/toblob-todataurl/toblob-quality-undefined.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-0.html => dom/html/reftests/toblob-todataurl/todataurl-quality-0.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-100.html => dom/html/reftests/toblob-todataurl/todataurl-quality-100.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-25.html => dom/html/reftests/toblob-todataurl/todataurl-quality-25.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-50.html => dom/html/reftests/toblob-todataurl/todataurl-quality-50.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-75.html => dom/html/reftests/toblob-todataurl/todataurl-quality-75.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-92.html => dom/html/reftests/toblob-todataurl/todataurl-quality-92.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-default.html => dom/html/reftests/toblob-todataurl/todataurl-quality-default.html
rename : content/html/content/reftests/toblob-todataurl/todataurl-quality-undefined.html => dom/html/reftests/toblob-todataurl/todataurl-quality-undefined.html
rename : content/html/content/test/347174transform.xsl => dom/html/test/347174transform.xsl
rename : content/html/content/test/347174transformable.xml => dom/html/test/347174transformable.xml
rename : content/html/content/test/allowMedia.sjs => dom/html/test/allowMedia.sjs
rename : content/html/content/test/browser.ini => dom/html/test/browser.ini
rename : content/html/document/test/browser_bug1081537.js => dom/html/test/browser_bug1081537.js
rename : content/html/document/test/browser_bug592641.js => dom/html/test/browser_bug592641.js
rename : content/html/content/test/browser_bug649778.js => dom/html/test/browser_bug649778.js
rename : content/html/content/test/bug100533_iframe.html => dom/html/test/bug100533_iframe.html
rename : content/html/content/test/bug100533_load.html => dom/html/test/bug100533_load.html
rename : content/html/document/test/bug196523-subframe.html => dom/html/test/bug196523-subframe.html
rename : content/html/document/test/bug199692-nested-d2.html => dom/html/test/bug199692-nested-d2.html
rename : content/html/document/test/bug199692-nested.html => dom/html/test/bug199692-nested.html
rename : content/html/document/test/bug199692-popup.html => dom/html/test/bug199692-popup.html
rename : content/html/document/test/bug199692-scrolled.html => dom/html/test/bug199692-scrolled.html
rename : content/html/content/test/bug242709_iframe.html => dom/html/test/bug242709_iframe.html
rename : content/html/content/test/bug242709_load.html => dom/html/test/bug242709_load.html
rename : content/html/content/test/bug277724_iframe1.html => dom/html/test/bug277724_iframe1.html
rename : content/html/content/test/bug277724_iframe2.xhtml => dom/html/test/bug277724_iframe2.xhtml
rename : content/html/content/test/bug277890_iframe.html => dom/html/test/bug277890_iframe.html
rename : content/html/content/test/bug277890_load.html => dom/html/test/bug277890_load.html
rename : content/html/content/test/bug340800_iframe.txt => dom/html/test/bug340800_iframe.txt
rename : content/html/document/test/bug369370-popup.png => dom/html/test/bug369370-popup.png
rename : content/html/content/test/bug372098-link-target.html => dom/html/test/bug372098-link-target.html
rename : content/html/content/test/bug392567.jar => dom/html/test/bug392567.jar
rename : content/html/content/test/bug392567.jar^headers^ => dom/html/test/bug392567.jar^headers^
rename : content/html/content/test/bug441930_iframe.html => dom/html/test/bug441930_iframe.html
rename : content/html/document/test/bug445004-inner.html => dom/html/test/bug445004-inner.html
rename : content/html/document/test/bug445004-inner.js => dom/html/test/bug445004-inner.js
rename : content/html/document/test/bug445004-outer-abs.html => dom/html/test/bug445004-outer-abs.html
rename : content/html/document/test/bug445004-outer-rel.html => dom/html/test/bug445004-outer-rel.html
rename : content/html/document/test/bug445004-outer-write.html => dom/html/test/bug445004-outer-write.html
rename : content/html/document/test/bug446483-iframe.html => dom/html/test/bug446483-iframe.html
rename : content/html/document/test/bug448564-echo.sjs => dom/html/test/bug448564-echo.sjs
rename : content/html/document/test/bug448564-iframe-1.html => dom/html/test/bug448564-iframe-1.html
rename : content/html/document/test/bug448564-iframe-2.html => dom/html/test/bug448564-iframe-2.html
rename : content/html/document/test/bug448564-iframe-3.html => dom/html/test/bug448564-iframe-3.html
rename : content/html/document/test/bug448564-submit.js => dom/html/test/bug448564-submit.js
rename : content/html/document/test/bug499092.html => dom/html/test/bug499092.html
rename : content/html/document/test/bug499092.xml => dom/html/test/bug499092.xml
rename : content/html/content/test/bug514856_iframe.html => dom/html/test/bug514856_iframe.html
rename : content/html/document/test/bug592641_img.jpg => dom/html/test/bug592641_img.jpg
rename : content/html/content/test/bug649134/file_bug649134-1.sjs => dom/html/test/bug649134/file_bug649134-1.sjs
rename : content/html/content/test/bug649134/file_bug649134-2.sjs => dom/html/test/bug649134/file_bug649134-2.sjs
rename : content/html/content/test/bug649134/index.html => dom/html/test/bug649134/index.html
rename : content/html/content/test/chrome.ini => dom/html/test/chrome.ini
rename : content/html/content/test/enableTestPlugin.js => dom/html/test/enableTestPlugin.js
rename : content/html/content/test/file_anchor_ping.html => dom/html/test/file_anchor_ping.html
rename : content/html/content/test/file_bug209275_1.html => dom/html/test/file_bug209275_1.html
rename : content/html/content/test/file_bug209275_2.html => dom/html/test/file_bug209275_2.html
rename : content/html/content/test/file_bug209275_3.html => dom/html/test/file_bug209275_3.html
rename : content/html/content/test/file_bug297761.html => dom/html/test/file_bug297761.html
rename : content/html/content/test/file_bug417760.png => dom/html/test/file_bug417760.png
rename : content/html/content/test/file_bug649778.html => dom/html/test/file_bug649778.html
rename : content/html/content/test/file_bug649778.html^headers^ => dom/html/test/file_bug649778.html^headers^
rename : content/html/document/test/file_bug871161-1.html => dom/html/test/file_bug871161-1.html
rename : content/html/document/test/file_bug871161-2.html => dom/html/test/file_bug871161-2.html
rename : content/html/content/test/file_bug893537.html => dom/html/test/file_bug893537.html
rename : content/html/content/test/file_formSubmission_img.jpg => dom/html/test/file_formSubmission_img.jpg
rename : content/html/content/test/file_formSubmission_text.txt => dom/html/test/file_formSubmission_text.txt
rename : content/html/content/test/file_fullscreen-ancestor-stacking-context.html => dom/html/test/file_fullscreen-ancestor-stacking-context.html
rename : content/html/content/test/file_fullscreen-api-keys.html => dom/html/test/file_fullscreen-api-keys.html
rename : content/html/content/test/file_fullscreen-api.html => dom/html/test/file_fullscreen-api.html
rename : content/html/content/test/file_fullscreen-denied-inner.html => dom/html/test/file_fullscreen-denied-inner.html
rename : content/html/content/test/file_fullscreen-denied.html => dom/html/test/file_fullscreen-denied.html
rename : content/html/content/test/file_fullscreen-esc-exit-inner.html => dom/html/test/file_fullscreen-esc-exit-inner.html
rename : content/html/content/test/file_fullscreen-esc-exit.html => dom/html/test/file_fullscreen-esc-exit.html
rename : content/html/content/test/file_fullscreen-hidden.html => dom/html/test/file_fullscreen-hidden.html
rename : content/html/content/test/file_fullscreen-multiple-inner.html => dom/html/test/file_fullscreen-multiple-inner.html
rename : content/html/content/test/file_fullscreen-multiple.html => dom/html/test/file_fullscreen-multiple.html
rename : content/html/content/test/file_fullscreen-navigation.html => dom/html/test/file_fullscreen-navigation.html
rename : content/html/content/test/file_fullscreen-plugins.html => dom/html/test/file_fullscreen-plugins.html
rename : content/html/content/test/file_fullscreen-rollback.html => dom/html/test/file_fullscreen-rollback.html
rename : content/html/content/test/file_fullscreen-svg-element.html => dom/html/test/file_fullscreen-svg-element.html
rename : content/html/content/test/file_fullscreen-utils.js => dom/html/test/file_fullscreen-utils.js
rename : content/html/content/test/file_iframe_sandbox_a_if1.html => dom/html/test/file_iframe_sandbox_a_if1.html
rename : content/html/content/test/file_iframe_sandbox_a_if10.html => dom/html/test/file_iframe_sandbox_a_if10.html
rename : content/html/content/test/file_iframe_sandbox_a_if11.html => dom/html/test/file_iframe_sandbox_a_if11.html
rename : content/html/content/test/file_iframe_sandbox_a_if12.html => dom/html/test/file_iframe_sandbox_a_if12.html
rename : content/html/content/test/file_iframe_sandbox_a_if13.html => dom/html/test/file_iframe_sandbox_a_if13.html
rename : content/html/content/test/file_iframe_sandbox_a_if14.html => dom/html/test/file_iframe_sandbox_a_if14.html
rename : content/html/content/test/file_iframe_sandbox_a_if15.html => dom/html/test/file_iframe_sandbox_a_if15.html
rename : content/html/content/test/file_iframe_sandbox_a_if16.html => dom/html/test/file_iframe_sandbox_a_if16.html
rename : content/html/content/test/file_iframe_sandbox_a_if17.html => dom/html/test/file_iframe_sandbox_a_if17.html
rename : content/html/content/test/file_iframe_sandbox_a_if18.html => dom/html/test/file_iframe_sandbox_a_if18.html
rename : content/html/content/test/file_iframe_sandbox_a_if19.html => dom/html/test/file_iframe_sandbox_a_if19.html
rename : content/html/content/test/file_iframe_sandbox_a_if2.html => dom/html/test/file_iframe_sandbox_a_if2.html
rename : content/html/content/test/file_iframe_sandbox_a_if3.html => dom/html/test/file_iframe_sandbox_a_if3.html
rename : content/html/content/test/file_iframe_sandbox_a_if4.html => dom/html/test/file_iframe_sandbox_a_if4.html
rename : content/html/content/test/file_iframe_sandbox_a_if5.html => dom/html/test/file_iframe_sandbox_a_if5.html
rename : content/html/content/test/file_iframe_sandbox_a_if6.html => dom/html/test/file_iframe_sandbox_a_if6.html
rename : content/html/content/test/file_iframe_sandbox_a_if7.html => dom/html/test/file_iframe_sandbox_a_if7.html
rename : content/html/content/test/file_iframe_sandbox_a_if8.html => dom/html/test/file_iframe_sandbox_a_if8.html
rename : content/html/content/test/file_iframe_sandbox_a_if9.html => dom/html/test/file_iframe_sandbox_a_if9.html
rename : content/html/content/test/file_iframe_sandbox_b_if1.html => dom/html/test/file_iframe_sandbox_b_if1.html
rename : content/html/content/test/file_iframe_sandbox_b_if2.html => dom/html/test/file_iframe_sandbox_b_if2.html
rename : content/html/content/test/file_iframe_sandbox_b_if3.html => dom/html/test/file_iframe_sandbox_b_if3.html
rename : content/html/content/test/file_iframe_sandbox_c_if1.html => dom/html/test/file_iframe_sandbox_c_if1.html
rename : content/html/content/test/file_iframe_sandbox_c_if2.html => dom/html/test/file_iframe_sandbox_c_if2.html
rename : content/html/content/test/file_iframe_sandbox_c_if3.html => dom/html/test/file_iframe_sandbox_c_if3.html
rename : content/html/content/test/file_iframe_sandbox_c_if4.html => dom/html/test/file_iframe_sandbox_c_if4.html
rename : content/html/content/test/file_iframe_sandbox_c_if5.html => dom/html/test/file_iframe_sandbox_c_if5.html
rename : content/html/content/test/file_iframe_sandbox_c_if6.html => dom/html/test/file_iframe_sandbox_c_if6.html
rename : content/html/content/test/file_iframe_sandbox_c_if7.html => dom/html/test/file_iframe_sandbox_c_if7.html
rename : content/html/content/test/file_iframe_sandbox_c_if8.html => dom/html/test/file_iframe_sandbox_c_if8.html
rename : content/html/content/test/file_iframe_sandbox_close.html => dom/html/test/file_iframe_sandbox_close.html
rename : content/html/content/test/file_iframe_sandbox_d_if1.html => dom/html/test/file_iframe_sandbox_d_if1.html
rename : content/html/content/test/file_iframe_sandbox_d_if10.html => dom/html/test/file_iframe_sandbox_d_if10.html
rename : content/html/content/test/file_iframe_sandbox_d_if11.html => dom/html/test/file_iframe_sandbox_d_if11.html
rename : content/html/content/test/file_iframe_sandbox_d_if12.html => dom/html/test/file_iframe_sandbox_d_if12.html
rename : content/html/content/test/file_iframe_sandbox_d_if13.html => dom/html/test/file_iframe_sandbox_d_if13.html
rename : content/html/content/test/file_iframe_sandbox_d_if14.html => dom/html/test/file_iframe_sandbox_d_if14.html
rename : content/html/content/test/file_iframe_sandbox_d_if15.html => dom/html/test/file_iframe_sandbox_d_if15.html
rename : content/html/content/test/file_iframe_sandbox_d_if16.html => dom/html/test/file_iframe_sandbox_d_if16.html
rename : content/html/content/test/file_iframe_sandbox_d_if17.html => dom/html/test/file_iframe_sandbox_d_if17.html
rename : content/html/content/test/file_iframe_sandbox_d_if18.html => dom/html/test/file_iframe_sandbox_d_if18.html
rename : content/html/content/test/file_iframe_sandbox_d_if19.html => dom/html/test/file_iframe_sandbox_d_if19.html
rename : content/html/content/test/file_iframe_sandbox_d_if2.html => dom/html/test/file_iframe_sandbox_d_if2.html
rename : content/html/content/test/file_iframe_sandbox_d_if20.html => dom/html/test/file_iframe_sandbox_d_if20.html
rename : content/html/content/test/file_iframe_sandbox_d_if21.html => dom/html/test/file_iframe_sandbox_d_if21.html
rename : content/html/content/test/file_iframe_sandbox_d_if22.html => dom/html/test/file_iframe_sandbox_d_if22.html
rename : content/html/content/test/file_iframe_sandbox_d_if23.html => dom/html/test/file_iframe_sandbox_d_if23.html
rename : content/html/content/test/file_iframe_sandbox_d_if3.html => dom/html/test/file_iframe_sandbox_d_if3.html
rename : content/html/content/test/file_iframe_sandbox_d_if4.html => dom/html/test/file_iframe_sandbox_d_if4.html
rename : content/html/content/test/file_iframe_sandbox_d_if5.html => dom/html/test/file_iframe_sandbox_d_if5.html
rename : content/html/content/test/file_iframe_sandbox_d_if6.html => dom/html/test/file_iframe_sandbox_d_if6.html
rename : content/html/content/test/file_iframe_sandbox_d_if7.html => dom/html/test/file_iframe_sandbox_d_if7.html
rename : content/html/content/test/file_iframe_sandbox_d_if8.html => dom/html/test/file_iframe_sandbox_d_if8.html
rename : content/html/content/test/file_iframe_sandbox_d_if9.html => dom/html/test/file_iframe_sandbox_d_if9.html
rename : content/html/content/test/file_iframe_sandbox_e_if1.html => dom/html/test/file_iframe_sandbox_e_if1.html
rename : content/html/content/test/file_iframe_sandbox_e_if10.html => dom/html/test/file_iframe_sandbox_e_if10.html
rename : content/html/content/test/file_iframe_sandbox_e_if11.html => dom/html/test/file_iframe_sandbox_e_if11.html
rename : content/html/content/test/file_iframe_sandbox_e_if12.html => dom/html/test/file_iframe_sandbox_e_if12.html
rename : content/html/content/test/file_iframe_sandbox_e_if13.html => dom/html/test/file_iframe_sandbox_e_if13.html
rename : content/html/content/test/file_iframe_sandbox_e_if14.html => dom/html/test/file_iframe_sandbox_e_if14.html
rename : content/html/content/test/file_iframe_sandbox_e_if15.html => dom/html/test/file_iframe_sandbox_e_if15.html
rename : content/html/content/test/file_iframe_sandbox_e_if16.html => dom/html/test/file_iframe_sandbox_e_if16.html
rename : content/html/content/test/file_iframe_sandbox_e_if2.html => dom/html/test/file_iframe_sandbox_e_if2.html
rename : content/html/content/test/file_iframe_sandbox_e_if3.html => dom/html/test/file_iframe_sandbox_e_if3.html
rename : content/html/content/test/file_iframe_sandbox_e_if4.html => dom/html/test/file_iframe_sandbox_e_if4.html
rename : content/html/content/test/file_iframe_sandbox_e_if5.html => dom/html/test/file_iframe_sandbox_e_if5.html
rename : content/html/content/test/file_iframe_sandbox_e_if6.html => dom/html/test/file_iframe_sandbox_e_if6.html
rename : content/html/content/test/file_iframe_sandbox_e_if7.html => dom/html/test/file_iframe_sandbox_e_if7.html
rename : content/html/content/test/file_iframe_sandbox_e_if8.html => dom/html/test/file_iframe_sandbox_e_if8.html
rename : content/html/content/test/file_iframe_sandbox_e_if9.html => dom/html/test/file_iframe_sandbox_e_if9.html
rename : content/html/content/test/file_iframe_sandbox_f_if1.html => dom/html/test/file_iframe_sandbox_f_if1.html
rename : content/html/content/test/file_iframe_sandbox_f_if2.html => dom/html/test/file_iframe_sandbox_f_if2.html
rename : content/html/content/test/file_iframe_sandbox_f_if2.html^headers^ => dom/html/test/file_iframe_sandbox_f_if2.html^headers^
rename : content/html/content/test/file_iframe_sandbox_fail.js => dom/html/test/file_iframe_sandbox_fail.js
rename : content/html/content/test/file_iframe_sandbox_form_fail.html => dom/html/test/file_iframe_sandbox_form_fail.html
rename : content/html/content/test/file_iframe_sandbox_form_pass.html => dom/html/test/file_iframe_sandbox_form_pass.html
rename : content/html/content/test/file_iframe_sandbox_g_if1.html => dom/html/test/file_iframe_sandbox_g_if1.html
rename : content/html/content/test/file_iframe_sandbox_h_if1.html => dom/html/test/file_iframe_sandbox_h_if1.html
rename : content/html/content/test/file_iframe_sandbox_j_if1.html => dom/html/test/file_iframe_sandbox_j_if1.html
rename : content/html/content/test/file_iframe_sandbox_j_if2.html => dom/html/test/file_iframe_sandbox_j_if2.html
rename : content/html/content/test/file_iframe_sandbox_j_if3.html => dom/html/test/file_iframe_sandbox_j_if3.html
rename : content/html/content/test/file_iframe_sandbox_k_if1.html => dom/html/test/file_iframe_sandbox_k_if1.html
rename : content/html/content/test/file_iframe_sandbox_k_if2.html => dom/html/test/file_iframe_sandbox_k_if2.html
rename : content/html/content/test/file_iframe_sandbox_k_if3.html => dom/html/test/file_iframe_sandbox_k_if3.html
rename : content/html/content/test/file_iframe_sandbox_k_if4.html => dom/html/test/file_iframe_sandbox_k_if4.html
rename : content/html/content/test/file_iframe_sandbox_k_if5.html => dom/html/test/file_iframe_sandbox_k_if5.html
rename : content/html/content/test/file_iframe_sandbox_k_if6.html => dom/html/test/file_iframe_sandbox_k_if6.html
rename : content/html/content/test/file_iframe_sandbox_k_if7.html => dom/html/test/file_iframe_sandbox_k_if7.html
rename : content/html/content/test/file_iframe_sandbox_k_if8.html => dom/html/test/file_iframe_sandbox_k_if8.html
rename : content/html/content/test/file_iframe_sandbox_k_if9.html => dom/html/test/file_iframe_sandbox_k_if9.html
rename : content/html/content/test/file_iframe_sandbox_navigation_fail.html => dom/html/test/file_iframe_sandbox_navigation_fail.html
rename : content/html/content/test/file_iframe_sandbox_navigation_pass.html => dom/html/test/file_iframe_sandbox_navigation_pass.html
rename : content/html/content/test/file_iframe_sandbox_navigation_start.html => dom/html/test/file_iframe_sandbox_navigation_start.html
rename : content/html/content/test/file_iframe_sandbox_open_window_fail.html => dom/html/test/file_iframe_sandbox_open_window_fail.html
rename : content/html/content/test/file_iframe_sandbox_open_window_pass.html => dom/html/test/file_iframe_sandbox_open_window_pass.html
rename : content/html/content/test/file_iframe_sandbox_pass.js => dom/html/test/file_iframe_sandbox_pass.js
rename : content/html/content/test/file_iframe_sandbox_redirect.html => dom/html/test/file_iframe_sandbox_redirect.html
rename : content/html/content/test/file_iframe_sandbox_redirect.html^headers^ => dom/html/test/file_iframe_sandbox_redirect.html^headers^
rename : content/html/content/test/file_iframe_sandbox_redirect_target.html => dom/html/test/file_iframe_sandbox_redirect_target.html
rename : content/html/content/test/file_iframe_sandbox_top_navigation_fail.html => dom/html/test/file_iframe_sandbox_top_navigation_fail.html
rename : content/html/content/test/file_iframe_sandbox_top_navigation_pass.html => dom/html/test/file_iframe_sandbox_top_navigation_pass.html
rename : content/html/content/test/file_iframe_sandbox_window_form_fail.html => dom/html/test/file_iframe_sandbox_window_form_fail.html
rename : content/html/content/test/file_iframe_sandbox_window_form_pass.html => dom/html/test/file_iframe_sandbox_window_form_pass.html
rename : content/html/content/test/file_iframe_sandbox_window_navigation_fail.html => dom/html/test/file_iframe_sandbox_window_navigation_fail.html
rename : content/html/content/test/file_iframe_sandbox_window_navigation_pass.html => dom/html/test/file_iframe_sandbox_window_navigation_pass.html
rename : content/html/content/test/file_iframe_sandbox_window_top_navigation_fail.html => dom/html/test/file_iframe_sandbox_window_top_navigation_fail.html
rename : content/html/content/test/file_iframe_sandbox_window_top_navigation_pass.html => dom/html/test/file_iframe_sandbox_window_top_navigation_pass.html
rename : content/html/content/test/file_iframe_sandbox_worker.js => dom/html/test/file_iframe_sandbox_worker.js
rename : content/html/content/test/file_ignoreuserfocus.html => dom/html/test/file_ignoreuserfocus.html
rename : content/html/content/test/file_imports_basics.html => dom/html/test/file_imports_basics.html
rename : content/html/content/test/file_imports_redirect.html => dom/html/test/file_imports_redirect.html
rename : content/html/content/test/file_imports_redirect.html^headers^ => dom/html/test/file_imports_redirect.html^headers^
rename : content/html/content/test/file_imports_redirected.html => dom/html/test/file_imports_redirected.html
rename : content/html/content/test/file_srcdoc-2.html => dom/html/test/file_srcdoc-2.html
rename : content/html/content/test/file_srcdoc.html => dom/html/test/file_srcdoc.html
rename : content/html/content/test/form_submit_server.sjs => dom/html/test/form_submit_server.sjs
rename : content/html/content/test/forms/chrome.ini => dom/html/test/forms/chrome.ini
rename : content/html/content/test/forms/mochitest.ini => dom/html/test/forms/mochitest.ini
rename : content/html/content/test/forms/save_restore_radio_groups.sjs => dom/html/test/forms/save_restore_radio_groups.sjs
rename : content/html/content/test/forms/submit_invalid_file.sjs => dom/html/test/forms/submit_invalid_file.sjs
rename : content/html/content/test/forms/test_autocompleteinfo.html => dom/html/test/forms/test_autocompleteinfo.html
rename : content/html/content/test/forms/test_bug1039548.html => dom/html/test/forms/test_bug1039548.html
rename : content/html/content/test/forms/test_button_attributes_reflection.html => dom/html/test/forms/test_button_attributes_reflection.html
rename : content/html/content/test/forms/test_change_event.html => dom/html/test/forms/test_change_event.html
rename : content/html/content/test/forms/test_datalist_element.html => dom/html/test/forms/test_datalist_element.html
rename : content/html/content/test/forms/test_experimental_forms_pref.html => dom/html/test/forms/test_experimental_forms_pref.html
rename : content/html/content/test/forms/test_form_attribute-1.html => dom/html/test/forms/test_form_attribute-1.html
rename : content/html/content/test/forms/test_form_attribute-2.html => dom/html/test/forms/test_form_attribute-2.html
rename : content/html/content/test/forms/test_form_attribute-3.html => dom/html/test/forms/test_form_attribute-3.html
rename : content/html/content/test/forms/test_form_attribute-4.html => dom/html/test/forms/test_form_attribute-4.html
rename : content/html/content/test/forms/test_form_attributes_reflection.html => dom/html/test/forms/test_form_attributes_reflection.html
rename : content/html/content/test/forms/test_form_named_getter_dynamic.html => dom/html/test/forms/test_form_named_getter_dynamic.html
rename : content/html/content/test/forms/test_formaction_attribute.html => dom/html/test/forms/test_formaction_attribute.html
rename : content/html/content/test/forms/test_formnovalidate_attribute.html => dom/html/test/forms/test_formnovalidate_attribute.html
rename : content/html/content/test/forms/test_input_attributes_reflection.html => dom/html/test/forms/test_input_attributes_reflection.html
rename : content/html/content/test/forms/test_input_autocomplete.html => dom/html/test/forms/test_input_autocomplete.html
rename : content/html/content/test/forms/test_input_color_input_change_events.html => dom/html/test/forms/test_input_color_input_change_events.html
rename : content/html/content/test/forms/test_input_color_picker_initial.html => dom/html/test/forms/test_input_color_picker_initial.html
rename : content/html/content/test/forms/test_input_color_picker_popup.html => dom/html/test/forms/test_input_color_picker_popup.html
rename : content/html/content/test/forms/test_input_color_picker_update.html => dom/html/test/forms/test_input_color_picker_update.html
rename : content/html/content/test/forms/test_input_defaultValue.html => dom/html/test/forms/test_input_defaultValue.html
rename : content/html/content/test/forms/test_input_email.html => dom/html/test/forms/test_input_email.html
rename : content/html/content/test/forms/test_input_event.html => dom/html/test/forms/test_input_event.html
rename : content/html/content/test/forms/test_input_file_picker.html => dom/html/test/forms/test_input_file_picker.html
rename : content/html/content/test/forms/test_input_list_attribute.html => dom/html/test/forms/test_input_list_attribute.html
rename : content/html/content/test/forms/test_input_number_data.js => dom/html/test/forms/test_input_number_data.js
rename : content/html/content/test/forms/test_input_number_key_events.html => dom/html/test/forms/test_input_number_key_events.html
rename : content/html/content/test/forms/test_input_number_l10n.html => dom/html/test/forms/test_input_number_l10n.html
rename : content/html/content/test/forms/test_input_number_mouse_events.html => dom/html/test/forms/test_input_number_mouse_events.html
rename : content/html/content/test/forms/test_input_number_rounding.html => dom/html/test/forms/test_input_number_rounding.html
rename : content/html/content/test/forms/test_input_number_validation.html => dom/html/test/forms/test_input_number_validation.html
rename : content/html/content/test/forms/test_input_radio_radiogroup.html => dom/html/test/forms/test_input_radio_radiogroup.html
rename : content/html/content/test/forms/test_input_range_attr_order.html => dom/html/test/forms/test_input_range_attr_order.html
rename : content/html/content/test/forms/test_input_range_key_events.html => dom/html/test/forms/test_input_range_key_events.html
rename : content/html/content/test/forms/test_input_range_mouse_and_touch_events.html => dom/html/test/forms/test_input_range_mouse_and_touch_events.html
rename : content/html/content/test/forms/test_input_range_rounding.html => dom/html/test/forms/test_input_range_rounding.html
rename : content/html/content/test/forms/test_input_sanitization.html => dom/html/test/forms/test_input_sanitization.html
rename : content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html => dom/html/test/forms/test_input_textarea_set_value_no_scroll.html
rename : content/html/content/test/forms/test_input_typing_sanitization.html => dom/html/test/forms/test_input_typing_sanitization.html
rename : content/html/content/test/forms/test_input_untrusted_key_events.html => dom/html/test/forms/test_input_untrusted_key_events.html
rename : content/html/content/test/forms/test_input_url.html => dom/html/test/forms/test_input_url.html
rename : content/html/content/test/forms/test_label_control_attribute.html => dom/html/test/forms/test_label_control_attribute.html
rename : content/html/content/test/forms/test_label_input_controls.html => dom/html/test/forms/test_label_input_controls.html
rename : content/html/content/test/forms/test_max_attribute.html => dom/html/test/forms/test_max_attribute.html
rename : content/html/content/test/forms/test_maxlength_attribute.html => dom/html/test/forms/test_maxlength_attribute.html
rename : content/html/content/test/forms/test_meter_element.html => dom/html/test/forms/test_meter_element.html
rename : content/html/content/test/forms/test_meter_pseudo-classes.html => dom/html/test/forms/test_meter_pseudo-classes.html
rename : content/html/content/test/forms/test_min_attribute.html => dom/html/test/forms/test_min_attribute.html
rename : content/html/content/test/forms/test_mozistextfield.html => dom/html/test/forms/test_mozistextfield.html
rename : content/html/content/test/forms/test_novalidate_attribute.html => dom/html/test/forms/test_novalidate_attribute.html
rename : content/html/content/test/forms/test_option_disabled.html => dom/html/test/forms/test_option_disabled.html
rename : content/html/content/test/forms/test_option_index_attribute.html => dom/html/test/forms/test_option_index_attribute.html
rename : content/html/content/test/forms/test_option_text.html => dom/html/test/forms/test_option_text.html
rename : content/html/content/test/forms/test_output_element.html => dom/html/test/forms/test_output_element.html
rename : content/html/content/test/forms/test_pattern_attribute.html => dom/html/test/forms/test_pattern_attribute.html
rename : content/html/content/test/forms/test_progress_element.html => dom/html/test/forms/test_progress_element.html
rename : content/html/content/test/forms/test_radio_radionodelist.html => dom/html/test/forms/test_radio_radionodelist.html
rename : content/html/content/test/forms/test_required_attribute.html => dom/html/test/forms/test_required_attribute.html
rename : content/html/content/test/forms/test_restore_form_elements.html => dom/html/test/forms/test_restore_form_elements.html
rename : content/html/content/test/forms/test_save_restore_radio_groups.html => dom/html/test/forms/test_save_restore_radio_groups.html
rename : content/html/content/test/forms/test_select_selectedOptions.html => dom/html/test/forms/test_select_selectedOptions.html
rename : content/html/content/test/forms/test_select_validation.html => dom/html/test/forms/test_select_validation.html
rename : content/html/content/test/forms/test_set_range_text.html => dom/html/test/forms/test_set_range_text.html
rename : content/html/content/test/forms/test_step_attribute.html => dom/html/test/forms/test_step_attribute.html
rename : content/html/content/test/forms/test_stepup_stepdown.html => dom/html/test/forms/test_stepup_stepdown.html
rename : content/html/content/test/forms/test_submit_invalid_file.html => dom/html/test/forms/test_submit_invalid_file.html
rename : content/html/content/test/forms/test_textarea_attributes_reflection.html => dom/html/test/forms/test_textarea_attributes_reflection.html
rename : content/html/content/test/forms/test_validation.html => dom/html/test/forms/test_validation.html
rename : content/html/content/test/forms/test_validation_not_in_doc.html => dom/html/test/forms/test_validation_not_in_doc.html
rename : content/html/content/test/forms/test_valueAsDate_pref.html => dom/html/test/forms/test_valueAsDate_pref.html
rename : content/html/content/test/forms/test_valueasdate_attribute.html => dom/html/test/forms/test_valueasdate_attribute.html
rename : content/html/content/test/forms/test_valueasnumber_attribute.html => dom/html/test/forms/test_valueasnumber_attribute.html
rename : content/html/content/test/image-allow-credentials.png => dom/html/test/image-allow-credentials.png
rename : content/html/content/test/image-allow-credentials.png^headers^ => dom/html/test/image-allow-credentials.png^headers^
rename : content/html/content/test/image.png => dom/html/test/image.png
rename : content/html/content/test/imports/file_cycle_1_A.html => dom/html/test/imports/file_cycle_1_A.html
rename : content/html/content/test/imports/file_cycle_1_B.html => dom/html/test/imports/file_cycle_1_B.html
rename : content/html/content/test/imports/file_cycle_1_C.html => dom/html/test/imports/file_cycle_1_C.html
rename : content/html/content/test/imports/file_cycle_2_A.html => dom/html/test/imports/file_cycle_2_A.html
rename : content/html/content/test/imports/file_cycle_2_B.html => dom/html/test/imports/file_cycle_2_B.html
rename : content/html/content/test/imports/file_cycle_2_C.html => dom/html/test/imports/file_cycle_2_C.html
rename : content/html/content/test/imports/file_cycle_2_D.html => dom/html/test/imports/file_cycle_2_D.html
rename : content/html/content/test/imports/file_cycle_3_A.html => dom/html/test/imports/file_cycle_3_A.html
rename : content/html/content/test/imports/file_cycle_3_B.html => dom/html/test/imports/file_cycle_3_B.html
rename : content/html/content/test/imports/file_cycle_3_C.html => dom/html/test/imports/file_cycle_3_C.html
rename : content/html/content/test/imports/file_cycle_4_A.html => dom/html/test/imports/file_cycle_4_A.html
rename : content/html/content/test/imports/file_cycle_4_B.html => dom/html/test/imports/file_cycle_4_B.html
rename : content/html/content/test/imports/file_cycle_4_C.html => dom/html/test/imports/file_cycle_4_C.html
rename : content/html/content/test/imports/file_cycle_4_D.html => dom/html/test/imports/file_cycle_4_D.html
rename : content/html/content/test/imports/file_cycle_4_E.html => dom/html/test/imports/file_cycle_4_E.html
rename : content/html/content/test/imports/file_cycle_5_A.html => dom/html/test/imports/file_cycle_5_A.html
rename : content/html/content/test/imports/file_cycle_5_B.html => dom/html/test/imports/file_cycle_5_B.html
rename : content/html/content/test/imports/file_cycle_5_C.html => dom/html/test/imports/file_cycle_5_C.html
rename : content/html/content/test/imports/file_cycle_5_D.html => dom/html/test/imports/file_cycle_5_D.html
rename : content/html/content/test/imports/file_encoding.html => dom/html/test/imports/file_encoding.html
rename : content/html/content/test/imports/file_importA1.html => dom/html/test/imports/file_importA1.html
rename : content/html/content/test/imports/file_importA2.html => dom/html/test/imports/file_importA2.html
rename : content/html/content/test/imports/file_importB1.html => dom/html/test/imports/file_importB1.html
rename : content/html/content/test/imports/file_importB2.html => dom/html/test/imports/file_importB2.html
rename : content/html/content/test/imports/file_importC1.html => dom/html/test/imports/file_importC1.html
rename : content/html/content/test/imports/file_importC10.html => dom/html/test/imports/file_importC10.html
rename : content/html/content/test/imports/file_importC2.html => dom/html/test/imports/file_importC2.html
rename : content/html/content/test/imports/file_importC3.html => dom/html/test/imports/file_importC3.html
rename : content/html/content/test/imports/file_importC4.html => dom/html/test/imports/file_importC4.html
rename : content/html/content/test/imports/file_importC5.html => dom/html/test/imports/file_importC5.html
rename : content/html/content/test/imports/file_importC6.html => dom/html/test/imports/file_importC6.html
rename : content/html/content/test/imports/file_importC7.html => dom/html/test/imports/file_importC7.html
rename : content/html/content/test/imports/file_importC8.html => dom/html/test/imports/file_importC8.html
rename : content/html/content/test/imports/file_importC9.html => dom/html/test/imports/file_importC9.html
rename : content/html/content/test/imports/file_importD.html => dom/html/test/imports/file_importD.html
rename : content/html/content/test/imports/file_importE.html => dom/html/test/imports/file_importE.html
rename : content/html/content/test/imports/mochitest.ini => dom/html/test/imports/mochitest.ini
rename : content/html/content/test/imports/test_cycle_1.html => dom/html/test/imports/test_cycle_1.html
rename : content/html/content/test/imports/test_cycle_2.html => dom/html/test/imports/test_cycle_2.html
rename : content/html/content/test/imports/test_cycle_3.html => dom/html/test/imports/test_cycle_3.html
rename : content/html/content/test/imports/test_cycle_4.html => dom/html/test/imports/test_cycle_4.html
rename : content/html/content/test/imports/test_cycle_5.html => dom/html/test/imports/test_cycle_5.html
rename : content/html/content/test/imports/test_encoding.html => dom/html/test/imports/test_encoding.html
rename : content/html/content/test/mochitest.ini => dom/html/test/mochitest.ini
rename : content/html/content/test/nnc_lockup.gif => dom/html/test/nnc_lockup.gif
rename : content/html/content/test/reflect.js => dom/html/test/reflect.js
rename : content/html/content/test/test_a_text.html => dom/html/test/test_a_text.html
rename : content/html/content/test/test_allowMedia.html => dom/html/test/test_allowMedia.html
rename : content/html/content/test/test_anchor_href_cache_invalidation.html => dom/html/test/test_anchor_href_cache_invalidation.html
rename : content/html/content/test/test_anchor_ping.html => dom/html/test/test_anchor_ping.html
rename : content/html/content/test/test_applet_attributes_reflection.html => dom/html/test/test_applet_attributes_reflection.html
rename : content/html/content/test/test_audio_wakelock.html => dom/html/test/test_audio_wakelock.html
rename : content/html/content/test/test_base_attributes_reflection.html => dom/html/test/test_base_attributes_reflection.html
rename : content/html/content/test/test_bug1003539.html => dom/html/test/test_bug1003539.html
rename : content/html/content/test/test_bug100533.html => dom/html/test/test_bug100533.html
rename : content/html/document/test/test_bug1013316.html => dom/html/test/test_bug1013316.html
rename : content/html/content/test/test_bug1045270.html => dom/html/test/test_bug1045270.html
rename : content/html/content/test/test_bug109445.html => dom/html/test/test_bug109445.html
rename : content/html/content/test/test_bug109445.xhtml => dom/html/test/test_bug109445.xhtml
rename : content/html/content/test/test_bug1297.html => dom/html/test/test_bug1297.html
rename : content/html/content/test/test_bug1366.html => dom/html/test/test_bug1366.html
rename : content/html/content/test/test_bug1400.html => dom/html/test/test_bug1400.html
rename : content/html/content/test/test_bug143220.html => dom/html/test/test_bug143220.html
rename : content/html/document/test/test_bug1682.html => dom/html/test/test_bug1682.html
rename : content/html/document/test/test_bug172261.html => dom/html/test/test_bug172261.html
rename : content/html/content/test/test_bug182279.html => dom/html/test/test_bug182279.html
rename : content/html/document/test/test_bug1823.html => dom/html/test/test_bug1823.html
rename : content/html/document/test/test_bug196523.html => dom/html/test/test_bug196523.html
rename : content/html/document/test/test_bug199692.html => dom/html/test/test_bug199692.html
rename : content/html/content/test/test_bug2082.html => dom/html/test/test_bug2082.html
rename : content/html/content/test/test_bug209275.xhtml => dom/html/test/test_bug209275.xhtml
rename : content/html/content/test/test_bug237071.html => dom/html/test/test_bug237071.html
rename : content/html/content/test/test_bug242709.html => dom/html/test/test_bug242709.html
rename : content/html/content/test/test_bug24958.html => dom/html/test/test_bug24958.html
rename : content/html/document/test/test_bug255820.html => dom/html/test/test_bug255820.html
rename : content/html/document/test/test_bug259332.html => dom/html/test/test_bug259332.html
rename : content/html/content/test/test_bug274626.html => dom/html/test/test_bug274626.html
rename : content/html/content/test/test_bug277724.html => dom/html/test/test_bug277724.html
rename : content/html/content/test/test_bug277890.html => dom/html/test/test_bug277890.html
rename : content/html/content/test/test_bug287465.html => dom/html/test/test_bug287465.html
rename : content/html/content/test/test_bug295561.html => dom/html/test/test_bug295561.html
rename : content/html/content/test/test_bug297761.html => dom/html/test/test_bug297761.html
rename : content/html/content/test/test_bug300691-1.html => dom/html/test/test_bug300691-1.html
rename : content/html/content/test/test_bug300691-2.html => dom/html/test/test_bug300691-2.html
rename : content/html/content/test/test_bug300691-3.xhtml => dom/html/test/test_bug300691-3.xhtml
rename : content/html/document/test/test_bug311681.html => dom/html/test/test_bug311681.html
rename : content/html/document/test/test_bug311681.xhtml => dom/html/test/test_bug311681.xhtml
rename : content/html/document/test/test_bug324378.html => dom/html/test/test_bug324378.html
rename : content/html/content/test/test_bug330705-1.html => dom/html/test/test_bug330705-1.html
rename : content/html/content/test/test_bug332246.html => dom/html/test/test_bug332246.html
rename : content/html/document/test/test_bug332848.xhtml => dom/html/test/test_bug332848.xhtml
rename : content/html/content/test/test_bug332893-1.html => dom/html/test/test_bug332893-1.html
rename : content/html/content/test/test_bug332893-2.html => dom/html/test/test_bug332893-2.html
rename : content/html/content/test/test_bug332893-3.html => dom/html/test/test_bug332893-3.html
rename : content/html/content/test/test_bug332893-4.html => dom/html/test/test_bug332893-4.html
rename : content/html/content/test/test_bug332893-5.html => dom/html/test/test_bug332893-5.html
rename : content/html/content/test/test_bug332893-6.html => dom/html/test/test_bug332893-6.html
rename : content/html/content/test/test_bug332893-7.html => dom/html/test/test_bug332893-7.html
rename : content/html/content/test/test_bug3348.html => dom/html/test/test_bug3348.html
rename : content/html/document/test/test_bug340017.xhtml => dom/html/test/test_bug340017.xhtml
rename : content/html/content/test/test_bug340800.html => dom/html/test/test_bug340800.html
rename : content/html/content/test/test_bug347174.html => dom/html/test/test_bug347174.html
rename : content/html/content/test/test_bug347174_write.html => dom/html/test/test_bug347174_write.html
rename : content/html/content/test/test_bug347174_xsl.html => dom/html/test/test_bug347174_xsl.html
rename : content/html/content/test/test_bug347174_xslp.html => dom/html/test/test_bug347174_xslp.html
rename : content/html/content/test/test_bug353415-1.html => dom/html/test/test_bug353415-1.html
rename : content/html/content/test/test_bug353415-2.html => dom/html/test/test_bug353415-2.html
rename : content/html/document/test/test_bug359657.html => dom/html/test/test_bug359657.html
rename : content/html/document/test/test_bug369370.html => dom/html/test/test_bug369370.html
rename : content/html/content/test/test_bug371375.html => dom/html/test/test_bug371375.html
rename : content/html/content/test/test_bug372098.html => dom/html/test/test_bug372098.html
rename : content/html/content/test/test_bug373589.html => dom/html/test/test_bug373589.html
rename : content/html/content/test/test_bug375003-1.html => dom/html/test/test_bug375003-1.html
rename : content/html/content/test/test_bug375003-2.html => dom/html/test/test_bug375003-2.html
rename : content/html/content/test/test_bug377624.html => dom/html/test/test_bug377624.html
rename : content/html/document/test/test_bug380383.html => dom/html/test/test_bug380383.html
rename : content/html/content/test/test_bug383383.html => dom/html/test/test_bug383383.html
rename : content/html/content/test/test_bug383383_2.xhtml => dom/html/test/test_bug383383_2.xhtml
rename : content/html/content/test/test_bug384419.html => dom/html/test/test_bug384419.html
rename : content/html/content/test/test_bug386496.html => dom/html/test/test_bug386496.html
rename : content/html/content/test/test_bug386728.html => dom/html/test/test_bug386728.html
rename : content/html/content/test/test_bug386996.html => dom/html/test/test_bug386996.html
rename : content/html/content/test/test_bug388558.html => dom/html/test/test_bug388558.html
rename : content/html/content/test/test_bug388746.html => dom/html/test/test_bug388746.html
rename : content/html/content/test/test_bug388794.html => dom/html/test/test_bug388794.html
rename : content/html/content/test/test_bug389797.html => dom/html/test/test_bug389797.html
rename : content/html/content/test/test_bug390975.html => dom/html/test/test_bug390975.html
rename : content/html/document/test/test_bug391777.html => dom/html/test/test_bug391777.html
rename : content/html/content/test/test_bug391994.html => dom/html/test/test_bug391994.html
rename : content/html/content/test/test_bug392567.html => dom/html/test/test_bug392567.html
rename : content/html/content/test/test_bug394700.html => dom/html/test/test_bug394700.html
rename : content/html/content/test/test_bug395107.html => dom/html/test/test_bug395107.html
rename : content/html/content/test/test_bug401160.xhtml => dom/html/test/test_bug401160.xhtml
rename : content/html/document/test/test_bug402680.html => dom/html/test/test_bug402680.html
rename : content/html/document/test/test_bug403868.html => dom/html/test/test_bug403868.html
rename : content/html/document/test/test_bug403868.xhtml => dom/html/test/test_bug403868.xhtml
rename : content/html/content/test/test_bug405242.html => dom/html/test/test_bug405242.html
rename : content/html/content/test/test_bug406596.html => dom/html/test/test_bug406596.html
rename : content/html/content/test/test_bug417760.html => dom/html/test/test_bug417760.html
rename : content/html/content/test/test_bug421640.html => dom/html/test/test_bug421640.html
rename : content/html/content/test/test_bug424698.html => dom/html/test/test_bug424698.html
rename : content/html/content/test/test_bug428135.xhtml => dom/html/test/test_bug428135.xhtml
rename : content/html/content/test/test_bug430351.html => dom/html/test/test_bug430351.html
rename : content/html/content/test/test_bug430392.html => dom/html/test/test_bug430392.html
rename : content/html/document/test/test_bug435128.html => dom/html/test/test_bug435128.html
rename : content/html/content/test/test_bug441930.html => dom/html/test/test_bug441930.html
rename : content/html/content/test/test_bug442801.html => dom/html/test/test_bug442801.html
rename : content/html/document/test/test_bug445004.html => dom/html/test/test_bug445004.html
rename : content/html/document/test/test_bug446483.html => dom/html/test/test_bug446483.html
rename : content/html/content/test/test_bug448166.html => dom/html/test/test_bug448166.html
rename : content/html/document/test/test_bug448564.html => dom/html/test/test_bug448564.html
rename : content/html/content/test/test_bug456229.html => dom/html/test/test_bug456229.html
rename : content/html/content/test/test_bug458037.xhtml => dom/html/test/test_bug458037.xhtml
rename : content/html/content/test/test_bug460568.html => dom/html/test/test_bug460568.html
rename : content/html/document/test/test_bug463104.html => dom/html/test/test_bug463104.html
rename : content/html/document/test/test_bug478251.html => dom/html/test/test_bug478251.html
rename : content/html/content/test/test_bug481335.xhtml => dom/html/test/test_bug481335.xhtml
rename : content/html/document/test/test_bug481440.html => dom/html/test/test_bug481440.html
rename : content/html/document/test/test_bug481647.html => dom/html/test/test_bug481647.html
rename : content/html/document/test/test_bug482659.html => dom/html/test/test_bug482659.html
rename : content/html/document/test/test_bug486741.html => dom/html/test/test_bug486741.html
rename : content/html/document/test/test_bug489532.html => dom/html/test/test_bug489532.html
rename : content/html/document/test/test_bug497242.xhtml => dom/html/test/test_bug497242.xhtml
rename : content/html/document/test/test_bug499092.html => dom/html/test/test_bug499092.html
rename : content/html/content/test/test_bug500885.html => dom/html/test/test_bug500885.html
rename : content/html/document/test/test_bug512367.html => dom/html/test/test_bug512367.html
rename : content/html/content/test/test_bug514856.html => dom/html/test/test_bug514856.html
rename : content/html/content/test/test_bug518122.html => dom/html/test/test_bug518122.html
rename : content/html/content/test/test_bug519987.html => dom/html/test/test_bug519987.html
rename : content/html/content/test/test_bug523771.html => dom/html/test/test_bug523771.html
rename : content/html/content/test/test_bug529819.html => dom/html/test/test_bug529819.html
rename : content/html/content/test/test_bug529859.html => dom/html/test/test_bug529859.html
rename : content/html/content/test/test_bug535043.html => dom/html/test/test_bug535043.html
rename : content/html/content/test/test_bug536891.html => dom/html/test/test_bug536891.html
rename : content/html/content/test/test_bug536895.html => dom/html/test/test_bug536895.html
rename : content/html/content/test/test_bug546995.html => dom/html/test/test_bug546995.html
rename : content/html/content/test/test_bug547850.html => dom/html/test/test_bug547850.html
rename : content/html/content/test/test_bug551846.html => dom/html/test/test_bug551846.html
rename : content/html/content/test/test_bug555567.html => dom/html/test/test_bug555567.html
rename : content/html/content/test/test_bug556645.html => dom/html/test/test_bug556645.html
rename : content/html/content/test/test_bug557087-1.html => dom/html/test/test_bug557087-1.html
rename : content/html/content/test/test_bug557087-2.html => dom/html/test/test_bug557087-2.html
rename : content/html/content/test/test_bug557087-3.html => dom/html/test/test_bug557087-3.html
rename : content/html/content/test/test_bug557087-4.html => dom/html/test/test_bug557087-4.html
rename : content/html/content/test/test_bug557087-5.html => dom/html/test/test_bug557087-5.html
rename : content/html/content/test/test_bug557087-6.html => dom/html/test/test_bug557087-6.html
rename : content/html/content/test/test_bug557620.html => dom/html/test/test_bug557620.html
rename : content/html/content/test/test_bug558788-1.html => dom/html/test/test_bug558788-1.html
rename : content/html/content/test/test_bug558788-2.html => dom/html/test/test_bug558788-2.html
rename : content/html/content/test/test_bug560112.html => dom/html/test/test_bug560112.html
rename : content/html/content/test/test_bug561634.html => dom/html/test/test_bug561634.html
rename : content/html/content/test/test_bug561636.html => dom/html/test/test_bug561636.html
rename : content/html/content/test/test_bug561640.html => dom/html/test/test_bug561640.html
rename : content/html/content/test/test_bug564001.html => dom/html/test/test_bug564001.html
rename : content/html/content/test/test_bug566046.html => dom/html/test/test_bug566046.html
rename : content/html/content/test/test_bug567938-1.html => dom/html/test/test_bug567938-1.html
rename : content/html/content/test/test_bug567938-2.html => dom/html/test/test_bug567938-2.html
rename : content/html/content/test/test_bug567938-3.html => dom/html/test/test_bug567938-3.html
rename : content/html/content/test/test_bug567938-4.html => dom/html/test/test_bug567938-4.html
rename : content/html/content/test/test_bug569955.html => dom/html/test/test_bug569955.html
rename : content/html/content/test/test_bug573969.html => dom/html/test/test_bug573969.html
rename : content/html/document/test/test_bug57600.html => dom/html/test/test_bug57600.html
rename : content/html/content/test/test_bug579079.html => dom/html/test/test_bug579079.html
rename : content/html/content/test/test_bug582412-1.html => dom/html/test/test_bug582412-1.html
rename : content/html/content/test/test_bug582412-2.html => dom/html/test/test_bug582412-2.html
rename : content/html/content/test/test_bug583514.html => dom/html/test/test_bug583514.html
rename : content/html/content/test/test_bug583533.html => dom/html/test/test_bug583533.html
rename : content/html/content/test/test_bug586763.html => dom/html/test/test_bug586763.html
rename : content/html/content/test/test_bug586786.html => dom/html/test/test_bug586786.html
rename : content/html/content/test/test_bug587469.html => dom/html/test/test_bug587469.html
rename : content/html/content/test/test_bug589.html => dom/html/test/test_bug589.html
rename : content/html/content/test/test_bug590353-1.html => dom/html/test/test_bug590353-1.html
rename : content/html/content/test/test_bug590353-2.html => dom/html/test/test_bug590353-2.html
rename : content/html/content/test/test_bug590363.html => dom/html/test/test_bug590363.html
rename : content/html/content/test/test_bug592802.html => dom/html/test/test_bug592802.html
rename : content/html/content/test/test_bug593689.html => dom/html/test/test_bug593689.html
rename : content/html/content/test/test_bug595429.html => dom/html/test/test_bug595429.html
rename : content/html/content/test/test_bug595447.html => dom/html/test/test_bug595447.html
rename : content/html/content/test/test_bug595449.html => dom/html/test/test_bug595449.html
rename : content/html/content/test/test_bug596350.html => dom/html/test/test_bug596350.html
rename : content/html/content/test/test_bug596511.html => dom/html/test/test_bug596511.html
rename : content/html/content/test/test_bug598643.html => dom/html/test/test_bug598643.html
rename : content/html/content/test/test_bug598833-1.html => dom/html/test/test_bug598833-1.html
rename : content/html/content/test/test_bug600155.html => dom/html/test/test_bug600155.html
rename : content/html/content/test/test_bug601030.html => dom/html/test/test_bug601030.html
rename : content/html/content/test/test_bug605124-1.html => dom/html/test/test_bug605124-1.html
rename : content/html/content/test/test_bug605124-2.html => dom/html/test/test_bug605124-2.html
rename : content/html/content/test/test_bug605125-1.html => dom/html/test/test_bug605125-1.html
rename : content/html/content/test/test_bug605125-2.html => dom/html/test/test_bug605125-2.html
rename : content/html/content/test/test_bug606817.html => dom/html/test/test_bug606817.html
rename : content/html/content/test/test_bug607145.html => dom/html/test/test_bug607145.html
rename : content/html/content/test/test_bug610212.html => dom/html/test/test_bug610212.html
rename : content/html/content/test/test_bug610687.html => dom/html/test/test_bug610687.html
rename : content/html/content/test/test_bug611189.html => dom/html/test/test_bug611189.html
rename : content/html/content/test/test_bug612730.html => dom/html/test/test_bug612730.html
rename : content/html/content/test/test_bug613113.html => dom/html/test/test_bug613113.html
rename : content/html/content/test/test_bug613722.html => dom/html/test/test_bug613722.html
rename : content/html/content/test/test_bug613979.html => dom/html/test/test_bug613979.html
rename : content/html/content/test/test_bug615595.html => dom/html/test/test_bug615595.html
rename : content/html/content/test/test_bug615833.html => dom/html/test/test_bug615833.html
rename : content/html/content/test/test_bug617528.html => dom/html/test/test_bug617528.html
rename : content/html/content/test/test_bug618948.html => dom/html/test/test_bug618948.html
rename : content/html/content/test/test_bug619278.html => dom/html/test/test_bug619278.html
rename : content/html/content/test/test_bug622558.html => dom/html/test/test_bug622558.html
rename : content/html/content/test/test_bug622597.html => dom/html/test/test_bug622597.html
rename : content/html/content/test/test_bug623291.html => dom/html/test/test_bug623291.html
rename : content/html/content/test/test_bug6296.html => dom/html/test/test_bug6296.html
rename : content/html/content/test/test_bug629801.html => dom/html/test/test_bug629801.html
rename : content/html/content/test/test_bug633058.html => dom/html/test/test_bug633058.html
rename : content/html/content/test/test_bug636336.html => dom/html/test/test_bug636336.html
rename : content/html/content/test/test_bug641219.html => dom/html/test/test_bug641219.html
rename : content/html/content/test/test_bug643051.html => dom/html/test/test_bug643051.html
rename : content/html/content/test/test_bug646157.html => dom/html/test/test_bug646157.html
rename : content/html/content/test/test_bug649134.html => dom/html/test/test_bug649134.html
rename : content/html/content/test/test_bug651956.html => dom/html/test/test_bug651956.html
rename : content/html/content/test/test_bug658746.html => dom/html/test/test_bug658746.html
rename : content/html/content/test/test_bug659596.html => dom/html/test/test_bug659596.html
rename : content/html/content/test/test_bug659743.xml => dom/html/test/test_bug659743.xml
rename : content/html/content/test/test_bug660663.html => dom/html/test/test_bug660663.html
rename : content/html/content/test/test_bug660959-1.html => dom/html/test/test_bug660959-1.html
rename : content/html/content/test/test_bug660959-2.html => dom/html/test/test_bug660959-2.html
rename : content/html/content/test/test_bug660959-3.html => dom/html/test/test_bug660959-3.html
rename : content/html/content/test/test_bug666200.html => dom/html/test/test_bug666200.html
rename : content/html/content/test/test_bug666666.html => dom/html/test/test_bug666666.html
rename : content/html/content/test/test_bug669012.html => dom/html/test/test_bug669012.html
rename : content/html/content/test/test_bug674558.html => dom/html/test/test_bug674558.html
rename : content/html/content/test/test_bug674927.html => dom/html/test/test_bug674927.html
rename : content/html/content/test/test_bug677463.html => dom/html/test/test_bug677463.html
rename : content/html/document/test/test_bug677495-1.html => dom/html/test/test_bug677495-1.html
rename : content/html/document/test/test_bug677495.html => dom/html/test/test_bug677495.html
rename : content/html/content/test/test_bug677658.html => dom/html/test/test_bug677658.html
rename : content/html/content/test/test_bug682886.html => dom/html/test/test_bug682886.html
rename : content/html/content/test/test_bug691.html => dom/html/test/test_bug691.html
rename : content/html/content/test/test_bug694.html => dom/html/test/test_bug694.html
rename : content/html/content/test/test_bug694503.html => dom/html/test/test_bug694503.html
rename : content/html/content/test/test_bug696.html => dom/html/test/test_bug696.html
rename : content/html/content/test/test_bug717819.html => dom/html/test/test_bug717819.html
rename : content/html/document/test/test_bug741266.html => dom/html/test/test_bug741266.html
rename : content/html/content/test/test_bug742030.html => dom/html/test/test_bug742030.html
rename : content/html/content/test/test_bug742549.html => dom/html/test/test_bug742549.html
rename : content/html/content/test/test_bug745685.html => dom/html/test/test_bug745685.html
rename : content/html/content/test/test_bug763626.html => dom/html/test/test_bug763626.html
rename : content/html/document/test/test_bug765780.html => dom/html/test/test_bug765780.html
rename : content/html/content/test/test_bug780993.html => dom/html/test/test_bug780993.html
rename : content/html/content/test/test_bug787134.html => dom/html/test/test_bug787134.html
rename : content/html/content/test/test_bug797113.html => dom/html/test/test_bug797113.html
rename : content/html/content/test/test_bug803677.html => dom/html/test/test_bug803677.html
rename : content/html/content/test/test_bug821307.html => dom/html/test/test_bug821307.html
rename : content/html/content/test/test_bug827126.html => dom/html/test/test_bug827126.html
rename : content/html/content/test/test_bug827426.html => dom/html/test/test_bug827426.html
rename : content/html/content/test/test_bug838582.html => dom/html/test/test_bug838582.html
rename : content/html/content/test/test_bug839371.html => dom/html/test/test_bug839371.html
rename : content/html/content/test/test_bug839913.html => dom/html/test/test_bug839913.html
rename : content/html/content/test/test_bug840877.html => dom/html/test/test_bug840877.html
rename : content/html/content/test/test_bug841466.html => dom/html/test/test_bug841466.html
rename : content/html/content/test/test_bug845057.html => dom/html/test/test_bug845057.html
rename : content/html/content/test/test_bug869040.html => dom/html/test/test_bug869040.html
rename : content/html/content/test/test_bug870787.html => dom/html/test/test_bug870787.html
rename : content/html/document/test/test_bug871161.html => dom/html/test/test_bug871161.html
rename : content/html/content/test/test_bug874758.html => dom/html/test/test_bug874758.html
rename : content/html/content/test/test_bug879319.html => dom/html/test/test_bug879319.html
rename : content/html/content/test/test_bug885024.html => dom/html/test/test_bug885024.html
rename : content/html/content/test/test_bug893537.html => dom/html/test/test_bug893537.html
rename : content/html/content/test/test_bug95530.html => dom/html/test/test_bug95530.html
rename : content/html/content/test/test_bug969346.html => dom/html/test/test_bug969346.html
rename : content/html/content/test/test_bug982039.html => dom/html/test/test_bug982039.html
rename : content/html/content/test/test_change_crossorigin.html => dom/html/test/test_change_crossorigin.html
rename : content/html/content/test/test_checked.html => dom/html/test/test_checked.html
rename : content/html/content/test/test_dir_attributes_reflection.html => dom/html/test/test_dir_attributes_reflection.html
rename : content/html/content/test/test_dl_attributes_reflection.html => dom/html/test/test_dl_attributes_reflection.html
rename : content/html/document/test/test_document-element-inserted.html => dom/html/test/test_document-element-inserted.html
rename : content/html/document/test/test_document.watch.html => dom/html/test/test_document.watch.html
rename : content/html/document/test/test_documentAll.html => dom/html/test/test_documentAll.html
rename : content/html/content/test/test_element_prototype.html => dom/html/test/test_element_prototype.html
rename : content/html/content/test/test_embed_attributes_reflection.html => dom/html/test/test_embed_attributes_reflection.html
rename : content/html/document/test/test_form-parsing.html => dom/html/test/test_form-parsing.html
rename : content/html/content/test/test_formData.html => dom/html/test/test_formData.html
rename : content/html/content/test/test_formSubmission.html => dom/html/test/test_formSubmission.html
rename : content/html/content/test/test_formSubmission2.html => dom/html/test/test_formSubmission2.html
rename : content/html/content/test/test_formelements.html => dom/html/test/test_formelements.html
rename : content/html/content/test/test_fragment_form_pointer.html => dom/html/test/test_fragment_form_pointer.html
rename : content/html/content/test/test_fullscreen-api.html => dom/html/test/test_fullscreen-api.html
rename : content/html/content/test/test_hidden.html => dom/html/test/test_hidden.html
rename : content/html/content/test/test_html_attributes_reflection.html => dom/html/test/test_html_attributes_reflection.html
rename : content/html/content/test/test_htmlcollection.html => dom/html/test/test_htmlcollection.html
rename : content/html/content/test/test_iframe_sandbox_general.html => dom/html/test/test_iframe_sandbox_general.html
rename : content/html/content/test/test_iframe_sandbox_inheritance.html => dom/html/test/test_iframe_sandbox_inheritance.html
rename : content/html/content/test/test_iframe_sandbox_modal.html => dom/html/test/test_iframe_sandbox_modal.html
rename : content/html/content/test/test_iframe_sandbox_navigation.html => dom/html/test/test_iframe_sandbox_navigation.html
rename : content/html/content/test/test_iframe_sandbox_navigation2.html => dom/html/test/test_iframe_sandbox_navigation2.html
rename : content/html/content/test/test_iframe_sandbox_plugins.html => dom/html/test/test_iframe_sandbox_plugins.html
rename : content/html/content/test/test_iframe_sandbox_popups.html => dom/html/test/test_iframe_sandbox_popups.html
rename : content/html/content/test/test_iframe_sandbox_popups_inheritance.html => dom/html/test/test_iframe_sandbox_popups_inheritance.html
rename : content/html/content/test/test_iframe_sandbox_redirect.html => dom/html/test/test_iframe_sandbox_redirect.html
rename : content/html/content/test/test_iframe_sandbox_same_origin.html => dom/html/test/test_iframe_sandbox_same_origin.html
rename : content/html/content/test/test_iframe_sandbox_workers.html => dom/html/test/test_iframe_sandbox_workers.html
rename : content/html/content/test/test_ignoreuserfocus.html => dom/html/test/test_ignoreuserfocus.html
rename : content/html/content/test/test_imageSrcSet.html => dom/html/test/test_imageSrcSet.html
rename : content/html/content/test/test_img_attributes_reflection.html => dom/html/test/test_img_attributes_reflection.html
rename : content/html/content/test/test_imports_basics.html => dom/html/test/test_imports_basics.html
rename : content/html/content/test/test_imports_nested.html => dom/html/test/test_imports_nested.html
rename : content/html/content/test/test_imports_nested_2.html => dom/html/test/test_imports_nested_2.html
rename : content/html/content/test/test_imports_nonhttp.html => dom/html/test/test_imports_nonhttp.html
rename : content/html/content/test/test_imports_redirect.html => dom/html/test/test_imports_redirect.html
rename : content/html/content/test/test_input_files_not_nsIFile.html => dom/html/test/test_input_files_not_nsIFile.html
rename : content/html/content/test/test_li_attributes_reflection.html => dom/html/test/test_li_attributes_reflection.html
rename : content/html/content/test/test_link_attributes_reflection.html => dom/html/test/test_link_attributes_reflection.html
rename : content/html/content/test/test_link_sizes.html => dom/html/test/test_link_sizes.html
rename : content/html/content/test/test_map_attributes_reflection.html => dom/html/test/test_map_attributes_reflection.html
rename : content/html/content/test/test_meta_attributes_reflection.html => dom/html/test/test_meta_attributes_reflection.html
rename : content/html/content/test/test_mod_attributes_reflection.html => dom/html/test/test_mod_attributes_reflection.html
rename : content/html/content/test/test_mozaudiochannel.html => dom/html/test/test_mozaudiochannel.html
rename : content/html/content/test/test_named_options.html => dom/html/test/test_named_options.html
rename : content/html/content/test/test_nested_invalid_fieldsets.html => dom/html/test/test_nested_invalid_fieldsets.html
rename : content/html/document/test/test_non-ascii-cookie.html => dom/html/test/test_non-ascii-cookie.html
rename : content/html/document/test/test_non-ascii-cookie.html^headers^ => dom/html/test/test_non-ascii-cookie.html^headers^
rename : content/html/content/test/test_object_attributes_reflection.html => dom/html/test/test_object_attributes_reflection.html
rename : content/html/content/test/test_object_plugin_nav.html => dom/html/test/test_object_plugin_nav.html
rename : content/html/content/test/test_ol_attributes_reflection.html => dom/html/test/test_ol_attributes_reflection.html
rename : content/html/content/test/test_option_defaultSelected.html => dom/html/test/test_option_defaultSelected.html
rename : content/html/content/test/test_option_selected_state.html => dom/html/test/test_option_selected_state.html
rename : content/html/content/test/test_param_attributes_reflection.html => dom/html/test/test_param_attributes_reflection.html
rename : content/html/content/test/test_plugin.tst => dom/html/test/test_plugin.tst
rename : content/html/content/test/test_q_attributes_reflection.html => dom/html/test/test_q_attributes_reflection.html
rename : content/html/content/test/test_restore_from_parser_fragment.html => dom/html/test/test_restore_from_parser_fragment.html
rename : content/html/content/test/test_rowscollection.html => dom/html/test/test_rowscollection.html
rename : content/html/content/test/test_srcdoc-2.html => dom/html/test/test_srcdoc-2.html
rename : content/html/content/test/test_srcdoc.html => dom/html/test/test_srcdoc.html
rename : content/html/content/test/test_style_attributes_reflection.html => dom/html/test/test_style_attributes_reflection.html
rename : content/html/content/test/test_track.html => dom/html/test/test_track.html
rename : content/html/content/test/test_track_disabled.html => dom/html/test/test_track_disabled.html
rename : content/html/content/test/test_ul_attributes_reflection.html => dom/html/test/test_ul_attributes_reflection.html
rename : content/html/content/test/test_undoManager.html => dom/html/test/test_undoManager.html
rename : content/html/content/test/test_video_wakelock.html => dom/html/test/test_video_wakelock.html
rename : content/html/document/test/test_viewport.html => dom/html/test/test_viewport.html
rename : content/html/content/test/wakelock.ogg => dom/html/test/wakelock.ogg
rename : content/html/content/test/wakelock.ogv => dom/html/test/wakelock.ogv
---
 b2g/installer/package-manifest.in             |   1 -
 browser/installer/package-manifest.in         |   1 -
 content/base/src/moz.build                    |   3 +-
 content/base/test/fileutils.js                |   2 +-
 content/html/content/moz.build                |  20 -----
 content/html/content/public/moz.build         |  34 --------
 .../test/file_imports_redirect.html^headers^  |   2 -
 .../html/document/crashtests/crashtests.list  |  16 ----
 content/html/document/moz.build               |  10 ---
 content/html/document/public/moz.build        |  12 ---
 content/html/document/reftests/reftests.list  |  12 ---
 content/html/document/src/moz.build           |  43 ---------
 content/html/document/test/browser.ini        |   5 --
 content/html/document/test/mochitest.ini      |  82 ------------------
 content/html/moz.build                        |   7 --
 content/moz.build                             |   1 -
 dom/base/moz.build                            |   2 +-
 dom/bindings/moz.build                        |   3 +-
 dom/browser-element/moz.build                 |   2 +-
 dom/canvas/moz.build                          |   2 +-
 dom/events/moz.build                          |   2 +-
 .../src => dom/html}/HTMLAllCollection.cpp    |   0
 .../src => dom/html}/HTMLAllCollection.h      |   0
 .../src => dom/html}/HTMLAnchorElement.cpp    |   0
 .../src => dom/html}/HTMLAnchorElement.h      |   0
 .../src => dom/html}/HTMLAreaElement.cpp      |   0
 .../src => dom/html}/HTMLAreaElement.h        |   0
 .../src => dom/html}/HTMLAudioElement.cpp     |   0
 .../public => dom/html}/HTMLAudioElement.h    |   0
 .../src => dom/html}/HTMLBRElement.cpp        |   0
 .../content/src => dom/html}/HTMLBRElement.h  |   0
 .../src => dom/html}/HTMLBodyElement.cpp      |   0
 .../src => dom/html}/HTMLBodyElement.h        |   0
 .../src => dom/html}/HTMLButtonElement.cpp    |   0
 .../src => dom/html}/HTMLButtonElement.h      |   0
 .../src => dom/html}/HTMLCanvasElement.cpp    |   0
 .../public => dom/html}/HTMLCanvasElement.h   |   0
 .../src => dom/html}/HTMLContentElement.cpp   |   0
 .../src => dom/html}/HTMLContentElement.h     |   0
 .../src => dom/html}/HTMLDataElement.cpp      |   0
 .../src => dom/html}/HTMLDataElement.h        |   0
 .../src => dom/html}/HTMLDataListElement.cpp  |   0
 .../src => dom/html}/HTMLDataListElement.h    |   0
 .../src => dom/html}/HTMLDivElement.cpp       |   0
 .../content/src => dom/html}/HTMLDivElement.h |   0
 .../content/src => dom/html}/HTMLElement.cpp  |   0
 .../src => dom/html}/HTMLFieldSetElement.cpp  |   0
 .../src => dom/html}/HTMLFieldSetElement.h    |   0
 .../src => dom/html}/HTMLFontElement.cpp      |   0
 .../src => dom/html}/HTMLFontElement.h        |   0
 .../html}/HTMLFormControlsCollection.cpp      |   0
 .../html}/HTMLFormControlsCollection.h        |   0
 .../src => dom/html}/HTMLFormElement.cpp      |   0
 .../src => dom/html}/HTMLFormElement.h        |   0
 .../src => dom/html}/HTMLFrameElement.cpp     |   0
 .../src => dom/html}/HTMLFrameElement.h       |   0
 .../src => dom/html}/HTMLFrameSetElement.cpp  |   0
 .../src => dom/html}/HTMLFrameSetElement.h    |   0
 .../src => dom/html}/HTMLHRElement.cpp        |   0
 .../content/src => dom/html}/HTMLHRElement.h  |   0
 .../src => dom/html}/HTMLHeadingElement.cpp   |   0
 .../src => dom/html}/HTMLHeadingElement.h     |   0
 .../src => dom/html}/HTMLIFrameElement.cpp    |   0
 .../src => dom/html}/HTMLIFrameElement.h      |   0
 .../src => dom/html}/HTMLImageElement.cpp     |   0
 .../src => dom/html}/HTMLImageElement.h       |   0
 .../src => dom/html}/HTMLInputElement.cpp     |   0
 .../src => dom/html}/HTMLInputElement.h       |   0
 .../src => dom/html}/HTMLLIElement.cpp        |   0
 .../content/src => dom/html}/HTMLLIElement.h  |   0
 .../src => dom/html}/HTMLLabelElement.cpp     |   0
 .../src => dom/html}/HTMLLabelElement.h       |   0
 .../src => dom/html}/HTMLLegendElement.cpp    |   0
 .../src => dom/html}/HTMLLegendElement.h      |   0
 .../src => dom/html}/HTMLLinkElement.cpp      |   0
 .../src => dom/html}/HTMLLinkElement.h        |   0
 .../src => dom/html}/HTMLMapElement.cpp       |   0
 .../content/src => dom/html}/HTMLMapElement.h |   0
 .../src => dom/html}/HTMLMediaElement.cpp     |   0
 .../public => dom/html}/HTMLMediaElement.h    |   0
 .../src => dom/html}/HTMLMenuElement.cpp      |   0
 .../src => dom/html}/HTMLMenuElement.h        |   0
 .../src => dom/html}/HTMLMenuItemElement.cpp  |   0
 .../src => dom/html}/HTMLMenuItemElement.h    |   0
 .../src => dom/html}/HTMLMetaElement.cpp      |   0
 .../src => dom/html}/HTMLMetaElement.h        |   0
 .../src => dom/html}/HTMLMeterElement.cpp     |   0
 .../src => dom/html}/HTMLMeterElement.h       |   0
 .../src => dom/html}/HTMLModElement.cpp       |   0
 .../content/src => dom/html}/HTMLModElement.h |   0
 .../src => dom/html}/HTMLObjectElement.cpp    |   0
 .../src => dom/html}/HTMLObjectElement.h      |   0
 .../src => dom/html}/HTMLOptGroupElement.cpp  |   0
 .../src => dom/html}/HTMLOptGroupElement.h    |   0
 .../src => dom/html}/HTMLOptionElement.cpp    |   0
 .../src => dom/html}/HTMLOptionElement.h      |   0
 .../html}/HTMLOptionsCollection.cpp           |   0
 .../src => dom/html}/HTMLOptionsCollection.h  |   0
 .../src => dom/html}/HTMLOutputElement.cpp    |   0
 .../src => dom/html}/HTMLOutputElement.h      |   0
 .../src => dom/html}/HTMLParagraphElement.cpp |   0
 .../src => dom/html}/HTMLParagraphElement.h   |   0
 .../src => dom/html}/HTMLPictureElement.cpp   |   0
 .../src => dom/html}/HTMLPictureElement.h     |   0
 .../src => dom/html}/HTMLPreElement.cpp       |   0
 .../content/src => dom/html}/HTMLPreElement.h |   0
 .../src => dom/html}/HTMLProgressElement.cpp  |   0
 .../src => dom/html}/HTMLProgressElement.h    |   0
 .../html}/HTMLPropertiesCollection.cpp        |   0
 .../html}/HTMLPropertiesCollection.h          |   0
 .../src => dom/html}/HTMLScriptElement.cpp    |   0
 .../src => dom/html}/HTMLScriptElement.h      |   0
 .../src => dom/html}/HTMLSelectElement.cpp    |   0
 .../src => dom/html}/HTMLSelectElement.h      |   0
 .../src => dom/html}/HTMLShadowElement.cpp    |   0
 .../src => dom/html}/HTMLShadowElement.h      |   0
 .../src => dom/html}/HTMLSharedElement.cpp    |   0
 .../src => dom/html}/HTMLSharedElement.h      |   0
 .../html}/HTMLSharedListElement.cpp           |   0
 .../src => dom/html}/HTMLSharedListElement.h  |   0
 .../html}/HTMLSharedObjectElement.cpp         |   0
 .../html}/HTMLSharedObjectElement.h           |   0
 .../src => dom/html}/HTMLSourceElement.cpp    |   0
 .../src => dom/html}/HTMLSourceElement.h      |   0
 .../src => dom/html}/HTMLSpanElement.cpp      |   0
 .../src => dom/html}/HTMLSpanElement.h        |   0
 .../src => dom/html}/HTMLStyleElement.cpp     |   0
 .../src => dom/html}/HTMLStyleElement.h       |   0
 .../html}/HTMLTableCaptionElement.cpp         |   0
 .../html}/HTMLTableCaptionElement.h           |   0
 .../src => dom/html}/HTMLTableCellElement.cpp |   0
 .../src => dom/html}/HTMLTableCellElement.h   |   0
 .../src => dom/html}/HTMLTableColElement.cpp  |   0
 .../src => dom/html}/HTMLTableColElement.h    |   0
 .../src => dom/html}/HTMLTableElement.cpp     |   0
 .../src => dom/html}/HTMLTableElement.h       |   0
 .../src => dom/html}/HTMLTableRowElement.cpp  |   0
 .../src => dom/html}/HTMLTableRowElement.h    |   0
 .../html}/HTMLTableSectionElement.cpp         |   0
 .../html}/HTMLTableSectionElement.h           |   0
 .../src => dom/html}/HTMLTemplateElement.cpp  |   0
 .../src => dom/html}/HTMLTemplateElement.h    |   0
 .../src => dom/html}/HTMLTextAreaElement.cpp  |   0
 .../src => dom/html}/HTMLTextAreaElement.h    |   0
 .../src => dom/html}/HTMLTimeElement.cpp      |   0
 .../src => dom/html}/HTMLTimeElement.h        |   0
 .../src => dom/html}/HTMLTitleElement.cpp     |   0
 .../src => dom/html}/HTMLTitleElement.h       |   0
 .../src => dom/html}/HTMLTrackElement.cpp     |   0
 .../src => dom/html}/HTMLTrackElement.h       |   0
 .../src => dom/html}/HTMLUnknownElement.cpp   |   0
 .../src => dom/html}/HTMLUnknownElement.h     |   0
 .../src => dom/html}/HTMLVideoElement.cpp     |   0
 .../public => dom/html}/HTMLVideoElement.h    |   0
 .../src => dom/html}/ImageDocument.cpp        |   0
 .../document/src => dom/html}/ImageDocument.h |   0
 .../src => dom/html}/MediaDocument.cpp        |   0
 .../document/src => dom/html}/MediaDocument.h |   0
 .../content/src => dom/html}/MediaError.cpp   |   0
 .../content/src => dom/html}/MediaError.h     |   0
 .../src => dom/html}/PluginDocument.cpp       |   0
 .../src => dom/html}/RadioNodeList.cpp        |   0
 .../content/src => dom/html}/RadioNodeList.h  |   0
 .../src => dom/html}/TextTrackManager.cpp     |   0
 .../src => dom/html}/TextTrackManager.h       |   0
 .../content/src => dom/html}/TimeRanges.cpp   |   0
 .../content/src => dom/html}/TimeRanges.h     |   0
 .../content/src => dom/html}/UndoManager.cpp  |   0
 .../content/src => dom/html}/UndoManager.h    |   0
 .../src => dom/html}/ValidityState.cpp        |   0
 .../content/src => dom/html}/ValidityState.h  |   0
 .../src => dom/html}/VideoDocument.cpp        |   0
 .../html}/crashtests/1032654.html             |   0
 .../html}/crashtests/257818-1.html            |   0
 .../html}/crashtests/285166-1.html            |   0
 .../html}/crashtests/294235-1.html            |   0
 .../html}/crashtests/307616-1.html            |   0
 .../html}/crashtests/324918-1.xhtml           |   0
 .../html}/crashtests/338649-1.xhtml           |   0
 .../html}/crashtests/339501-1.xhtml           |   0
 .../html}/crashtests/339501-2.xhtml           |   0
 .../html}/crashtests/378993-1.xhtml           |   0
 .../html}/crashtests/382568-1-inner.xhtml     |   0
 .../html}/crashtests/382568-1.html            |   0
 .../html}/crashtests/383137.xhtml             |   0
 .../html}/crashtests/388183-1.html            |   0
 .../html}/crashtests/395340-1.html            |   0
 .../html}/crashtests/399694-1.html            |   0
 .../html}/crashtests/407053.html              |   0
 .../html}/crashtests/423371-1.html            |   0
 .../html}/crashtests/448564.html              |   0
 .../html}/crashtests/451123-1.html            |   0
 .../html}/crashtests/453406-1.html            |   0
 .../html}/crashtests/464197-1.html            |   0
 .../html}/crashtests/465466-1.xhtml           |   0
 .../html}/crashtests/468562-1.html            |   0
 .../html}/crashtests/468562-2.html            |   0
 .../html}/crashtests/494225.html              |   0
 .../html}/crashtests/495543.svg               |   0
 .../html}/crashtests/504183-1.html            |   0
 .../html}/crashtests/515829-1.html            |   0
 .../html}/crashtests/515829-2.html            |   0
 .../html}/crashtests/564461.xhtml             |   0
 .../html}/crashtests/570566-1.html            |   0
 .../html}/crashtests/571428-1.html            |   0
 .../html}/crashtests/580507-1.xhtml           |   0
 .../html}/crashtests/590387.html              |   0
 .../html}/crashtests/596785-1.html            |   0
 .../html}/crashtests/596785-2.html            |   0
 .../html}/crashtests/601422.html              |   0
 .../html}/crashtests/602117.html              |   0
 .../html}/crashtests/604807.html              |   0
 .../html}/crashtests/605264.html              |   0
 .../html}/crashtests/606430-1.html            |   0
 .../html}/crashtests/613027.html              |   0
 .../html}/crashtests/614279.html              |   0
 .../html}/crashtests/614988-1.html            |   0
 .../html}/crashtests/616401.html              |   0
 .../html}/crashtests/620078-1.html            |   0
 .../html}/crashtests/620078-2.html            |   0
 .../html}/crashtests/631421.html              |   0
 .../html}/crashtests/631421.png               | Bin
 .../html}/crashtests/673853.html              |   0
 .../html}/crashtests/680922-1.xul             |   0
 .../html}/crashtests/680922-binding.xml       |   0
 .../html}/crashtests/682058.xhtml             |   0
 .../html}/crashtests/682460.html              |   0
 .../html}/crashtests/68912-1.html             |   0
 .../html}/crashtests/738744.xhtml             |   0
 .../html}/crashtests/741218.json              |   0
 .../html}/crashtests/741218.json^headers^     |   0
 .../html}/crashtests/741250.xhtml             |   0
 .../html}/crashtests/795221-1.html            |   0
 .../html}/crashtests/795221-2.html            |   0
 .../html}/crashtests/795221-3.html            |   0
 .../html}/crashtests/795221-4.html            |   0
 .../html}/crashtests/795221-5.xml             |   0
 .../html}/crashtests/798802-1.html            |   0
 .../html}/crashtests/811226.html              |   0
 .../html}/crashtests/819745.html              |   0
 .../html}/crashtests/828180.html              |   0
 .../html}/crashtests/828472.html              |   0
 .../html}/crashtests/837033.html              |   0
 .../html}/crashtests/838256-1.html            |   0
 .../html}/crashtests/862084.html              |   0
 .../html}/crashtests/865147.html              |   0
 .../html}/crashtests/877910.html              |   0
 .../html}/crashtests/903106.html              |   0
 .../html}/crashtests/916322-1.html            |   0
 .../html}/crashtests/916322-2.html            |   0
 .../html}/crashtests/crashtests.list          |  24 ++++-
 .../html/content/src => dom/html}/moz.build   |  55 +++++++++++-
 .../src => dom/html}/nsDOMStringMap.cpp       |   0
 .../content/src => dom/html}/nsDOMStringMap.h |   0
 .../src => dom/html}/nsFormSubmission.cpp     |   0
 .../public => dom/html}/nsFormSubmission.h    |   0
 .../html}/nsFormSubmissionConstants.h         |   0
 .../src => dom/html}/nsGenericHTMLElement.cpp |   0
 .../src => dom/html}/nsGenericHTMLElement.h   |   0
 .../html}/nsGenericHTMLFrameElement.cpp       |   0
 .../html}/nsGenericHTMLFrameElement.h         |   0
 .../src => dom/html}/nsHTMLContentSink.cpp    |   0
 .../src => dom/html}/nsHTMLDNSPrefetch.cpp    |   0
 .../src => dom/html}/nsHTMLDNSPrefetch.h      |   0
 .../src => dom/html}/nsHTMLDocument.cpp       |   0
 .../src => dom/html}/nsHTMLDocument.h         |   0
 .../html}/nsIConstraintValidation.cpp         |   0
 .../html}/nsIConstraintValidation.h           |   0
 .../content/public => dom/html}/nsIForm.h     |   0
 .../public => dom/html}/nsIFormControl.h      |   0
 .../public => dom/html}/nsIFormProcessor.h    |   0
 .../html}/nsIFormSubmitObserver.idl           |   0
 .../public => dom/html}/nsIHTMLCollection.h   |   0
 .../src => dom/html}/nsIHTMLDocument.h        |   0
 .../public => dom/html}/nsIHTMLMenu.idl       |   0
 .../public => dom/html}/nsIImageDocument.idl  |   0
 .../public => dom/html}/nsIMenuBuilder.idl    |   0
 .../public => dom/html}/nsIPhonetic.idl       |   0
 .../html}/nsIRadioGroupContainer.h            |   0
 .../public => dom/html}/nsIRadioVisitor.h     |   0
 .../html}/nsITextControlElement.h             |   0
 .../src => dom/html}/nsRadioVisitor.cpp       |   0
 .../content/src => dom/html}/nsRadioVisitor.h |   0
 .../src => dom/html}/nsTextEditorState.cpp    |   0
 .../src => dom/html}/nsTextEditorState.h      |   0
 .../html}/reftests/41464-1-ref.html           |   0
 .../html}/reftests/41464-1a.html              |   0
 .../html}/reftests/41464-1b.html              |   0
 .../html}/reftests/468263-1a.html             |   0
 .../html}/reftests/468263-1b.html             |   0
 .../html}/reftests/468263-1c.html             |   0
 .../html}/reftests/468263-1d.html             |   0
 .../reftests/468263-2-alternate-ref.html      |   0
 .../html}/reftests/468263-2-ref.html          |   0
 .../html}/reftests/468263-2.html              |   0
 .../html}/reftests/484200-1-ref.html          |   0
 .../html}/reftests/484200-1.html              |   0
 .../html}/reftests/485377-ref.html            |   0
 .../content => dom/html}/reftests/485377.html |   0
 .../html}/reftests/52019-1-ref.html           |   0
 .../html}/reftests/52019-1.html               |   0
 .../html}/reftests/557840-ref.html            |   0
 .../content => dom/html}/reftests/557840.html |   0
 .../reftests/560059-video-dimensions-ref.html |   0
 .../reftests/560059-video-dimensions.html     |   0
 .../html}/reftests/573322-no-quirks-ref.html  |   0
 .../html}/reftests/573322-no-quirks.html      |   0
 .../html}/reftests/573322-quirks-ref.html     |   0
 .../html}/reftests/573322-quirks.html         |   0
 .../html}/reftests/596455-1a.html             |   0
 .../html}/reftests/596455-1b.html             |   0
 .../html}/reftests/596455-2a.html             |   0
 .../html}/reftests/596455-2b.html             |   0
 .../html}/reftests/596455-ref-1.html          |   0
 .../html}/reftests/596455-ref-2.html          |   0
 .../html}/reftests/610935-ref.html            |   0
 .../content => dom/html}/reftests/610935.html |   0
 .../html}/reftests/649134-1.html              |   0
 .../html}/reftests/649134-2-ref.html          |   0
 .../html}/reftests/649134-2.html              |   0
 .../html}/reftests/649134-ref.html            |   0
 .../autofocus-after-body-focus-ref.html       |   0
 .../autofocus/autofocus-after-body-focus.html |   0
 .../autofocus/autofocus-after-load-ref.html   |   0
 .../autofocus/autofocus-after-load.html       |   0
 .../autofocus-leaves-iframe-ref.html          |   0
 .../autofocus/autofocus-leaves-iframe.html    |   0
 .../reftests/autofocus/button-create.html     |   0
 .../html}/reftests/autofocus/button-load.html |   0
 .../html}/reftests/autofocus/button-ref.html  |   0
 .../reftests/autofocus/input-create.html      |   0
 .../html}/reftests/autofocus/input-load.html  |   0
 .../reftests/autofocus/input-number-ref.html  |   0
 .../reftests/autofocus/input-number.html      |   0
 .../html}/reftests/autofocus/input-ref.html   |   0
 .../html}/reftests/autofocus/reftest.list     |   0
 .../reftests/autofocus/select-create.html     |   0
 .../html}/reftests/autofocus/select-load.html |   0
 .../html}/reftests/autofocus/select-ref.html  |   0
 .../html}/reftests/autofocus/style.css        |   0
 .../reftests/autofocus/textarea-create.html   |   0
 .../reftests/autofocus/textarea-load.html     |   0
 .../reftests/autofocus/textarea-ref.html      |   0
 .../html}/reftests/bug448564-1_ideal.html     |   0
 .../html}/reftests/bug448564-1_malformed.html |   0
 .../reftests/bug448564-1_well-formed.html     |   0
 .../html}/reftests/bug448564-4a.html          |   0
 .../html}/reftests/bug448564-4b.html          |   0
 .../html}/reftests/bug448564_forms.css        |   0
 .../html}/reftests/bug502168-1_malformed.html |   0
 .../reftests/bug502168-1_well-formed.html     |   0
 .../html}/reftests/bug917595-1-ref.html       |   0
 .../html}/reftests/bug917595-exif-rotated.jpg | Bin
 .../html}/reftests/bug917595-iframe-1.html    |   0
 .../reftests/bug917595-pixel-rotated.jpg      | Bin
 .../html}/reftests/bug917595-unrotated.jpg    | Bin
 .../html}/reftests/figure-ref.html            |   0
 .../content => dom/html}/reftests/figure.html |   0
 .../href-attr-change-restyles-ref.html        |   0
 .../reftests/href-attr-change-restyles.html   |   0
 .../content => dom/html}/reftests/pass.png    | Bin
 .../html}/reftests/pre-1-ref.html             |   0
 .../content => dom/html}/reftests/pre-1.html  |   0
 .../html}/reftests/reftest.list               |  13 +++
 .../html}/reftests/table-border-1-ref.html    |   0
 .../html}/reftests/table-border-1.html        |   0
 .../html}/reftests/table-border-2-notref.html |   0
 .../html}/reftests/table-border-2-ref.html    |   0
 .../html}/reftests/table-border-2.html        |   0
 .../html}/reftests/toblob-todataurl/blob.js   |   0
 .../reftests/toblob-todataurl/dataurl.js      |   0
 .../toblob-todataurl/images/original.png      | Bin
 .../reftests/toblob-todataurl/images/q0.jpg   | Bin
 .../reftests/toblob-todataurl/images/q100.jpg | Bin
 .../reftests/toblob-todataurl/images/q25.jpg  | Bin
 .../reftests/toblob-todataurl/images/q50.jpg  | Bin
 .../reftests/toblob-todataurl/images/q75.jpg  | Bin
 .../reftests/toblob-todataurl/images/q92.jpg  | Bin
 .../toblob-todataurl/quality-0-ref.html       |   0
 .../toblob-todataurl/quality-100-ref.html     |   0
 .../toblob-todataurl/quality-25-ref.html      |   0
 .../toblob-todataurl/quality-50-ref.html      |   0
 .../toblob-todataurl/quality-75-ref.html      |   0
 .../toblob-todataurl/quality-92-ref.html      |   0
 .../reftests/toblob-todataurl/reftest.list    |   0
 .../html}/reftests/toblob-todataurl/sample.js |   0
 .../toblob-todataurl/toblob-quality-0.html    |   0
 .../toblob-todataurl/toblob-quality-100.html  |   0
 .../toblob-todataurl/toblob-quality-25.html   |   0
 .../toblob-todataurl/toblob-quality-50.html   |   0
 .../toblob-todataurl/toblob-quality-75.html   |   0
 .../toblob-todataurl/toblob-quality-92.html   |   0
 .../toblob-quality-default.html               |   0
 .../toblob-quality-undefined.html             |   0
 .../toblob-todataurl/todataurl-quality-0.html |   0
 .../todataurl-quality-100.html                |   0
 .../todataurl-quality-25.html                 |   0
 .../todataurl-quality-50.html                 |   0
 .../todataurl-quality-75.html                 |   0
 .../todataurl-quality-92.html                 |   0
 .../todataurl-quality-default.html            |   0
 .../todataurl-quality-undefined.html          |   0
 .../html}/test/347174transform.xsl            |   0
 .../html}/test/347174transformable.xml        |   0
 .../content => dom/html}/test/allowMedia.sjs  |   0
 .../content => dom/html}/test/browser.ini     |   3 +
 .../html}/test/browser_bug1081537.js          |   0
 .../html}/test/browser_bug592641.js           |   2 +-
 .../html}/test/browser_bug649778.js           |   2 +-
 .../html}/test/bug100533_iframe.html          |   0
 .../html}/test/bug100533_load.html            |   0
 .../html}/test/bug196523-subframe.html        |   0
 .../html}/test/bug199692-nested-d2.html       |   0
 .../html}/test/bug199692-nested.html          |   0
 .../html}/test/bug199692-popup.html           |   0
 .../html}/test/bug199692-scrolled.html        |   0
 .../html}/test/bug242709_iframe.html          |   0
 .../html}/test/bug242709_load.html            |   0
 .../html}/test/bug277724_iframe1.html         |   0
 .../html}/test/bug277724_iframe2.xhtml        |   0
 .../html}/test/bug277890_iframe.html          |   0
 .../html}/test/bug277890_load.html            |   0
 .../html}/test/bug340800_iframe.txt           |   0
 .../html}/test/bug369370-popup.png            | Bin
 .../html}/test/bug372098-link-target.html     |   0
 .../content => dom/html}/test/bug392567.jar   | Bin
 .../html}/test/bug392567.jar^headers^         |   0
 .../html}/test/bug441930_iframe.html          |   0
 .../html}/test/bug445004-inner.html           |   2 +-
 .../html}/test/bug445004-inner.js             |   0
 .../html}/test/bug445004-outer-abs.html       |   4 +-
 .../html}/test/bug445004-outer-rel.html       |   2 +-
 .../html}/test/bug445004-outer-write.html     |   2 +-
 .../html}/test/bug446483-iframe.html          |   0
 .../html}/test/bug448564-echo.sjs             |   0
 .../html}/test/bug448564-iframe-1.html        |   0
 .../html}/test/bug448564-iframe-2.html        |   0
 .../html}/test/bug448564-iframe-3.html        |   0
 .../html}/test/bug448564-submit.js            |   0
 .../document => dom/html}/test/bug499092.html |   0
 .../document => dom/html}/test/bug499092.xml  |   0
 .../html}/test/bug514856_iframe.html          |   0
 .../html}/test/bug592641_img.jpg              | Bin
 .../html}/test/bug649134/file_bug649134-1.sjs |   0
 .../html}/test/bug649134/file_bug649134-2.sjs |   0
 .../html}/test/bug649134/index.html           |   0
 .../html/content => dom/html}/test/chrome.ini |   0
 .../html}/test/enableTestPlugin.js            |   0
 .../html}/test/file_anchor_ping.html          |   0
 .../html}/test/file_bug209275_1.html          |   0
 .../html}/test/file_bug209275_2.html          |   0
 .../html}/test/file_bug209275_3.html          |   0
 .../html}/test/file_bug297761.html            |   0
 .../html}/test/file_bug417760.png             | Bin
 .../html}/test/file_bug649778.html            |   0
 .../html}/test/file_bug649778.html^headers^   |   0
 .../html}/test/file_bug871161-1.html          |   2 +-
 .../html}/test/file_bug871161-2.html          |   0
 .../html}/test/file_bug893537.html            |   0
 .../html}/test/file_formSubmission_img.jpg    | Bin
 .../html}/test/file_formSubmission_text.txt   |   0
 ..._fullscreen-ancestor-stacking-context.html |   0
 .../html}/test/file_fullscreen-api-keys.html  |   0
 .../html}/test/file_fullscreen-api.html       |   0
 .../test/file_fullscreen-denied-inner.html    |   0
 .../html}/test/file_fullscreen-denied.html    |   0
 .../test/file_fullscreen-esc-exit-inner.html  |   0
 .../html}/test/file_fullscreen-esc-exit.html  |   0
 .../html}/test/file_fullscreen-hidden.html    |   0
 .../test/file_fullscreen-multiple-inner.html  |   0
 .../html}/test/file_fullscreen-multiple.html  |   0
 .../test/file_fullscreen-navigation.html      |   0
 .../html}/test/file_fullscreen-plugins.html   |   0
 .../html}/test/file_fullscreen-rollback.html  |   0
 .../test/file_fullscreen-svg-element.html     |   0
 .../html}/test/file_fullscreen-utils.js       |   0
 .../html}/test/file_iframe_sandbox_a_if1.html |   0
 .../test/file_iframe_sandbox_a_if10.html      |   0
 .../test/file_iframe_sandbox_a_if11.html      |   0
 .../test/file_iframe_sandbox_a_if12.html      |   0
 .../test/file_iframe_sandbox_a_if13.html      |   0
 .../test/file_iframe_sandbox_a_if14.html      |   0
 .../test/file_iframe_sandbox_a_if15.html      |   0
 .../test/file_iframe_sandbox_a_if16.html      |   0
 .../test/file_iframe_sandbox_a_if17.html      |   0
 .../test/file_iframe_sandbox_a_if18.html      |   0
 .../test/file_iframe_sandbox_a_if19.html      |   0
 .../html}/test/file_iframe_sandbox_a_if2.html |   0
 .../html}/test/file_iframe_sandbox_a_if3.html |   0
 .../html}/test/file_iframe_sandbox_a_if4.html |   0
 .../html}/test/file_iframe_sandbox_a_if5.html |   0
 .../html}/test/file_iframe_sandbox_a_if6.html |   0
 .../html}/test/file_iframe_sandbox_a_if7.html |   0
 .../html}/test/file_iframe_sandbox_a_if8.html |   0
 .../html}/test/file_iframe_sandbox_a_if9.html |   0
 .../html}/test/file_iframe_sandbox_b_if1.html |   0
 .../html}/test/file_iframe_sandbox_b_if2.html |   0
 .../html}/test/file_iframe_sandbox_b_if3.html |   0
 .../html}/test/file_iframe_sandbox_c_if1.html |   0
 .../html}/test/file_iframe_sandbox_c_if2.html |   0
 .../html}/test/file_iframe_sandbox_c_if3.html |   0
 .../html}/test/file_iframe_sandbox_c_if4.html |   0
 .../html}/test/file_iframe_sandbox_c_if5.html |   0
 .../html}/test/file_iframe_sandbox_c_if6.html |   0
 .../html}/test/file_iframe_sandbox_c_if7.html |   0
 .../html}/test/file_iframe_sandbox_c_if8.html |   0
 .../html}/test/file_iframe_sandbox_close.html |   0
 .../html}/test/file_iframe_sandbox_d_if1.html |   0
 .../test/file_iframe_sandbox_d_if10.html      |   0
 .../test/file_iframe_sandbox_d_if11.html      |   0
 .../test/file_iframe_sandbox_d_if12.html      |   0
 .../test/file_iframe_sandbox_d_if13.html      |   0
 .../test/file_iframe_sandbox_d_if14.html      |   0
 .../test/file_iframe_sandbox_d_if15.html      |   0
 .../test/file_iframe_sandbox_d_if16.html      |   0
 .../test/file_iframe_sandbox_d_if17.html      |   0
 .../test/file_iframe_sandbox_d_if18.html      |   0
 .../test/file_iframe_sandbox_d_if19.html      |   0
 .../html}/test/file_iframe_sandbox_d_if2.html |   0
 .../test/file_iframe_sandbox_d_if20.html      |   0
 .../test/file_iframe_sandbox_d_if21.html      |   0
 .../test/file_iframe_sandbox_d_if22.html      |   0
 .../test/file_iframe_sandbox_d_if23.html      |   0
 .../html}/test/file_iframe_sandbox_d_if3.html |   0
 .../html}/test/file_iframe_sandbox_d_if4.html |   0
 .../html}/test/file_iframe_sandbox_d_if5.html |   0
 .../html}/test/file_iframe_sandbox_d_if6.html |   0
 .../html}/test/file_iframe_sandbox_d_if7.html |   0
 .../html}/test/file_iframe_sandbox_d_if8.html |   0
 .../html}/test/file_iframe_sandbox_d_if9.html |   0
 .../html}/test/file_iframe_sandbox_e_if1.html |   0
 .../test/file_iframe_sandbox_e_if10.html      |   0
 .../test/file_iframe_sandbox_e_if11.html      |   0
 .../test/file_iframe_sandbox_e_if12.html      |   0
 .../test/file_iframe_sandbox_e_if13.html      |   0
 .../test/file_iframe_sandbox_e_if14.html      |   0
 .../test/file_iframe_sandbox_e_if15.html      |   0
 .../test/file_iframe_sandbox_e_if16.html      |   0
 .../html}/test/file_iframe_sandbox_e_if2.html |   0
 .../html}/test/file_iframe_sandbox_e_if3.html |   0
 .../html}/test/file_iframe_sandbox_e_if4.html |   0
 .../html}/test/file_iframe_sandbox_e_if5.html |   0
 .../html}/test/file_iframe_sandbox_e_if6.html |   0
 .../html}/test/file_iframe_sandbox_e_if7.html |   0
 .../html}/test/file_iframe_sandbox_e_if8.html |   0
 .../html}/test/file_iframe_sandbox_e_if9.html |   0
 .../html}/test/file_iframe_sandbox_f_if1.html |   0
 .../html}/test/file_iframe_sandbox_f_if2.html |   0
 .../file_iframe_sandbox_f_if2.html^headers^   |   0
 .../html}/test/file_iframe_sandbox_fail.js    |   0
 .../test/file_iframe_sandbox_form_fail.html   |   0
 .../test/file_iframe_sandbox_form_pass.html   |   0
 .../html}/test/file_iframe_sandbox_g_if1.html |   0
 .../html}/test/file_iframe_sandbox_h_if1.html |   0
 .../html}/test/file_iframe_sandbox_j_if1.html |   0
 .../html}/test/file_iframe_sandbox_j_if2.html |   0
 .../html}/test/file_iframe_sandbox_j_if3.html |   0
 .../html}/test/file_iframe_sandbox_k_if1.html |   0
 .../html}/test/file_iframe_sandbox_k_if2.html |   0
 .../html}/test/file_iframe_sandbox_k_if3.html |   0
 .../html}/test/file_iframe_sandbox_k_if4.html |   0
 .../html}/test/file_iframe_sandbox_k_if5.html |   0
 .../html}/test/file_iframe_sandbox_k_if6.html |   0
 .../html}/test/file_iframe_sandbox_k_if7.html |   0
 .../html}/test/file_iframe_sandbox_k_if8.html |   0
 .../html}/test/file_iframe_sandbox_k_if9.html |   0
 .../file_iframe_sandbox_navigation_fail.html  |   0
 .../file_iframe_sandbox_navigation_pass.html  |   0
 .../file_iframe_sandbox_navigation_start.html |   0
 .../file_iframe_sandbox_open_window_fail.html |   0
 .../file_iframe_sandbox_open_window_pass.html |   0
 .../html}/test/file_iframe_sandbox_pass.js    |   0
 .../test/file_iframe_sandbox_redirect.html    |   0
 ...file_iframe_sandbox_redirect.html^headers^ |   0
 .../file_iframe_sandbox_redirect_target.html  |   0
 ...le_iframe_sandbox_top_navigation_fail.html |   0
 ...le_iframe_sandbox_top_navigation_pass.html |   0
 .../file_iframe_sandbox_window_form_fail.html |   0
 .../file_iframe_sandbox_window_form_pass.html |   0
 ...iframe_sandbox_window_navigation_fail.html |   0
 ...iframe_sandbox_window_navigation_pass.html |   0
 ...me_sandbox_window_top_navigation_fail.html |   0
 ...me_sandbox_window_top_navigation_pass.html |   0
 .../html}/test/file_iframe_sandbox_worker.js  |   0
 .../html}/test/file_ignoreuserfocus.html      |   0
 .../html}/test/file_imports_basics.html       |   0
 .../html}/test/file_imports_redirect.html     |   0
 .../test/file_imports_redirect.html^headers^  |   2 +
 .../html}/test/file_imports_redirected.html   |   0
 .../html}/test/file_srcdoc-2.html             |   0
 .../html}/test/file_srcdoc.html               |   0
 .../html}/test/form_submit_server.sjs         |   0
 .../html}/test/forms/chrome.ini               |   0
 .../html}/test/forms/mochitest.ini            |   0
 .../test/forms/save_restore_radio_groups.sjs  |   0
 .../html}/test/forms/submit_invalid_file.sjs  |   0
 .../test/forms/test_autocompleteinfo.html     |   0
 .../html}/test/forms/test_bug1039548.html     |   0
 .../test_button_attributes_reflection.html    |   2 +-
 .../html}/test/forms/test_change_event.html   |   0
 .../test/forms/test_datalist_element.html     |   0
 .../forms/test_experimental_forms_pref.html   |   0
 .../test/forms/test_form_attribute-1.html     |   0
 .../test/forms/test_form_attribute-2.html     |   0
 .../test/forms/test_form_attribute-3.html     |   0
 .../test/forms/test_form_attribute-4.html     |   0
 .../test_form_attributes_reflection.html      |   2 +-
 .../forms/test_form_named_getter_dynamic.html |   0
 .../test/forms/test_formaction_attribute.html |   0
 .../forms/test_formnovalidate_attribute.html  |   0
 .../test_input_attributes_reflection.html     |   2 +-
 .../test/forms/test_input_autocomplete.html   |   0
 .../test_input_color_input_change_events.html |   0
 .../test_input_color_picker_initial.html      |   0
 .../forms/test_input_color_picker_popup.html  |   0
 .../forms/test_input_color_picker_update.html |   0
 .../test/forms/test_input_defaultValue.html   |   0
 .../html}/test/forms/test_input_email.html    |   0
 .../html}/test/forms/test_input_event.html    |   0
 .../test/forms/test_input_file_picker.html    |   0
 .../test/forms/test_input_list_attribute.html |   0
 .../test/forms/test_input_number_data.js      |   0
 .../forms/test_input_number_key_events.html   |   0
 .../test/forms/test_input_number_l10n.html    |   0
 .../forms/test_input_number_mouse_events.html |   0
 .../forms/test_input_number_rounding.html     |   0
 .../forms/test_input_number_validation.html   |   0
 .../forms/test_input_radio_radiogroup.html    |   0
 .../forms/test_input_range_attr_order.html    |   0
 .../forms/test_input_range_key_events.html    |   0
 ...st_input_range_mouse_and_touch_events.html |   0
 .../test/forms/test_input_range_rounding.html |   0
 .../test/forms/test_input_sanitization.html   |   0
 ...st_input_textarea_set_value_no_scroll.html |   0
 .../forms/test_input_typing_sanitization.html |   4 +-
 .../test_input_untrusted_key_events.html      |   0
 .../html}/test/forms/test_input_url.html      |   0
 .../forms/test_label_control_attribute.html   |   0
 .../test/forms/test_label_input_controls.html |   0
 .../html}/test/forms/test_max_attribute.html  |   0
 .../test/forms/test_maxlength_attribute.html  |   0
 .../html}/test/forms/test_meter_element.html  |   2 +-
 .../test/forms/test_meter_pseudo-classes.html |   0
 .../html}/test/forms/test_min_attribute.html  |   0
 .../html}/test/forms/test_mozistextfield.html |   0
 .../test/forms/test_novalidate_attribute.html |   0
 .../test/forms/test_option_disabled.html      |   0
 .../forms/test_option_index_attribute.html    |   0
 .../html}/test/forms/test_option_text.html    |   0
 .../html}/test/forms/test_output_element.html |   2 +-
 .../test/forms/test_pattern_attribute.html    |   0
 .../test/forms/test_progress_element.html     |   2 +-
 .../test/forms/test_radio_radionodelist.html  |   0
 .../test/forms/test_required_attribute.html   |   0
 .../forms/test_restore_form_elements.html     |   0
 .../forms/test_save_restore_radio_groups.html |   0
 .../forms/test_select_selectedOptions.html    |   0
 .../test/forms/test_select_validation.html    |   0
 .../html}/test/forms/test_set_range_text.html |   0
 .../html}/test/forms/test_step_attribute.html |   0
 .../test/forms/test_stepup_stepdown.html      |   0
 .../test/forms/test_submit_invalid_file.html  |   2 +-
 .../test_textarea_attributes_reflection.html  |   0
 .../html}/test/forms/test_validation.html     |   0
 .../forms/test_validation_not_in_doc.html     |   0
 .../test/forms/test_valueAsDate_pref.html     |   0
 .../forms/test_valueasdate_attribute.html     |   0
 .../forms/test_valueasnumber_attribute.html   |   0
 .../html}/test/image-allow-credentials.png    | Bin
 .../test/image-allow-credentials.png^headers^ |   0
 .../html/content => dom/html}/test/image.png  | Bin
 .../html}/test/imports/file_cycle_1_A.html    |   0
 .../html}/test/imports/file_cycle_1_B.html    |   0
 .../html}/test/imports/file_cycle_1_C.html    |   0
 .../html}/test/imports/file_cycle_2_A.html    |   0
 .../html}/test/imports/file_cycle_2_B.html    |   0
 .../html}/test/imports/file_cycle_2_C.html    |   0
 .../html}/test/imports/file_cycle_2_D.html    |   0
 .../html}/test/imports/file_cycle_3_A.html    |   0
 .../html}/test/imports/file_cycle_3_B.html    |   0
 .../html}/test/imports/file_cycle_3_C.html    |   0
 .../html}/test/imports/file_cycle_4_A.html    |   0
 .../html}/test/imports/file_cycle_4_B.html    |   0
 .../html}/test/imports/file_cycle_4_C.html    |   0
 .../html}/test/imports/file_cycle_4_D.html    |   0
 .../html}/test/imports/file_cycle_4_E.html    |   0
 .../html}/test/imports/file_cycle_5_A.html    |   0
 .../html}/test/imports/file_cycle_5_B.html    |   0
 .../html}/test/imports/file_cycle_5_C.html    |   0
 .../html}/test/imports/file_cycle_5_D.html    |   0
 .../html}/test/imports/file_encoding.html     |   0
 .../html}/test/imports/file_importA1.html     |   0
 .../html}/test/imports/file_importA2.html     |   0
 .../html}/test/imports/file_importB1.html     |   0
 .../html}/test/imports/file_importB2.html     |   0
 .../html}/test/imports/file_importC1.html     |   0
 .../html}/test/imports/file_importC10.html    |   0
 .../html}/test/imports/file_importC2.html     |   0
 .../html}/test/imports/file_importC3.html     |   0
 .../html}/test/imports/file_importC4.html     |   0
 .../html}/test/imports/file_importC5.html     |   0
 .../html}/test/imports/file_importC6.html     |   0
 .../html}/test/imports/file_importC7.html     |   0
 .../html}/test/imports/file_importC8.html     |   0
 .../html}/test/imports/file_importC9.html     |   0
 .../html}/test/imports/file_importD.html      |   0
 .../html}/test/imports/file_importE.html      |   0
 .../html}/test/imports/mochitest.ini          |   0
 .../html}/test/imports/test_cycle_1.html      |   0
 .../html}/test/imports/test_cycle_2.html      |   0
 .../html}/test/imports/test_cycle_3.html      |   0
 .../html}/test/imports/test_cycle_4.html      |   0
 .../html}/test/imports/test_cycle_5.html      |   0
 .../html}/test/imports/test_encoding.html     |   0
 .../content => dom/html}/test/mochitest.ini   |  79 +++++++++++++++++
 .../content => dom/html}/test/nnc_lockup.gif  | Bin
 .../html/content => dom/html}/test/reflect.js |   0
 .../html}/test/test_a_text.html               |   0
 .../html}/test/test_allowMedia.html           |   2 +-
 .../test_anchor_href_cache_invalidation.html  |   0
 .../html}/test/test_anchor_ping.html          |   2 +-
 .../test_applet_attributes_reflection.html    |   0
 .../html}/test/test_audio_wakelock.html       |   0
 .../test/test_base_attributes_reflection.html |   0
 .../html}/test/test_bug1003539.html           |   0
 .../html}/test/test_bug100533.html            |   0
 .../html}/test/test_bug1013316.html           |   0
 .../html}/test/test_bug1045270.html           |   0
 .../html}/test/test_bug109445.html            |   0
 .../html}/test/test_bug109445.xhtml           |   0
 .../html}/test/test_bug1297.html              |   0
 .../html}/test/test_bug1366.html              |   0
 .../html}/test/test_bug1400.html              |   0
 .../html}/test/test_bug143220.html            |   0
 .../html}/test/test_bug1682.html              |   0
 .../html}/test/test_bug172261.html            |   0
 .../html}/test/test_bug182279.html            |   0
 .../html}/test/test_bug1823.html              |   0
 .../html}/test/test_bug196523.html            |   2 +-
 .../html}/test/test_bug199692.html            |   0
 .../html}/test/test_bug2082.html              |   0
 .../html}/test/test_bug209275.xhtml           |   0
 .../html}/test/test_bug237071.html            |   0
 .../html}/test/test_bug242709.html            |   0
 .../html}/test/test_bug24958.html             |   0
 .../html}/test/test_bug255820.html            |   0
 .../html}/test/test_bug259332.html            |   0
 .../html}/test/test_bug274626.html            |   0
 .../html}/test/test_bug277724.html            |   0
 .../html}/test/test_bug277890.html            |   0
 .../html}/test/test_bug287465.html            |   0
 .../html}/test/test_bug295561.html            |   0
 .../html}/test/test_bug297761.html            |   0
 .../html}/test/test_bug300691-1.html          |   0
 .../html}/test/test_bug300691-2.html          |   0
 .../html}/test/test_bug300691-3.xhtml         |   0
 .../html}/test/test_bug311681.html            |   0
 .../html}/test/test_bug311681.xhtml           |   0
 .../html}/test/test_bug324378.html            |   0
 .../html}/test/test_bug330705-1.html          |   0
 .../html}/test/test_bug332246.html            |   0
 .../html}/test/test_bug332848.xhtml           |   0
 .../html}/test/test_bug332893-1.html          |   0
 .../html}/test/test_bug332893-2.html          |   0
 .../html}/test/test_bug332893-3.html          |   0
 .../html}/test/test_bug332893-4.html          |   0
 .../html}/test/test_bug332893-5.html          |   0
 .../html}/test/test_bug332893-6.html          |   0
 .../html}/test/test_bug332893-7.html          |   0
 .../html}/test/test_bug3348.html              |   0
 .../html}/test/test_bug340017.xhtml           |   0
 .../html}/test/test_bug340800.html            |   0
 .../html}/test/test_bug347174.html            |   0
 .../html}/test/test_bug347174_write.html      |   0
 .../html}/test/test_bug347174_xsl.html        |   0
 .../html}/test/test_bug347174_xslp.html       |   0
 .../html}/test/test_bug353415-1.html          |   0
 .../html}/test/test_bug353415-2.html          |   0
 .../html}/test/test_bug359657.html            |   0
 .../html}/test/test_bug369370.html            |   0
 .../html}/test/test_bug371375.html            |   0
 .../html}/test/test_bug372098.html            |   0
 .../html}/test/test_bug373589.html            |   0
 .../html}/test/test_bug375003-1.html          |   0
 .../html}/test/test_bug375003-2.html          |   0
 .../html}/test/test_bug377624.html            |   0
 .../html}/test/test_bug380383.html            |   0
 .../html}/test/test_bug383383.html            |   0
 .../html}/test/test_bug383383_2.xhtml         |   0
 .../html}/test/test_bug384419.html            |   0
 .../html}/test/test_bug386496.html            |   0
 .../html}/test/test_bug386728.html            |   0
 .../html}/test/test_bug386996.html            |   0
 .../html}/test/test_bug388558.html            |   0
 .../html}/test/test_bug388746.html            |   0
 .../html}/test/test_bug388794.html            |   0
 .../html}/test/test_bug389797.html            |   0
 .../html}/test/test_bug390975.html            |   0
 .../html}/test/test_bug391777.html            |   0
 .../html}/test/test_bug391994.html            |   0
 .../html}/test/test_bug392567.html            |   2 +-
 .../html}/test/test_bug394700.html            |   0
 .../html}/test/test_bug395107.html            |   0
 .../html}/test/test_bug401160.xhtml           |   0
 .../html}/test/test_bug402680.html            |   0
 .../html}/test/test_bug403868.html            |   0
 .../html}/test/test_bug403868.xhtml           |   0
 .../html}/test/test_bug405242.html            |   0
 .../html}/test/test_bug406596.html            |   0
 .../html}/test/test_bug417760.html            |   0
 .../html}/test/test_bug421640.html            |   0
 .../html}/test/test_bug424698.html            |   0
 .../html}/test/test_bug428135.xhtml           |   0
 .../html}/test/test_bug430351.html            |   0
 .../html}/test/test_bug430392.html            |   0
 .../html}/test/test_bug435128.html            |   0
 .../html}/test/test_bug441930.html            |   0
 .../html}/test/test_bug442801.html            |   0
 .../html}/test/test_bug445004.html            |  16 ++--
 .../html}/test/test_bug446483.html            |   0
 .../html}/test/test_bug448166.html            |   0
 .../html}/test/test_bug448564.html            |   0
 .../html}/test/test_bug456229.html            |   0
 .../html}/test/test_bug458037.xhtml           |   0
 .../html}/test/test_bug460568.html            |   0
 .../html}/test/test_bug463104.html            |   0
 .../html}/test/test_bug478251.html            |   0
 .../html}/test/test_bug481335.xhtml           |   0
 .../html}/test/test_bug481440.html            |   0
 .../html}/test/test_bug481647.html            |   0
 .../html}/test/test_bug482659.html            |   0
 .../html}/test/test_bug486741.html            |   0
 .../html}/test/test_bug489532.html            |   0
 .../html}/test/test_bug497242.xhtml           |   0
 .../html}/test/test_bug499092.html            |   0
 .../html}/test/test_bug500885.html            |   0
 .../html}/test/test_bug512367.html            |   0
 .../html}/test/test_bug514856.html            |   0
 .../html}/test/test_bug518122.html            |   0
 .../html}/test/test_bug519987.html            |   0
 .../html}/test/test_bug523771.html            |   0
 .../html}/test/test_bug529819.html            |   0
 .../html}/test/test_bug529859.html            |   0
 .../html}/test/test_bug535043.html            |   0
 .../html}/test/test_bug536891.html            |   0
 .../html}/test/test_bug536895.html            |   0
 .../html}/test/test_bug546995.html            |   0
 .../html}/test/test_bug547850.html            |   0
 .../html}/test/test_bug551846.html            |   0
 .../html}/test/test_bug555567.html            |   0
 .../html}/test/test_bug556645.html            |   0
 .../html}/test/test_bug557087-1.html          |   0
 .../html}/test/test_bug557087-2.html          |   0
 .../html}/test/test_bug557087-3.html          |   0
 .../html}/test/test_bug557087-4.html          |   0
 .../html}/test/test_bug557087-5.html          |   0
 .../html}/test/test_bug557087-6.html          |   0
 .../html}/test/test_bug557620.html            |   0
 .../html}/test/test_bug558788-1.html          |   0
 .../html}/test/test_bug558788-2.html          |   0
 .../html}/test/test_bug560112.html            |   0
 .../html}/test/test_bug561634.html            |   0
 .../html}/test/test_bug561636.html            |   0
 .../html}/test/test_bug561640.html            |   0
 .../html}/test/test_bug564001.html            |   0
 .../html}/test/test_bug566046.html            |   0
 .../html}/test/test_bug567938-1.html          |   2 +-
 .../html}/test/test_bug567938-2.html          |   2 +-
 .../html}/test/test_bug567938-3.html          |   2 +-
 .../html}/test/test_bug567938-4.html          |   0
 .../html}/test/test_bug569955.html            |   0
 .../html}/test/test_bug573969.html            |   0
 .../html}/test/test_bug57600.html             |   0
 .../html}/test/test_bug579079.html            |   0
 .../html}/test/test_bug582412-1.html          |   0
 .../html}/test/test_bug582412-2.html          |   0
 .../html}/test/test_bug583514.html            |   0
 .../html}/test/test_bug583533.html            |   0
 .../html}/test/test_bug586763.html            |   0
 .../html}/test/test_bug586786.html            |   0
 .../html}/test/test_bug587469.html            |   0
 .../html}/test/test_bug589.html               |   0
 .../html}/test/test_bug590353-1.html          |   0
 .../html}/test/test_bug590353-2.html          |   0
 .../html}/test/test_bug590363.html            |   0
 .../html}/test/test_bug592802.html            |   0
 .../html}/test/test_bug593689.html            |   0
 .../html}/test/test_bug595429.html            |   0
 .../html}/test/test_bug595447.html            |   0
 .../html}/test/test_bug595449.html            |   0
 .../html}/test/test_bug596350.html            |   0
 .../html}/test/test_bug596511.html            |   0
 .../html}/test/test_bug598643.html            |   0
 .../html}/test/test_bug598833-1.html          |   0
 .../html}/test/test_bug600155.html            |   0
 .../html}/test/test_bug601030.html            |   0
 .../html}/test/test_bug605124-1.html          |   0
 .../html}/test/test_bug605124-2.html          |   0
 .../html}/test/test_bug605125-1.html          |   0
 .../html}/test/test_bug605125-2.html          |   0
 .../html}/test/test_bug606817.html            |   0
 .../html}/test/test_bug607145.html            |   4 +-
 .../html}/test/test_bug610212.html            |   0
 .../html}/test/test_bug610687.html            |   0
 .../html}/test/test_bug611189.html            |   0
 .../html}/test/test_bug612730.html            |   0
 .../html}/test/test_bug613113.html            |   0
 .../html}/test/test_bug613722.html            |   0
 .../html}/test/test_bug613979.html            |   0
 .../html}/test/test_bug615595.html            | Bin
 .../html}/test/test_bug615833.html            |   0
 .../html}/test/test_bug617528.html            |   0
 .../html}/test/test_bug618948.html            |   0
 .../html}/test/test_bug619278.html            |   0
 .../html}/test/test_bug622558.html            |   0
 .../html}/test/test_bug622597.html            |   0
 .../html}/test/test_bug623291.html            |   0
 .../html}/test/test_bug6296.html              |   0
 .../html}/test/test_bug629801.html            |   0
 .../html}/test/test_bug633058.html            |   0
 .../html}/test/test_bug636336.html            |   0
 .../html}/test/test_bug641219.html            |   0
 .../html}/test/test_bug643051.html            |   0
 .../html}/test/test_bug646157.html            |   0
 .../html}/test/test_bug649134.html            |   0
 .../html}/test/test_bug651956.html            |   0
 .../html}/test/test_bug658746.html            |   0
 .../html}/test/test_bug659596.html            |   0
 .../html}/test/test_bug659743.xml             |   0
 .../html}/test/test_bug660663.html            |   0
 .../html}/test/test_bug660959-1.html          |   0
 .../html}/test/test_bug660959-2.html          |   0
 .../html}/test/test_bug660959-3.html          |   0
 .../html}/test/test_bug666200.html            |   0
 .../html}/test/test_bug666666.html            |   0
 .../html}/test/test_bug669012.html            |   0
 .../html}/test/test_bug674558.html            |   0
 .../html}/test/test_bug674927.html            |   0
 .../html}/test/test_bug677463.html            |   0
 .../html}/test/test_bug677495-1.html          |   0
 .../html}/test/test_bug677495.html            |   0
 .../html}/test/test_bug677658.html            |   0
 .../html}/test/test_bug682886.html            |   0
 .../html}/test/test_bug691.html               |   0
 .../html}/test/test_bug694.html               |   0
 .../html}/test/test_bug694503.html            |   0
 .../html}/test/test_bug696.html               |   0
 .../html}/test/test_bug717819.html            |   0
 .../html}/test/test_bug741266.html            |   0
 .../html}/test/test_bug742030.html            |   0
 .../html}/test/test_bug742549.html            |   0
 .../html}/test/test_bug745685.html            |   0
 .../html}/test/test_bug763626.html            |   0
 .../html}/test/test_bug765780.html            |   0
 .../html}/test/test_bug780993.html            |   0
 .../html}/test/test_bug787134.html            |   0
 .../html}/test/test_bug797113.html            |   0
 .../html}/test/test_bug803677.html            |   0
 .../html}/test/test_bug821307.html            |   0
 .../html}/test/test_bug827126.html            |   0
 .../html}/test/test_bug827426.html            |   0
 .../html}/test/test_bug838582.html            |   0
 .../html}/test/test_bug839371.html            |   0
 .../html}/test/test_bug839913.html            |   0
 .../html}/test/test_bug840877.html            |   0
 .../html}/test/test_bug841466.html            |   0
 .../html}/test/test_bug845057.html            |   0
 .../html}/test/test_bug869040.html            |   0
 .../html}/test/test_bug870787.html            |   0
 .../html}/test/test_bug871161.html            |   0
 .../html}/test/test_bug874758.html            |   0
 .../html}/test/test_bug879319.html            |   0
 .../html}/test/test_bug885024.html            |   0
 .../html}/test/test_bug893537.html            |   0
 .../html}/test/test_bug95530.html             |   0
 .../html}/test/test_bug969346.html            |   0
 .../html}/test/test_bug982039.html            |   0
 .../html}/test/test_change_crossorigin.html   |   4 +-
 .../html}/test/test_checked.html              |   0
 .../test/test_dir_attributes_reflection.html  |   0
 .../test/test_dl_attributes_reflection.html   |   0
 .../test/test_document-element-inserted.html  |   0
 .../html}/test/test_document.watch.html       |   0
 .../html}/test/test_documentAll.html          |   0
 .../html}/test/test_element_prototype.html    |   0
 .../test_embed_attributes_reflection.html     |   0
 .../html}/test/test_form-parsing.html         |   0
 .../html}/test/test_formData.html             |   0
 .../html}/test/test_formSubmission.html       |   0
 .../html}/test/test_formSubmission2.html      |   0
 .../html}/test/test_formelements.html         |   0
 .../test/test_fragment_form_pointer.html      |   0
 .../html}/test/test_fullscreen-api.html       |   0
 .../html}/test/test_hidden.html               |   0
 .../test/test_html_attributes_reflection.html |   0
 .../html}/test/test_htmlcollection.html       |   0
 .../test/test_iframe_sandbox_general.html     |   0
 .../test/test_iframe_sandbox_inheritance.html |   0
 .../html}/test/test_iframe_sandbox_modal.html |   0
 .../test/test_iframe_sandbox_navigation.html  |   0
 .../test/test_iframe_sandbox_navigation2.html |   0
 .../test/test_iframe_sandbox_plugins.html     |   0
 .../test/test_iframe_sandbox_popups.html      |   0
 ...est_iframe_sandbox_popups_inheritance.html |   0
 .../test/test_iframe_sandbox_redirect.html    |   0
 .../test/test_iframe_sandbox_same_origin.html |   0
 .../test/test_iframe_sandbox_workers.html     |   0
 .../html}/test/test_ignoreuserfocus.html      |   0
 .../html}/test/test_imageSrcSet.html          |   0
 .../test/test_img_attributes_reflection.html  |   0
 .../html}/test/test_imports_basics.html       |   0
 .../html}/test/test_imports_nested.html       |   0
 .../html}/test/test_imports_nested_2.html     |   0
 .../html}/test/test_imports_nonhttp.html      |   0
 .../html}/test/test_imports_redirect.html     |   2 +-
 .../test/test_input_files_not_nsIFile.html    |   0
 .../test/test_li_attributes_reflection.html   |   0
 .../test/test_link_attributes_reflection.html |   0
 .../html}/test/test_link_sizes.html           |   0
 .../test/test_map_attributes_reflection.html  |   0
 .../test/test_meta_attributes_reflection.html |   0
 .../test/test_mod_attributes_reflection.html  |   0
 .../html}/test/test_mozaudiochannel.html      |   0
 .../html}/test/test_named_options.html        |   0
 .../test/test_nested_invalid_fieldsets.html   |   0
 .../html}/test/test_non-ascii-cookie.html     |   0
 .../test/test_non-ascii-cookie.html^headers^  |   0
 .../test_object_attributes_reflection.html    |   0
 .../html}/test/test_object_plugin_nav.html    |   0
 .../test/test_ol_attributes_reflection.html   |   0
 .../test/test_option_defaultSelected.html     |   0
 .../test/test_option_selected_state.html      |   0
 .../test_param_attributes_reflection.html     |   0
 .../content => dom/html}/test/test_plugin.tst |   0
 .../test/test_q_attributes_reflection.html    |   0
 .../test_restore_from_parser_fragment.html    |   0
 .../html}/test/test_rowscollection.html       |   0
 .../html}/test/test_srcdoc-2.html             |   0
 .../html}/test/test_srcdoc.html               |   0
 .../test_style_attributes_reflection.html     |   0
 .../content => dom/html}/test/test_track.html |   2 +-
 .../html}/test/test_track_disabled.html       |   0
 .../test/test_ul_attributes_reflection.html   |   0
 .../html}/test/test_undoManager.html          |   0
 .../html}/test/test_video_wakelock.html       |   0
 .../html}/test/test_viewport.html             |   0
 .../content => dom/html}/test/wakelock.ogg    | Bin
 .../content => dom/html}/test/wakelock.ogv    | Bin
 dom/media/android/moz.build                   |   4 +-
 dom/media/gstreamer/moz.build                 |   2 +-
 dom/media/omx/moz.build                       |   2 +-
 dom/media/raw/moz.build                       |   2 +-
 dom/media/test/test_defaultMuted.html         |   2 +-
 dom/media/test/test_source_media.html         |   2 +-
 dom/moz.build                                 |   1 +
 dom/svg/moz.build                             |   3 +-
 .../pointerlock/test_pointerlock-api.html     |   4 +-
 dom/webidl/ImageDocument.webidl               |   2 +-
 dom/xbl/moz.build                             |   2 +-
 dom/xml/moz.build                             |   2 +-
 dom/xul/moz.build                             |   2 +-
 .../components/webbrowserpersist/moz.build    |   2 +-
 js/xpconnect/src/moz.build                    |   3 +-
 layout/base/moz.build                         |   2 +-
 layout/build/moz.build                        |   3 +-
 layout/forms/moz.build                        |   2 +-
 layout/generic/moz.build                      |   2 +-
 layout/reftests/reftest.list                  |   3 +-
 layout/style/moz.build                        |   2 +-
 layout/style/test/ParseCSS.cpp                |   2 +-
 layout/tables/moz.build                       |   2 +-
 mobile/android/installer/package-manifest.in  |   1 -
 testing/crashtest/crashtests.list             |   3 +-
 testing/mochitest/android23.json              |   2 +-
 1074 files changed, 242 insertions(+), 331 deletions(-)
 delete mode 100644 content/html/content/moz.build
 delete mode 100644 content/html/content/public/moz.build
 delete mode 100644 content/html/content/test/file_imports_redirect.html^headers^
 delete mode 100644 content/html/document/crashtests/crashtests.list
 delete mode 100644 content/html/document/moz.build
 delete mode 100644 content/html/document/public/moz.build
 delete mode 100644 content/html/document/reftests/reftests.list
 delete mode 100644 content/html/document/src/moz.build
 delete mode 100644 content/html/document/test/browser.ini
 delete mode 100644 content/html/document/test/mochitest.ini
 delete mode 100644 content/html/moz.build
 rename {content/html/document/src => dom/html}/HTMLAllCollection.cpp (100%)
 rename {content/html/document/src => dom/html}/HTMLAllCollection.h (100%)
 rename {content/html/content/src => dom/html}/HTMLAnchorElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLAnchorElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLAreaElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLAreaElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLAudioElement.cpp (100%)
 rename {content/html/content/public => dom/html}/HTMLAudioElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLBRElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLBRElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLBodyElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLBodyElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLButtonElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLButtonElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLCanvasElement.cpp (100%)
 rename {content/html/content/public => dom/html}/HTMLCanvasElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLContentElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLContentElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLDataElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLDataElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLDataListElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLDataListElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLDivElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLDivElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFieldSetElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFieldSetElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLFontElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFontElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLFormControlsCollection.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFormControlsCollection.h (100%)
 rename {content/html/content/src => dom/html}/HTMLFormElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFormElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLFrameElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFrameElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLFrameSetElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLFrameSetElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLHRElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLHRElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLHeadingElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLHeadingElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLIFrameElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLIFrameElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLImageElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLImageElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLInputElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLInputElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLLIElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLLIElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLLabelElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLLabelElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLLegendElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLLegendElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLLinkElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLLinkElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMapElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLMapElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMediaElement.cpp (100%)
 rename {content/html/content/public => dom/html}/HTMLMediaElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMenuElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLMenuElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMenuItemElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLMenuItemElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMetaElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLMetaElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLMeterElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLMeterElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLModElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLModElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLObjectElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLObjectElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLOptGroupElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLOptGroupElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLOptionElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLOptionElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLOptionsCollection.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLOptionsCollection.h (100%)
 rename {content/html/content/src => dom/html}/HTMLOutputElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLOutputElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLParagraphElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLParagraphElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLPictureElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLPictureElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLPreElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLPreElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLProgressElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLProgressElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLPropertiesCollection.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLPropertiesCollection.h (100%)
 rename {content/html/content/src => dom/html}/HTMLScriptElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLScriptElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSelectElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSelectElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLShadowElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLShadowElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedListElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedListElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedObjectElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSharedObjectElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSourceElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSourceElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLSpanElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLSpanElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLStyleElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLStyleElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableCaptionElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableCaptionElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableCellElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableCellElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableColElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableColElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableRowElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableRowElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTableSectionElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTableSectionElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTemplateElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTemplateElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTextAreaElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTextAreaElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTimeElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTimeElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTitleElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTitleElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLTrackElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLTrackElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLUnknownElement.cpp (100%)
 rename {content/html/content/src => dom/html}/HTMLUnknownElement.h (100%)
 rename {content/html/content/src => dom/html}/HTMLVideoElement.cpp (100%)
 rename {content/html/content/public => dom/html}/HTMLVideoElement.h (100%)
 rename {content/html/document/src => dom/html}/ImageDocument.cpp (100%)
 rename {content/html/document/src => dom/html}/ImageDocument.h (100%)
 rename {content/html/document/src => dom/html}/MediaDocument.cpp (100%)
 rename {content/html/document/src => dom/html}/MediaDocument.h (100%)
 rename {content/html/content/src => dom/html}/MediaError.cpp (100%)
 rename {content/html/content/src => dom/html}/MediaError.h (100%)
 rename {content/html/document/src => dom/html}/PluginDocument.cpp (100%)
 rename {content/html/content/src => dom/html}/RadioNodeList.cpp (100%)
 rename {content/html/content/src => dom/html}/RadioNodeList.h (100%)
 rename {content/html/content/src => dom/html}/TextTrackManager.cpp (100%)
 rename {content/html/content/src => dom/html}/TextTrackManager.h (100%)
 rename {content/html/content/src => dom/html}/TimeRanges.cpp (100%)
 rename {content/html/content/src => dom/html}/TimeRanges.h (100%)
 rename {content/html/content/src => dom/html}/UndoManager.cpp (100%)
 rename {content/html/content/src => dom/html}/UndoManager.h (100%)
 rename {content/html/content/src => dom/html}/ValidityState.cpp (100%)
 rename {content/html/content/src => dom/html}/ValidityState.h (100%)
 rename {content/html/document/src => dom/html}/VideoDocument.cpp (100%)
 rename {content/html/content => dom/html}/crashtests/1032654.html (100%)
 rename {content/html/content => dom/html}/crashtests/257818-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/285166-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/294235-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/307616-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/324918-1.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/338649-1.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/339501-1.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/339501-2.xhtml (100%)
 rename {content/html/document => dom/html}/crashtests/378993-1.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/382568-1-inner.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/382568-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/383137.xhtml (100%)
 rename {content/html/document => dom/html}/crashtests/388183-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/395340-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/399694-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/407053.html (100%)
 rename {content/html/content => dom/html}/crashtests/423371-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/448564.html (100%)
 rename {content/html/content => dom/html}/crashtests/451123-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/453406-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/464197-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/465466-1.xhtml (100%)
 rename {content/html/document => dom/html}/crashtests/468562-1.html (100%)
 rename {content/html/document => dom/html}/crashtests/468562-2.html (100%)
 rename {content/html/document => dom/html}/crashtests/494225.html (100%)
 rename {content/html/document => dom/html}/crashtests/495543.svg (100%)
 rename {content/html/content => dom/html}/crashtests/504183-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/515829-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/515829-2.html (100%)
 rename {content/html/document => dom/html}/crashtests/564461.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/570566-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/571428-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/580507-1.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/590387.html (100%)
 rename {content/html/content => dom/html}/crashtests/596785-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/596785-2.html (100%)
 rename {content/html/document => dom/html}/crashtests/601422.html (100%)
 rename {content/html/content => dom/html}/crashtests/602117.html (100%)
 rename {content/html/content => dom/html}/crashtests/604807.html (100%)
 rename {content/html/content => dom/html}/crashtests/605264.html (100%)
 rename {content/html/content => dom/html}/crashtests/606430-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/613027.html (100%)
 rename {content/html/content => dom/html}/crashtests/614279.html (100%)
 rename {content/html/content => dom/html}/crashtests/614988-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/616401.html (100%)
 rename {content/html/content => dom/html}/crashtests/620078-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/620078-2.html (100%)
 rename {content/html/document => dom/html}/crashtests/631421.html (100%)
 rename {content/html/document => dom/html}/crashtests/631421.png (100%)
 rename {content/html/content => dom/html}/crashtests/673853.html (100%)
 rename {content/html/content => dom/html}/crashtests/680922-1.xul (100%)
 rename {content/html/content => dom/html}/crashtests/680922-binding.xml (100%)
 rename {content/html/content => dom/html}/crashtests/682058.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/682460.html (100%)
 rename {content/html/content => dom/html}/crashtests/68912-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/738744.xhtml (100%)
 rename {content/html/document => dom/html}/crashtests/741218.json (100%)
 rename {content/html/document => dom/html}/crashtests/741218.json^headers^ (100%)
 rename {content/html/content => dom/html}/crashtests/741250.xhtml (100%)
 rename {content/html/content => dom/html}/crashtests/795221-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/795221-2.html (100%)
 rename {content/html/content => dom/html}/crashtests/795221-3.html (100%)
 rename {content/html/content => dom/html}/crashtests/795221-4.html (100%)
 rename {content/html/content => dom/html}/crashtests/795221-5.xml (100%)
 rename {content/html/content => dom/html}/crashtests/798802-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/811226.html (100%)
 rename {content/html/content => dom/html}/crashtests/819745.html (100%)
 rename {content/html/content => dom/html}/crashtests/828180.html (100%)
 rename {content/html/content => dom/html}/crashtests/828472.html (100%)
 rename {content/html/content => dom/html}/crashtests/837033.html (100%)
 rename {content/html/content => dom/html}/crashtests/838256-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/862084.html (100%)
 rename {content/html/content => dom/html}/crashtests/865147.html (100%)
 rename {content/html/content => dom/html}/crashtests/877910.html (100%)
 rename {content/html/content => dom/html}/crashtests/903106.html (100%)
 rename {content/html/content => dom/html}/crashtests/916322-1.html (100%)
 rename {content/html/content => dom/html}/crashtests/916322-2.html (100%)
 rename {content/html/content => dom/html}/crashtests/crashtests.list (79%)
 rename {content/html/content/src => dom/html}/moz.build (81%)
 rename {content/html/content/src => dom/html}/nsDOMStringMap.cpp (100%)
 rename {content/html/content/src => dom/html}/nsDOMStringMap.h (100%)
 rename {content/html/content/src => dom/html}/nsFormSubmission.cpp (100%)
 rename {content/html/content/public => dom/html}/nsFormSubmission.h (100%)
 rename {content/html/content/src => dom/html}/nsFormSubmissionConstants.h (100%)
 rename {content/html/content/src => dom/html}/nsGenericHTMLElement.cpp (100%)
 rename {content/html/content/src => dom/html}/nsGenericHTMLElement.h (100%)
 rename {content/html/content/src => dom/html}/nsGenericHTMLFrameElement.cpp (100%)
 rename {content/html/content/src => dom/html}/nsGenericHTMLFrameElement.h (100%)
 rename {content/html/document/src => dom/html}/nsHTMLContentSink.cpp (100%)
 rename {content/html/content/src => dom/html}/nsHTMLDNSPrefetch.cpp (100%)
 rename {content/html/content/src => dom/html}/nsHTMLDNSPrefetch.h (100%)
 rename {content/html/document/src => dom/html}/nsHTMLDocument.cpp (100%)
 rename {content/html/document/src => dom/html}/nsHTMLDocument.h (100%)
 rename {content/html/content/src => dom/html}/nsIConstraintValidation.cpp (100%)
 rename {content/html/content/public => dom/html}/nsIConstraintValidation.h (100%)
 rename {content/html/content/public => dom/html}/nsIForm.h (100%)
 rename {content/html/content/public => dom/html}/nsIFormControl.h (100%)
 rename {content/html/content/public => dom/html}/nsIFormProcessor.h (100%)
 rename {content/html/content/public => dom/html}/nsIFormSubmitObserver.idl (100%)
 rename {content/html/content/public => dom/html}/nsIHTMLCollection.h (100%)
 rename {content/html/document/src => dom/html}/nsIHTMLDocument.h (100%)
 rename {content/html/content/public => dom/html}/nsIHTMLMenu.idl (100%)
 rename {content/html/document/public => dom/html}/nsIImageDocument.idl (100%)
 rename {content/html/content/public => dom/html}/nsIMenuBuilder.idl (100%)
 rename {content/html/content/public => dom/html}/nsIPhonetic.idl (100%)
 rename {content/html/content/public => dom/html}/nsIRadioGroupContainer.h (100%)
 rename {content/html/content/public => dom/html}/nsIRadioVisitor.h (100%)
 rename {content/html/content/public => dom/html}/nsITextControlElement.h (100%)
 rename {content/html/content/src => dom/html}/nsRadioVisitor.cpp (100%)
 rename {content/html/content/src => dom/html}/nsRadioVisitor.h (100%)
 rename {content/html/content/src => dom/html}/nsTextEditorState.cpp (100%)
 rename {content/html/content/src => dom/html}/nsTextEditorState.h (100%)
 rename {content/html/content => dom/html}/reftests/41464-1-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/41464-1a.html (100%)
 rename {content/html/content => dom/html}/reftests/41464-1b.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-1a.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-1b.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-1c.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-1d.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-2-alternate-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-2-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/468263-2.html (100%)
 rename {content/html/content => dom/html}/reftests/484200-1-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/484200-1.html (100%)
 rename {content/html/content => dom/html}/reftests/485377-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/485377.html (100%)
 rename {content/html/content => dom/html}/reftests/52019-1-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/52019-1.html (100%)
 rename {content/html/content => dom/html}/reftests/557840-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/557840.html (100%)
 rename {content/html/content => dom/html}/reftests/560059-video-dimensions-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/560059-video-dimensions.html (100%)
 rename {content/html/content => dom/html}/reftests/573322-no-quirks-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/573322-no-quirks.html (100%)
 rename {content/html/content => dom/html}/reftests/573322-quirks-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/573322-quirks.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-1a.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-1b.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-2a.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-2b.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-ref-1.html (100%)
 rename {content/html/content => dom/html}/reftests/596455-ref-2.html (100%)
 rename {content/html/content => dom/html}/reftests/610935-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/610935.html (100%)
 rename {content/html/content => dom/html}/reftests/649134-1.html (100%)
 rename {content/html/content => dom/html}/reftests/649134-2-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/649134-2.html (100%)
 rename {content/html/content => dom/html}/reftests/649134-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-after-body-focus-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-after-body-focus.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-after-load-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-after-load.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-leaves-iframe-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/autofocus-leaves-iframe.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/button-create.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/button-load.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/button-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/input-create.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/input-load.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/input-number-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/input-number.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/input-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/reftest.list (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/select-create.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/select-load.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/select-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/style.css (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/textarea-create.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/textarea-load.html (100%)
 rename {content/html/content => dom/html}/reftests/autofocus/textarea-ref.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564-1_ideal.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564-1_malformed.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564-1_well-formed.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564-4a.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564-4b.html (100%)
 rename {content/html/document => dom/html}/reftests/bug448564_forms.css (100%)
 rename {content/html/document => dom/html}/reftests/bug502168-1_malformed.html (100%)
 rename {content/html/document => dom/html}/reftests/bug502168-1_well-formed.html (100%)
 rename {content/html/document => dom/html}/reftests/bug917595-1-ref.html (100%)
 rename {content/html/document => dom/html}/reftests/bug917595-exif-rotated.jpg (100%)
 rename {content/html/document => dom/html}/reftests/bug917595-iframe-1.html (100%)
 rename {content/html/document => dom/html}/reftests/bug917595-pixel-rotated.jpg (100%)
 rename {content/html/document => dom/html}/reftests/bug917595-unrotated.jpg (100%)
 rename {content/html/content => dom/html}/reftests/figure-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/figure.html (100%)
 rename {content/html/content => dom/html}/reftests/href-attr-change-restyles-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/href-attr-change-restyles.html (100%)
 rename {content/html/content => dom/html}/reftests/pass.png (100%)
 rename {content/html/content => dom/html}/reftests/pre-1-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/pre-1.html (100%)
 rename {content/html/content => dom/html}/reftests/reftest.list (66%)
 rename {content/html/content => dom/html}/reftests/table-border-1-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/table-border-1.html (100%)
 rename {content/html/content => dom/html}/reftests/table-border-2-notref.html (100%)
 rename {content/html/content => dom/html}/reftests/table-border-2-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/table-border-2.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/blob.js (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/dataurl.js (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/original.png (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q0.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q100.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q25.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q50.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q75.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/images/q92.jpg (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-0-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-100-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-25-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-50-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-75-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/quality-92-ref.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/reftest.list (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/sample.js (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-0.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-100.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-25.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-50.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-75.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-92.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-default.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/toblob-quality-undefined.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-0.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-100.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-25.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-50.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-75.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-92.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-default.html (100%)
 rename {content/html/content => dom/html}/reftests/toblob-todataurl/todataurl-quality-undefined.html (100%)
 rename {content/html/content => dom/html}/test/347174transform.xsl (100%)
 rename {content/html/content => dom/html}/test/347174transformable.xml (100%)
 rename {content/html/content => dom/html}/test/allowMedia.sjs (100%)
 rename {content/html/content => dom/html}/test/browser.ini (73%)
 rename {content/html/document => dom/html}/test/browser_bug1081537.js (100%)
 rename {content/html/document => dom/html}/test/browser_bug592641.js (95%)
 rename {content/html/content => dom/html}/test/browser_bug649778.js (97%)
 rename {content/html/content => dom/html}/test/bug100533_iframe.html (100%)
 rename {content/html/content => dom/html}/test/bug100533_load.html (100%)
 rename {content/html/document => dom/html}/test/bug196523-subframe.html (100%)
 rename {content/html/document => dom/html}/test/bug199692-nested-d2.html (100%)
 rename {content/html/document => dom/html}/test/bug199692-nested.html (100%)
 rename {content/html/document => dom/html}/test/bug199692-popup.html (100%)
 rename {content/html/document => dom/html}/test/bug199692-scrolled.html (100%)
 rename {content/html/content => dom/html}/test/bug242709_iframe.html (100%)
 rename {content/html/content => dom/html}/test/bug242709_load.html (100%)
 rename {content/html/content => dom/html}/test/bug277724_iframe1.html (100%)
 rename {content/html/content => dom/html}/test/bug277724_iframe2.xhtml (100%)
 rename {content/html/content => dom/html}/test/bug277890_iframe.html (100%)
 rename {content/html/content => dom/html}/test/bug277890_load.html (100%)
 rename {content/html/content => dom/html}/test/bug340800_iframe.txt (100%)
 rename {content/html/document => dom/html}/test/bug369370-popup.png (100%)
 rename {content/html/content => dom/html}/test/bug372098-link-target.html (100%)
 rename {content/html/content => dom/html}/test/bug392567.jar (100%)
 rename {content/html/content => dom/html}/test/bug392567.jar^headers^ (100%)
 rename {content/html/content => dom/html}/test/bug441930_iframe.html (100%)
 rename {content/html/document => dom/html}/test/bug445004-inner.html (80%)
 rename {content/html/document => dom/html}/test/bug445004-inner.js (100%)
 rename {content/html/document => dom/html}/test/bug445004-outer-abs.html (61%)
 rename {content/html/document => dom/html}/test/bug445004-outer-rel.html (72%)
 rename {content/html/document => dom/html}/test/bug445004-outer-write.html (94%)
 rename {content/html/document => dom/html}/test/bug446483-iframe.html (100%)
 rename {content/html/document => dom/html}/test/bug448564-echo.sjs (100%)
 rename {content/html/document => dom/html}/test/bug448564-iframe-1.html (100%)
 rename {content/html/document => dom/html}/test/bug448564-iframe-2.html (100%)
 rename {content/html/document => dom/html}/test/bug448564-iframe-3.html (100%)
 rename {content/html/document => dom/html}/test/bug448564-submit.js (100%)
 rename {content/html/document => dom/html}/test/bug499092.html (100%)
 rename {content/html/document => dom/html}/test/bug499092.xml (100%)
 rename {content/html/content => dom/html}/test/bug514856_iframe.html (100%)
 rename {content/html/document => dom/html}/test/bug592641_img.jpg (100%)
 rename {content/html/content => dom/html}/test/bug649134/file_bug649134-1.sjs (100%)
 rename {content/html/content => dom/html}/test/bug649134/file_bug649134-2.sjs (100%)
 rename {content/html/content => dom/html}/test/bug649134/index.html (100%)
 rename {content/html/content => dom/html}/test/chrome.ini (100%)
 rename {content/html/content => dom/html}/test/enableTestPlugin.js (100%)
 rename {content/html/content => dom/html}/test/file_anchor_ping.html (100%)
 rename {content/html/content => dom/html}/test/file_bug209275_1.html (100%)
 rename {content/html/content => dom/html}/test/file_bug209275_2.html (100%)
 rename {content/html/content => dom/html}/test/file_bug209275_3.html (100%)
 rename {content/html/content => dom/html}/test/file_bug297761.html (100%)
 rename {content/html/content => dom/html}/test/file_bug417760.png (100%)
 rename {content/html/content => dom/html}/test/file_bug649778.html (100%)
 rename {content/html/content => dom/html}/test/file_bug649778.html^headers^ (100%)
 rename {content/html/document => dom/html}/test/file_bug871161-1.html (66%)
 rename {content/html/document => dom/html}/test/file_bug871161-2.html (100%)
 rename {content/html/content => dom/html}/test/file_bug893537.html (100%)
 rename {content/html/content => dom/html}/test/file_formSubmission_img.jpg (100%)
 rename {content/html/content => dom/html}/test/file_formSubmission_text.txt (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-ancestor-stacking-context.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-api-keys.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-api.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-denied-inner.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-denied.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-esc-exit-inner.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-esc-exit.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-hidden.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-multiple-inner.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-multiple.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-navigation.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-plugins.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-rollback.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-svg-element.html (100%)
 rename {content/html/content => dom/html}/test/file_fullscreen-utils.js (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if10.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if11.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if12.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if13.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if14.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if15.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if16.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if17.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if18.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if19.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if4.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if5.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if6.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if7.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if8.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_a_if9.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_b_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_b_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_b_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if4.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if5.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if6.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if7.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_c_if8.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_close.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if10.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if11.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if12.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if13.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if14.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if15.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if16.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if17.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if18.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if19.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if20.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if21.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if22.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if23.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if4.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if5.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if6.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if7.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if8.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_d_if9.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if10.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if11.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if12.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if13.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if14.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if15.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if16.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if4.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if5.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if6.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if7.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if8.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_e_if9.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_f_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_f_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_f_if2.html^headers^ (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_fail.js (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_form_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_form_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_g_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_h_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_j_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_j_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_j_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if1.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if2.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if3.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if4.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if5.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if6.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if7.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if8.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_k_if9.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_navigation_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_navigation_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_navigation_start.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_open_window_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_open_window_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_pass.js (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_redirect.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_redirect.html^headers^ (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_redirect_target.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_top_navigation_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_top_navigation_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_form_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_form_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_navigation_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_navigation_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_top_navigation_fail.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_window_top_navigation_pass.html (100%)
 rename {content/html/content => dom/html}/test/file_iframe_sandbox_worker.js (100%)
 rename {content/html/content => dom/html}/test/file_ignoreuserfocus.html (100%)
 rename {content/html/content => dom/html}/test/file_imports_basics.html (100%)
 rename {content/html/content => dom/html}/test/file_imports_redirect.html (100%)
 create mode 100644 dom/html/test/file_imports_redirect.html^headers^
 rename {content/html/content => dom/html}/test/file_imports_redirected.html (100%)
 rename {content/html/content => dom/html}/test/file_srcdoc-2.html (100%)
 rename {content/html/content => dom/html}/test/file_srcdoc.html (100%)
 rename {content/html/content => dom/html}/test/form_submit_server.sjs (100%)
 rename {content/html/content => dom/html}/test/forms/chrome.ini (100%)
 rename {content/html/content => dom/html}/test/forms/mochitest.ini (100%)
 rename {content/html/content => dom/html}/test/forms/save_restore_radio_groups.sjs (100%)
 rename {content/html/content => dom/html}/test/forms/submit_invalid_file.sjs (100%)
 rename {content/html/content => dom/html}/test/forms/test_autocompleteinfo.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_bug1039548.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_button_attributes_reflection.html (98%)
 rename {content/html/content => dom/html}/test/forms/test_change_event.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_datalist_element.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_experimental_forms_pref.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_form_attribute-1.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_form_attribute-2.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_form_attribute-3.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_form_attribute-4.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_form_attributes_reflection.html (97%)
 rename {content/html/content => dom/html}/test/forms/test_form_named_getter_dynamic.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_formaction_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_formnovalidate_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_attributes_reflection.html (99%)
 rename {content/html/content => dom/html}/test/forms/test_input_autocomplete.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_color_input_change_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_color_picker_initial.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_color_picker_popup.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_color_picker_update.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_defaultValue.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_email.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_event.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_file_picker.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_list_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_data.js (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_key_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_l10n.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_mouse_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_rounding.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_number_validation.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_radio_radiogroup.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_range_attr_order.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_range_key_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_range_mouse_and_touch_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_range_rounding.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_sanitization.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_textarea_set_value_no_scroll.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_typing_sanitization.html (97%)
 rename {content/html/content => dom/html}/test/forms/test_input_untrusted_key_events.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_input_url.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_label_control_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_label_input_controls.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_max_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_maxlength_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_meter_element.html (99%)
 rename {content/html/content => dom/html}/test/forms/test_meter_pseudo-classes.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_min_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_mozistextfield.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_novalidate_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_option_disabled.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_option_index_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_option_text.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_output_element.html (98%)
 rename {content/html/content => dom/html}/test/forms/test_pattern_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_progress_element.html (99%)
 rename {content/html/content => dom/html}/test/forms/test_radio_radionodelist.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_required_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_restore_form_elements.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_save_restore_radio_groups.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_select_selectedOptions.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_select_validation.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_set_range_text.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_step_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_stepup_stepdown.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_submit_invalid_file.html (92%)
 rename {content/html/content => dom/html}/test/forms/test_textarea_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_validation.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_validation_not_in_doc.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_valueAsDate_pref.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_valueasdate_attribute.html (100%)
 rename {content/html/content => dom/html}/test/forms/test_valueasnumber_attribute.html (100%)
 rename {content/html/content => dom/html}/test/image-allow-credentials.png (100%)
 rename {content/html/content => dom/html}/test/image-allow-credentials.png^headers^ (100%)
 rename {content/html/content => dom/html}/test/image.png (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_1_A.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_1_B.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_1_C.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_2_A.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_2_B.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_2_C.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_2_D.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_3_A.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_3_B.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_3_C.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_4_A.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_4_B.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_4_C.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_4_D.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_4_E.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_5_A.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_5_B.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_5_C.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_cycle_5_D.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_encoding.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importA1.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importA2.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importB1.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importB2.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC1.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC10.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC2.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC3.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC4.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC5.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC6.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC7.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC8.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importC9.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importD.html (100%)
 rename {content/html/content => dom/html}/test/imports/file_importE.html (100%)
 rename {content/html/content => dom/html}/test/imports/mochitest.ini (100%)
 rename {content/html/content => dom/html}/test/imports/test_cycle_1.html (100%)
 rename {content/html/content => dom/html}/test/imports/test_cycle_2.html (100%)
 rename {content/html/content => dom/html}/test/imports/test_cycle_3.html (100%)
 rename {content/html/content => dom/html}/test/imports/test_cycle_4.html (100%)
 rename {content/html/content => dom/html}/test/imports/test_cycle_5.html (100%)
 rename {content/html/content => dom/html}/test/imports/test_encoding.html (100%)
 rename {content/html/content => dom/html}/test/mochitest.ini (86%)
 rename {content/html/content => dom/html}/test/nnc_lockup.gif (100%)
 rename {content/html/content => dom/html}/test/reflect.js (100%)
 rename {content/html/content => dom/html}/test/test_a_text.html (100%)
 rename {content/html/content => dom/html}/test/test_allowMedia.html (97%)
 rename {content/html/content => dom/html}/test/test_anchor_href_cache_invalidation.html (100%)
 rename {content/html/content => dom/html}/test/test_anchor_ping.html (99%)
 rename {content/html/content => dom/html}/test/test_applet_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_audio_wakelock.html (100%)
 rename {content/html/content => dom/html}/test/test_base_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_bug1003539.html (100%)
 rename {content/html/content => dom/html}/test/test_bug100533.html (100%)
 rename {content/html/document => dom/html}/test/test_bug1013316.html (100%)
 rename {content/html/content => dom/html}/test/test_bug1045270.html (100%)
 rename {content/html/content => dom/html}/test/test_bug109445.html (100%)
 rename {content/html/content => dom/html}/test/test_bug109445.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug1297.html (100%)
 rename {content/html/content => dom/html}/test/test_bug1366.html (100%)
 rename {content/html/content => dom/html}/test/test_bug1400.html (100%)
 rename {content/html/content => dom/html}/test/test_bug143220.html (100%)
 rename {content/html/document => dom/html}/test/test_bug1682.html (100%)
 rename {content/html/document => dom/html}/test/test_bug172261.html (100%)
 rename {content/html/content => dom/html}/test/test_bug182279.html (100%)
 rename {content/html/document => dom/html}/test/test_bug1823.html (100%)
 rename {content/html/document => dom/html}/test/test_bug196523.html (90%)
 rename {content/html/document => dom/html}/test/test_bug199692.html (100%)
 rename {content/html/content => dom/html}/test/test_bug2082.html (100%)
 rename {content/html/content => dom/html}/test/test_bug209275.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug237071.html (100%)
 rename {content/html/content => dom/html}/test/test_bug242709.html (100%)
 rename {content/html/content => dom/html}/test/test_bug24958.html (100%)
 rename {content/html/document => dom/html}/test/test_bug255820.html (100%)
 rename {content/html/document => dom/html}/test/test_bug259332.html (100%)
 rename {content/html/content => dom/html}/test/test_bug274626.html (100%)
 rename {content/html/content => dom/html}/test/test_bug277724.html (100%)
 rename {content/html/content => dom/html}/test/test_bug277890.html (100%)
 rename {content/html/content => dom/html}/test/test_bug287465.html (100%)
 rename {content/html/content => dom/html}/test/test_bug295561.html (100%)
 rename {content/html/content => dom/html}/test/test_bug297761.html (100%)
 rename {content/html/content => dom/html}/test/test_bug300691-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug300691-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug300691-3.xhtml (100%)
 rename {content/html/document => dom/html}/test/test_bug311681.html (100%)
 rename {content/html/document => dom/html}/test/test_bug311681.xhtml (100%)
 rename {content/html/document => dom/html}/test/test_bug324378.html (100%)
 rename {content/html/content => dom/html}/test/test_bug330705-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332246.html (100%)
 rename {content/html/document => dom/html}/test/test_bug332848.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-3.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-4.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-5.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-6.html (100%)
 rename {content/html/content => dom/html}/test/test_bug332893-7.html (100%)
 rename {content/html/content => dom/html}/test/test_bug3348.html (100%)
 rename {content/html/document => dom/html}/test/test_bug340017.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug340800.html (100%)
 rename {content/html/content => dom/html}/test/test_bug347174.html (100%)
 rename {content/html/content => dom/html}/test/test_bug347174_write.html (100%)
 rename {content/html/content => dom/html}/test/test_bug347174_xsl.html (100%)
 rename {content/html/content => dom/html}/test/test_bug347174_xslp.html (100%)
 rename {content/html/content => dom/html}/test/test_bug353415-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug353415-2.html (100%)
 rename {content/html/document => dom/html}/test/test_bug359657.html (100%)
 rename {content/html/document => dom/html}/test/test_bug369370.html (100%)
 rename {content/html/content => dom/html}/test/test_bug371375.html (100%)
 rename {content/html/content => dom/html}/test/test_bug372098.html (100%)
 rename {content/html/content => dom/html}/test/test_bug373589.html (100%)
 rename {content/html/content => dom/html}/test/test_bug375003-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug375003-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug377624.html (100%)
 rename {content/html/document => dom/html}/test/test_bug380383.html (100%)
 rename {content/html/content => dom/html}/test/test_bug383383.html (100%)
 rename {content/html/content => dom/html}/test/test_bug383383_2.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug384419.html (100%)
 rename {content/html/content => dom/html}/test/test_bug386496.html (100%)
 rename {content/html/content => dom/html}/test/test_bug386728.html (100%)
 rename {content/html/content => dom/html}/test/test_bug386996.html (100%)
 rename {content/html/content => dom/html}/test/test_bug388558.html (100%)
 rename {content/html/content => dom/html}/test/test_bug388746.html (100%)
 rename {content/html/content => dom/html}/test/test_bug388794.html (100%)
 rename {content/html/content => dom/html}/test/test_bug389797.html (100%)
 rename {content/html/content => dom/html}/test/test_bug390975.html (100%)
 rename {content/html/document => dom/html}/test/test_bug391777.html (100%)
 rename {content/html/content => dom/html}/test/test_bug391994.html (100%)
 rename {content/html/content => dom/html}/test/test_bug392567.html (96%)
 rename {content/html/content => dom/html}/test/test_bug394700.html (100%)
 rename {content/html/content => dom/html}/test/test_bug395107.html (100%)
 rename {content/html/content => dom/html}/test/test_bug401160.xhtml (100%)
 rename {content/html/document => dom/html}/test/test_bug402680.html (100%)
 rename {content/html/document => dom/html}/test/test_bug403868.html (100%)
 rename {content/html/document => dom/html}/test/test_bug403868.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug405242.html (100%)
 rename {content/html/content => dom/html}/test/test_bug406596.html (100%)
 rename {content/html/content => dom/html}/test/test_bug417760.html (100%)
 rename {content/html/content => dom/html}/test/test_bug421640.html (100%)
 rename {content/html/content => dom/html}/test/test_bug424698.html (100%)
 rename {content/html/content => dom/html}/test/test_bug428135.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug430351.html (100%)
 rename {content/html/content => dom/html}/test/test_bug430392.html (100%)
 rename {content/html/document => dom/html}/test/test_bug435128.html (100%)
 rename {content/html/content => dom/html}/test/test_bug441930.html (100%)
 rename {content/html/content => dom/html}/test/test_bug442801.html (100%)
 rename {content/html/document => dom/html}/test/test_bug445004.html (82%)
 rename {content/html/document => dom/html}/test/test_bug446483.html (100%)
 rename {content/html/content => dom/html}/test/test_bug448166.html (100%)
 rename {content/html/document => dom/html}/test/test_bug448564.html (100%)
 rename {content/html/content => dom/html}/test/test_bug456229.html (100%)
 rename {content/html/content => dom/html}/test/test_bug458037.xhtml (100%)
 rename {content/html/content => dom/html}/test/test_bug460568.html (100%)
 rename {content/html/document => dom/html}/test/test_bug463104.html (100%)
 rename {content/html/document => dom/html}/test/test_bug478251.html (100%)
 rename {content/html/content => dom/html}/test/test_bug481335.xhtml (100%)
 rename {content/html/document => dom/html}/test/test_bug481440.html (100%)
 rename {content/html/document => dom/html}/test/test_bug481647.html (100%)
 rename {content/html/document => dom/html}/test/test_bug482659.html (100%)
 rename {content/html/document => dom/html}/test/test_bug486741.html (100%)
 rename {content/html/document => dom/html}/test/test_bug489532.html (100%)
 rename {content/html/document => dom/html}/test/test_bug497242.xhtml (100%)
 rename {content/html/document => dom/html}/test/test_bug499092.html (100%)
 rename {content/html/content => dom/html}/test/test_bug500885.html (100%)
 rename {content/html/document => dom/html}/test/test_bug512367.html (100%)
 rename {content/html/content => dom/html}/test/test_bug514856.html (100%)
 rename {content/html/content => dom/html}/test/test_bug518122.html (100%)
 rename {content/html/content => dom/html}/test/test_bug519987.html (100%)
 rename {content/html/content => dom/html}/test/test_bug523771.html (100%)
 rename {content/html/content => dom/html}/test/test_bug529819.html (100%)
 rename {content/html/content => dom/html}/test/test_bug529859.html (100%)
 rename {content/html/content => dom/html}/test/test_bug535043.html (100%)
 rename {content/html/content => dom/html}/test/test_bug536891.html (100%)
 rename {content/html/content => dom/html}/test/test_bug536895.html (100%)
 rename {content/html/content => dom/html}/test/test_bug546995.html (100%)
 rename {content/html/content => dom/html}/test/test_bug547850.html (100%)
 rename {content/html/content => dom/html}/test/test_bug551846.html (100%)
 rename {content/html/content => dom/html}/test/test_bug555567.html (100%)
 rename {content/html/content => dom/html}/test/test_bug556645.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-3.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-4.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-5.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557087-6.html (100%)
 rename {content/html/content => dom/html}/test/test_bug557620.html (100%)
 rename {content/html/content => dom/html}/test/test_bug558788-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug558788-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug560112.html (100%)
 rename {content/html/content => dom/html}/test/test_bug561634.html (100%)
 rename {content/html/content => dom/html}/test/test_bug561636.html (100%)
 rename {content/html/content => dom/html}/test/test_bug561640.html (100%)
 rename {content/html/content => dom/html}/test/test_bug564001.html (100%)
 rename {content/html/content => dom/html}/test/test_bug566046.html (100%)
 rename {content/html/content => dom/html}/test/test_bug567938-1.html (95%)
 rename {content/html/content => dom/html}/test/test_bug567938-2.html (95%)
 rename {content/html/content => dom/html}/test/test_bug567938-3.html (95%)
 rename {content/html/content => dom/html}/test/test_bug567938-4.html (100%)
 rename {content/html/content => dom/html}/test/test_bug569955.html (100%)
 rename {content/html/content => dom/html}/test/test_bug573969.html (100%)
 rename {content/html/document => dom/html}/test/test_bug57600.html (100%)
 rename {content/html/content => dom/html}/test/test_bug579079.html (100%)
 rename {content/html/content => dom/html}/test/test_bug582412-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug582412-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug583514.html (100%)
 rename {content/html/content => dom/html}/test/test_bug583533.html (100%)
 rename {content/html/content => dom/html}/test/test_bug586763.html (100%)
 rename {content/html/content => dom/html}/test/test_bug586786.html (100%)
 rename {content/html/content => dom/html}/test/test_bug587469.html (100%)
 rename {content/html/content => dom/html}/test/test_bug589.html (100%)
 rename {content/html/content => dom/html}/test/test_bug590353-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug590353-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug590363.html (100%)
 rename {content/html/content => dom/html}/test/test_bug592802.html (100%)
 rename {content/html/content => dom/html}/test/test_bug593689.html (100%)
 rename {content/html/content => dom/html}/test/test_bug595429.html (100%)
 rename {content/html/content => dom/html}/test/test_bug595447.html (100%)
 rename {content/html/content => dom/html}/test/test_bug595449.html (100%)
 rename {content/html/content => dom/html}/test/test_bug596350.html (100%)
 rename {content/html/content => dom/html}/test/test_bug596511.html (100%)
 rename {content/html/content => dom/html}/test/test_bug598643.html (100%)
 rename {content/html/content => dom/html}/test/test_bug598833-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug600155.html (100%)
 rename {content/html/content => dom/html}/test/test_bug601030.html (100%)
 rename {content/html/content => dom/html}/test/test_bug605124-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug605124-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug605125-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug605125-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug606817.html (100%)
 rename {content/html/content => dom/html}/test/test_bug607145.html (94%)
 rename {content/html/content => dom/html}/test/test_bug610212.html (100%)
 rename {content/html/content => dom/html}/test/test_bug610687.html (100%)
 rename {content/html/content => dom/html}/test/test_bug611189.html (100%)
 rename {content/html/content => dom/html}/test/test_bug612730.html (100%)
 rename {content/html/content => dom/html}/test/test_bug613113.html (100%)
 rename {content/html/content => dom/html}/test/test_bug613722.html (100%)
 rename {content/html/content => dom/html}/test/test_bug613979.html (100%)
 rename {content/html/content => dom/html}/test/test_bug615595.html (100%)
 rename {content/html/content => dom/html}/test/test_bug615833.html (100%)
 rename {content/html/content => dom/html}/test/test_bug617528.html (100%)
 rename {content/html/content => dom/html}/test/test_bug618948.html (100%)
 rename {content/html/content => dom/html}/test/test_bug619278.html (100%)
 rename {content/html/content => dom/html}/test/test_bug622558.html (100%)
 rename {content/html/content => dom/html}/test/test_bug622597.html (100%)
 rename {content/html/content => dom/html}/test/test_bug623291.html (100%)
 rename {content/html/content => dom/html}/test/test_bug6296.html (100%)
 rename {content/html/content => dom/html}/test/test_bug629801.html (100%)
 rename {content/html/content => dom/html}/test/test_bug633058.html (100%)
 rename {content/html/content => dom/html}/test/test_bug636336.html (100%)
 rename {content/html/content => dom/html}/test/test_bug641219.html (100%)
 rename {content/html/content => dom/html}/test/test_bug643051.html (100%)
 rename {content/html/content => dom/html}/test/test_bug646157.html (100%)
 rename {content/html/content => dom/html}/test/test_bug649134.html (100%)
 rename {content/html/content => dom/html}/test/test_bug651956.html (100%)
 rename {content/html/content => dom/html}/test/test_bug658746.html (100%)
 rename {content/html/content => dom/html}/test/test_bug659596.html (100%)
 rename {content/html/content => dom/html}/test/test_bug659743.xml (100%)
 rename {content/html/content => dom/html}/test/test_bug660663.html (100%)
 rename {content/html/content => dom/html}/test/test_bug660959-1.html (100%)
 rename {content/html/content => dom/html}/test/test_bug660959-2.html (100%)
 rename {content/html/content => dom/html}/test/test_bug660959-3.html (100%)
 rename {content/html/content => dom/html}/test/test_bug666200.html (100%)
 rename {content/html/content => dom/html}/test/test_bug666666.html (100%)
 rename {content/html/content => dom/html}/test/test_bug669012.html (100%)
 rename {content/html/content => dom/html}/test/test_bug674558.html (100%)
 rename {content/html/content => dom/html}/test/test_bug674927.html (100%)
 rename {content/html/content => dom/html}/test/test_bug677463.html (100%)
 rename {content/html/document => dom/html}/test/test_bug677495-1.html (100%)
 rename {content/html/document => dom/html}/test/test_bug677495.html (100%)
 rename {content/html/content => dom/html}/test/test_bug677658.html (100%)
 rename {content/html/content => dom/html}/test/test_bug682886.html (100%)
 rename {content/html/content => dom/html}/test/test_bug691.html (100%)
 rename {content/html/content => dom/html}/test/test_bug694.html (100%)
 rename {content/html/content => dom/html}/test/test_bug694503.html (100%)
 rename {content/html/content => dom/html}/test/test_bug696.html (100%)
 rename {content/html/content => dom/html}/test/test_bug717819.html (100%)
 rename {content/html/document => dom/html}/test/test_bug741266.html (100%)
 rename {content/html/content => dom/html}/test/test_bug742030.html (100%)
 rename {content/html/content => dom/html}/test/test_bug742549.html (100%)
 rename {content/html/content => dom/html}/test/test_bug745685.html (100%)
 rename {content/html/content => dom/html}/test/test_bug763626.html (100%)
 rename {content/html/document => dom/html}/test/test_bug765780.html (100%)
 rename {content/html/content => dom/html}/test/test_bug780993.html (100%)
 rename {content/html/content => dom/html}/test/test_bug787134.html (100%)
 rename {content/html/content => dom/html}/test/test_bug797113.html (100%)
 rename {content/html/content => dom/html}/test/test_bug803677.html (100%)
 rename {content/html/content => dom/html}/test/test_bug821307.html (100%)
 rename {content/html/content => dom/html}/test/test_bug827126.html (100%)
 rename {content/html/content => dom/html}/test/test_bug827426.html (100%)
 rename {content/html/content => dom/html}/test/test_bug838582.html (100%)
 rename {content/html/content => dom/html}/test/test_bug839371.html (100%)
 rename {content/html/content => dom/html}/test/test_bug839913.html (100%)
 rename {content/html/content => dom/html}/test/test_bug840877.html (100%)
 rename {content/html/content => dom/html}/test/test_bug841466.html (100%)
 rename {content/html/content => dom/html}/test/test_bug845057.html (100%)
 rename {content/html/content => dom/html}/test/test_bug869040.html (100%)
 rename {content/html/content => dom/html}/test/test_bug870787.html (100%)
 rename {content/html/document => dom/html}/test/test_bug871161.html (100%)
 rename {content/html/content => dom/html}/test/test_bug874758.html (100%)
 rename {content/html/content => dom/html}/test/test_bug879319.html (100%)
 rename {content/html/content => dom/html}/test/test_bug885024.html (100%)
 rename {content/html/content => dom/html}/test/test_bug893537.html (100%)
 rename {content/html/content => dom/html}/test/test_bug95530.html (100%)
 rename {content/html/content => dom/html}/test/test_bug969346.html (100%)
 rename {content/html/content => dom/html}/test/test_bug982039.html (100%)
 rename {content/html/content => dom/html}/test/test_change_crossorigin.html (92%)
 rename {content/html/content => dom/html}/test/test_checked.html (100%)
 rename {content/html/content => dom/html}/test/test_dir_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_dl_attributes_reflection.html (100%)
 rename {content/html/document => dom/html}/test/test_document-element-inserted.html (100%)
 rename {content/html/document => dom/html}/test/test_document.watch.html (100%)
 rename {content/html/document => dom/html}/test/test_documentAll.html (100%)
 rename {content/html/content => dom/html}/test/test_element_prototype.html (100%)
 rename {content/html/content => dom/html}/test/test_embed_attributes_reflection.html (100%)
 rename {content/html/document => dom/html}/test/test_form-parsing.html (100%)
 rename {content/html/content => dom/html}/test/test_formData.html (100%)
 rename {content/html/content => dom/html}/test/test_formSubmission.html (100%)
 rename {content/html/content => dom/html}/test/test_formSubmission2.html (100%)
 rename {content/html/content => dom/html}/test/test_formelements.html (100%)
 rename {content/html/content => dom/html}/test/test_fragment_form_pointer.html (100%)
 rename {content/html/content => dom/html}/test/test_fullscreen-api.html (100%)
 rename {content/html/content => dom/html}/test/test_hidden.html (100%)
 rename {content/html/content => dom/html}/test/test_html_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_htmlcollection.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_general.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_inheritance.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_modal.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_navigation.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_navigation2.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_plugins.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_popups.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_popups_inheritance.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_redirect.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_same_origin.html (100%)
 rename {content/html/content => dom/html}/test/test_iframe_sandbox_workers.html (100%)
 rename {content/html/content => dom/html}/test/test_ignoreuserfocus.html (100%)
 rename {content/html/content => dom/html}/test/test_imageSrcSet.html (100%)
 rename {content/html/content => dom/html}/test/test_img_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_imports_basics.html (100%)
 rename {content/html/content => dom/html}/test/test_imports_nested.html (100%)
 rename {content/html/content => dom/html}/test/test_imports_nested_2.html (100%)
 rename {content/html/content => dom/html}/test/test_imports_nonhttp.html (100%)
 rename {content/html/content => dom/html}/test/test_imports_redirect.html (86%)
 rename {content/html/content => dom/html}/test/test_input_files_not_nsIFile.html (100%)
 rename {content/html/content => dom/html}/test/test_li_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_link_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_link_sizes.html (100%)
 rename {content/html/content => dom/html}/test/test_map_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_meta_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_mod_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_mozaudiochannel.html (100%)
 rename {content/html/content => dom/html}/test/test_named_options.html (100%)
 rename {content/html/content => dom/html}/test/test_nested_invalid_fieldsets.html (100%)
 rename {content/html/document => dom/html}/test/test_non-ascii-cookie.html (100%)
 rename {content/html/document => dom/html}/test/test_non-ascii-cookie.html^headers^ (100%)
 rename {content/html/content => dom/html}/test/test_object_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_object_plugin_nav.html (100%)
 rename {content/html/content => dom/html}/test/test_ol_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_option_defaultSelected.html (100%)
 rename {content/html/content => dom/html}/test/test_option_selected_state.html (100%)
 rename {content/html/content => dom/html}/test/test_param_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_plugin.tst (100%)
 rename {content/html/content => dom/html}/test/test_q_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_restore_from_parser_fragment.html (100%)
 rename {content/html/content => dom/html}/test/test_rowscollection.html (100%)
 rename {content/html/content => dom/html}/test/test_srcdoc-2.html (100%)
 rename {content/html/content => dom/html}/test/test_srcdoc.html (100%)
 rename {content/html/content => dom/html}/test/test_style_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_track.html (94%)
 rename {content/html/content => dom/html}/test/test_track_disabled.html (100%)
 rename {content/html/content => dom/html}/test/test_ul_attributes_reflection.html (100%)
 rename {content/html/content => dom/html}/test/test_undoManager.html (100%)
 rename {content/html/content => dom/html}/test/test_video_wakelock.html (100%)
 rename {content/html/document => dom/html}/test/test_viewport.html (100%)
 rename {content/html/content => dom/html}/test/wakelock.ogg (100%)
 rename {content/html/content => dom/html}/test/wakelock.ogv (100%)

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 47612812e53..f66722ff8d1 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -141,7 +141,6 @@
 @BINPATH@/components/composer.xpt
 @BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_xslt.xpt
 @BINPATH@/components/cookie.xpt
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 52dd95b5b31..732824f764f 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -186,7 +186,6 @@
 @BINPATH@/components/composer.xpt
 @BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_geckomediaplugins.xpt
 #ifdef MOZ_WEBRTC
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
index 50498603d0c..24daca5c77c 100644
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -208,10 +208,9 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/caps',
-    '/content/html/content/src',
-    '/content/html/document/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/html',
     '/dom/ipc',
     '/dom/svg',
     '/dom/workers',
diff --git a/content/base/test/fileutils.js b/content/base/test/fileutils.js
index 45c4f74eb40..cf2476528d3 100644
--- a/content/base/test/fileutils.js
+++ b/content/base/test/fileutils.js
@@ -40,7 +40,7 @@ function testFile(file, contents, test) {
                          contentType: file.type || "application/octet-stream" }]);
     testHasRun();
   }
-  xhr.open("POST", "../../html/content/test/form_submit_server.sjs");
+  xhr.open("POST", "../../../dom/html/test/form_submit_server.sjs");
   var fd = new FormData;
   fd.append("hello", "world");
   fd.append("myfile", file);
diff --git a/content/html/content/moz.build b/content/html/content/moz.build
deleted file mode 100644
index 7318432f13a..00000000000
--- a/content/html/content/moz.build
+++ /dev/null
@@ -1,20 +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 += ['public', 'src']
-
-MOCHITEST_MANIFESTS += [
-    'test/forms/mochitest.ini',
-    'test/imports/mochitest.ini',
-    'test/mochitest.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'test/chrome.ini',
-    'test/forms/chrome.ini',
-]
-
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff --git a/content/html/content/public/moz.build b/content/html/content/public/moz.build
deleted file mode 100644
index 27762a01850..00000000000
--- a/content/html/content/public/moz.build
+++ /dev/null
@@ -1,34 +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/.
-
-XPIDL_SOURCES += [
-    'nsIFormSubmitObserver.idl',
-    'nsIHTMLMenu.idl',
-    'nsIMenuBuilder.idl',
-    'nsIPhonetic.idl',
-]
-
-XPIDL_MODULE = 'content_html'
-
-EXPORTS += [
-    'nsFormSubmission.h',
-    'nsIConstraintValidation.h',
-    'nsIForm.h',
-    'nsIFormControl.h',
-    'nsIFormProcessor.h',
-    'nsIHTMLCollection.h',
-    'nsIRadioGroupContainer.h',
-    'nsIRadioVisitor.h',
-    'nsITextControlElement.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'HTMLAudioElement.h',
-    'HTMLCanvasElement.h',
-    'HTMLMediaElement.h',
-    'HTMLVideoElement.h',
-]
-
diff --git a/content/html/content/test/file_imports_redirect.html^headers^ b/content/html/content/test/file_imports_redirect.html^headers^
deleted file mode 100644
index 3a348336451..00000000000
--- a/content/html/content/test/file_imports_redirect.html^headers^
+++ /dev/null
@@ -1,2 +0,0 @@
-HTTP 301 Moved Permanently
-Location: http://mochi.test:8888/tests/content/html/content/test/file_imports_redirected.html
diff --git a/content/html/document/crashtests/crashtests.list b/content/html/document/crashtests/crashtests.list
deleted file mode 100644
index c050a3a8ab9..00000000000
--- a/content/html/document/crashtests/crashtests.list
+++ /dev/null
@@ -1,16 +0,0 @@
-load 285166-1.html
-load 294235-1.html
-load 378993-1.xhtml
-load 388183-1.html
-load 395340-1.html
-load 399694-1.html
-load 407053.html
-load 448564.html
-load 468562-1.html
-load 468562-2.html
-load 494225.html
-load 495543.svg
-load 564461.xhtml
-load 601422.html
-load 631421.html
-load 741218.json
diff --git a/content/html/document/moz.build b/content/html/document/moz.build
deleted file mode 100644
index 7edd2cd6939..00000000000
--- a/content/html/document/moz.build
+++ /dev/null
@@ -1,10 +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 += ['public', 'src']
-
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff --git a/content/html/document/public/moz.build b/content/html/document/public/moz.build
deleted file mode 100644
index b2b0b968e57..00000000000
--- a/content/html/document/public/moz.build
+++ /dev/null
@@ -1,12 +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/.
-
-XPIDL_SOURCES += [
-    'nsIImageDocument.idl',
-]
-
-XPIDL_MODULE = 'content_htmldoc'
-
diff --git a/content/html/document/reftests/reftests.list b/content/html/document/reftests/reftests.list
deleted file mode 100644
index 13dfc18e1a1..00000000000
--- a/content/html/document/reftests/reftests.list
+++ /dev/null
@@ -1,12 +0,0 @@
-== bug448564-1_malformed.html bug448564-1_well-formed.html
-== bug448564-1_malformed.html bug448564-1_ideal.html
-
-== bug448564-4a.html          bug448564-4b.html
-== bug502168-1_malformed.html bug502168-1_well-formed.html
-
-# Test that image documents taken into account CSS properties like
-# image-orientation when determining the size of the image.
-# (Fuzzy necessary due to pixel-wise comparison of different JPEGs.
-# The vast majority of the fuzziness comes from Linux and WinXP.)
-fuzzy(1,149) == bug917595-iframe-1.html    bug917595-1-ref.html
-fuzzy(3,640) == bug917595-exif-rotated.jpg bug917595-pixel-rotated.jpg
diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build
deleted file mode 100644
index a912c153127..00000000000
--- a/content/html/document/src/moz.build
+++ /dev/null
@@ -1,43 +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/.
-
-EXPORTS += [
-    'nsIHTMLDocument.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'HTMLAllCollection.h',
-    'ImageDocument.h',
-]
-
-UNIFIED_SOURCES += [
-    'HTMLAllCollection.cpp',
-    'ImageDocument.cpp',
-    'MediaDocument.cpp',
-    'nsHTMLContentSink.cpp',
-    'nsHTMLDocument.cpp',
-    'VideoDocument.cpp',
-]
-
-SOURCES += [
-    # Includes npapi.h.
-    'PluginDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '../../content/src',
-    '/caps',
-    '/content/base/src',
-    '/docshell/base',
-    '/dom/base',
-    '/layout/style',
-]
-
-FINAL_LIBRARY = 'xul'
diff --git a/content/html/document/test/browser.ini b/content/html/document/test/browser.ini
deleted file mode 100644
index 8eda6edee0e..00000000000
--- a/content/html/document/test/browser.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-support-files = bug592641_img.jpg
-
-[browser_bug592641.js]
-[browser_bug1081537.js]
diff --git a/content/html/document/test/mochitest.ini b/content/html/document/test/mochitest.ini
deleted file mode 100644
index ad41a87d74c..00000000000
--- a/content/html/document/test/mochitest.ini
+++ /dev/null
@@ -1,82 +0,0 @@
-[DEFAULT]
-support-files =
-  bug196523-subframe.html
-  bug199692-nested.html
-  bug199692-nested-d2.html
-  bug199692-popup.html
-  bug199692-scrolled.html
-  bug369370-popup.png
-  bug445004-inner.js
-  bug445004-outer-rel.html
-  bug445004-outer-abs.html
-  bug445004-outer-write.html
-  bug445004-inner.html
-  bug446483-iframe.html
-  bug448564-iframe-1.html
-  bug448564-iframe-2.html
-  bug448564-iframe-3.html
-  bug448564-echo.sjs
-  bug448564-submit.js
-  bug499092.xml
-  bug499092.html
-  test_non-ascii-cookie.html^headers^
-
-[test_bug1682.html]
-[test_bug1823.html]
-[test_bug57600.html]
-[test_bug196523.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
-[test_bug199692.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #bug 811644 #Bug 931116, b2g desktop specific, initial triage
-[test_bug172261.html]
-[test_bug255820.html]
-[test_bug259332.html]
-[test_bug311681.html]
-[test_bug311681.xhtml]
-[test_bug324378.html]
-[test_bug332848.xhtml]
-[test_bug340017.xhtml]
-[test_bug359657.html]
-[test_bug369370.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s
-[test_bug380383.html]
-[test_bug391777.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
-[test_bug402680.html]
-[test_bug403868.html]
-[test_bug403868.xhtml]
-[test_bug435128.html]
-skip-if = true # Disabled for timeouts.
-[test_bug463104.html]
-[test_form-parsing.html]
-[test_viewport.html]
-[test_documentAll.html]
-[test_document-element-inserted.html]
-[test_document.watch.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(expects document.cookie setting to work) b2g-desktop(expects document.cookie setting to work)
-[test_bug445004.html]
-skip-if = true || toolkit == 'android' # Disabled permanently (bug 559932).
-[test_bug446483.html]
-skip-if = toolkit == 'android'
-[test_bug448564.html]
-[test_bug478251.html]
-[test_bug481440.html]
-[test_bug481647.html]
-[test_bug482659.html]
-[test_bug486741.html]
-[test_bug489532.html]
-[test_bug497242.xhtml]
-[test_bug499092.html]
-[test_bug512367.html]
-[test_bug677495.html]
-[test_bug677495-1.html]
-[test_bug741266.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs control of popup window size) b2g-debug(needs control of popup window size) b2g-desktop(needs control of popup window size)
-[test_non-ascii-cookie.html]
-skip-if = buildapp == 'b2g' || e10s
-[test_bug765780.html]
-[test_bug871161.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
-support-files = file_bug871161-1.html file_bug871161-2.html
-
-[test_bug1013316.html]
diff --git a/content/html/moz.build b/content/html/moz.build
deleted file mode 100644
index 4b870635ae5..00000000000
--- a/content/html/moz.build
+++ /dev/null
@@ -1,7 +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 += ['content', 'document']
diff --git a/content/moz.build b/content/moz.build
index 146867aeb02..9c238a6ebec 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -6,7 +6,6 @@
 
 DIRS += [
     'base',
-    'html',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/dom/base/moz.build b/dom/base/moz.build
index f53220d9348..f0f0b07ffce 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -155,9 +155,9 @@ LOCAL_INCLUDES += [
     '../workers',
     '../xbl',
     '/content/base/src',
-    '/content/html/document/src',
     '/docshell/base',
     '/dom/geolocation',
+    '/dom/html',
     '/dom/storage',
     '/dom/xul',
     '/layout/base',
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 58716b1a9c0..740ba944341 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -42,14 +42,13 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
-    '/content/html/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/canvas',
     '/dom/geolocation',
+    '/dom/html',
     '/dom/indexedDB',
     '/dom/media/webaudio',
     '/dom/media/webspeech/recognition',
diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build
index 2347913d3ec..34ef32a803e 100644
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -26,7 +26,7 @@ FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../bluetooth',
-    '/content/html/content/src',
+    '/dom/html',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index d6039b5481e..4d8563a0a0f 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -125,8 +125,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
     '/dom/base',
+    '/dom/html',
     '/dom/svg',
     '/dom/xul',
     '/gfx/gl',
diff --git a/dom/events/moz.build b/dom/events/moz.build
index 8b405e877b3..9dc4c977a33 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -131,8 +131,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
     '/dom/base',
+    '/dom/html',
     '/dom/settings',
     '/dom/storage',
     '/dom/workers',
diff --git a/content/html/document/src/HTMLAllCollection.cpp b/dom/html/HTMLAllCollection.cpp
similarity index 100%
rename from content/html/document/src/HTMLAllCollection.cpp
rename to dom/html/HTMLAllCollection.cpp
diff --git a/content/html/document/src/HTMLAllCollection.h b/dom/html/HTMLAllCollection.h
similarity index 100%
rename from content/html/document/src/HTMLAllCollection.h
rename to dom/html/HTMLAllCollection.h
diff --git a/content/html/content/src/HTMLAnchorElement.cpp b/dom/html/HTMLAnchorElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLAnchorElement.cpp
rename to dom/html/HTMLAnchorElement.cpp
diff --git a/content/html/content/src/HTMLAnchorElement.h b/dom/html/HTMLAnchorElement.h
similarity index 100%
rename from content/html/content/src/HTMLAnchorElement.h
rename to dom/html/HTMLAnchorElement.h
diff --git a/content/html/content/src/HTMLAreaElement.cpp b/dom/html/HTMLAreaElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLAreaElement.cpp
rename to dom/html/HTMLAreaElement.cpp
diff --git a/content/html/content/src/HTMLAreaElement.h b/dom/html/HTMLAreaElement.h
similarity index 100%
rename from content/html/content/src/HTMLAreaElement.h
rename to dom/html/HTMLAreaElement.h
diff --git a/content/html/content/src/HTMLAudioElement.cpp b/dom/html/HTMLAudioElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLAudioElement.cpp
rename to dom/html/HTMLAudioElement.cpp
diff --git a/content/html/content/public/HTMLAudioElement.h b/dom/html/HTMLAudioElement.h
similarity index 100%
rename from content/html/content/public/HTMLAudioElement.h
rename to dom/html/HTMLAudioElement.h
diff --git a/content/html/content/src/HTMLBRElement.cpp b/dom/html/HTMLBRElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLBRElement.cpp
rename to dom/html/HTMLBRElement.cpp
diff --git a/content/html/content/src/HTMLBRElement.h b/dom/html/HTMLBRElement.h
similarity index 100%
rename from content/html/content/src/HTMLBRElement.h
rename to dom/html/HTMLBRElement.h
diff --git a/content/html/content/src/HTMLBodyElement.cpp b/dom/html/HTMLBodyElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLBodyElement.cpp
rename to dom/html/HTMLBodyElement.cpp
diff --git a/content/html/content/src/HTMLBodyElement.h b/dom/html/HTMLBodyElement.h
similarity index 100%
rename from content/html/content/src/HTMLBodyElement.h
rename to dom/html/HTMLBodyElement.h
diff --git a/content/html/content/src/HTMLButtonElement.cpp b/dom/html/HTMLButtonElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLButtonElement.cpp
rename to dom/html/HTMLButtonElement.cpp
diff --git a/content/html/content/src/HTMLButtonElement.h b/dom/html/HTMLButtonElement.h
similarity index 100%
rename from content/html/content/src/HTMLButtonElement.h
rename to dom/html/HTMLButtonElement.h
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLCanvasElement.cpp
rename to dom/html/HTMLCanvasElement.cpp
diff --git a/content/html/content/public/HTMLCanvasElement.h b/dom/html/HTMLCanvasElement.h
similarity index 100%
rename from content/html/content/public/HTMLCanvasElement.h
rename to dom/html/HTMLCanvasElement.h
diff --git a/content/html/content/src/HTMLContentElement.cpp b/dom/html/HTMLContentElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLContentElement.cpp
rename to dom/html/HTMLContentElement.cpp
diff --git a/content/html/content/src/HTMLContentElement.h b/dom/html/HTMLContentElement.h
similarity index 100%
rename from content/html/content/src/HTMLContentElement.h
rename to dom/html/HTMLContentElement.h
diff --git a/content/html/content/src/HTMLDataElement.cpp b/dom/html/HTMLDataElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLDataElement.cpp
rename to dom/html/HTMLDataElement.cpp
diff --git a/content/html/content/src/HTMLDataElement.h b/dom/html/HTMLDataElement.h
similarity index 100%
rename from content/html/content/src/HTMLDataElement.h
rename to dom/html/HTMLDataElement.h
diff --git a/content/html/content/src/HTMLDataListElement.cpp b/dom/html/HTMLDataListElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLDataListElement.cpp
rename to dom/html/HTMLDataListElement.cpp
diff --git a/content/html/content/src/HTMLDataListElement.h b/dom/html/HTMLDataListElement.h
similarity index 100%
rename from content/html/content/src/HTMLDataListElement.h
rename to dom/html/HTMLDataListElement.h
diff --git a/content/html/content/src/HTMLDivElement.cpp b/dom/html/HTMLDivElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLDivElement.cpp
rename to dom/html/HTMLDivElement.cpp
diff --git a/content/html/content/src/HTMLDivElement.h b/dom/html/HTMLDivElement.h
similarity index 100%
rename from content/html/content/src/HTMLDivElement.h
rename to dom/html/HTMLDivElement.h
diff --git a/content/html/content/src/HTMLElement.cpp b/dom/html/HTMLElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLElement.cpp
rename to dom/html/HTMLElement.cpp
diff --git a/content/html/content/src/HTMLFieldSetElement.cpp b/dom/html/HTMLFieldSetElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLFieldSetElement.cpp
rename to dom/html/HTMLFieldSetElement.cpp
diff --git a/content/html/content/src/HTMLFieldSetElement.h b/dom/html/HTMLFieldSetElement.h
similarity index 100%
rename from content/html/content/src/HTMLFieldSetElement.h
rename to dom/html/HTMLFieldSetElement.h
diff --git a/content/html/content/src/HTMLFontElement.cpp b/dom/html/HTMLFontElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLFontElement.cpp
rename to dom/html/HTMLFontElement.cpp
diff --git a/content/html/content/src/HTMLFontElement.h b/dom/html/HTMLFontElement.h
similarity index 100%
rename from content/html/content/src/HTMLFontElement.h
rename to dom/html/HTMLFontElement.h
diff --git a/content/html/content/src/HTMLFormControlsCollection.cpp b/dom/html/HTMLFormControlsCollection.cpp
similarity index 100%
rename from content/html/content/src/HTMLFormControlsCollection.cpp
rename to dom/html/HTMLFormControlsCollection.cpp
diff --git a/content/html/content/src/HTMLFormControlsCollection.h b/dom/html/HTMLFormControlsCollection.h
similarity index 100%
rename from content/html/content/src/HTMLFormControlsCollection.h
rename to dom/html/HTMLFormControlsCollection.h
diff --git a/content/html/content/src/HTMLFormElement.cpp b/dom/html/HTMLFormElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLFormElement.cpp
rename to dom/html/HTMLFormElement.cpp
diff --git a/content/html/content/src/HTMLFormElement.h b/dom/html/HTMLFormElement.h
similarity index 100%
rename from content/html/content/src/HTMLFormElement.h
rename to dom/html/HTMLFormElement.h
diff --git a/content/html/content/src/HTMLFrameElement.cpp b/dom/html/HTMLFrameElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLFrameElement.cpp
rename to dom/html/HTMLFrameElement.cpp
diff --git a/content/html/content/src/HTMLFrameElement.h b/dom/html/HTMLFrameElement.h
similarity index 100%
rename from content/html/content/src/HTMLFrameElement.h
rename to dom/html/HTMLFrameElement.h
diff --git a/content/html/content/src/HTMLFrameSetElement.cpp b/dom/html/HTMLFrameSetElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLFrameSetElement.cpp
rename to dom/html/HTMLFrameSetElement.cpp
diff --git a/content/html/content/src/HTMLFrameSetElement.h b/dom/html/HTMLFrameSetElement.h
similarity index 100%
rename from content/html/content/src/HTMLFrameSetElement.h
rename to dom/html/HTMLFrameSetElement.h
diff --git a/content/html/content/src/HTMLHRElement.cpp b/dom/html/HTMLHRElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLHRElement.cpp
rename to dom/html/HTMLHRElement.cpp
diff --git a/content/html/content/src/HTMLHRElement.h b/dom/html/HTMLHRElement.h
similarity index 100%
rename from content/html/content/src/HTMLHRElement.h
rename to dom/html/HTMLHRElement.h
diff --git a/content/html/content/src/HTMLHeadingElement.cpp b/dom/html/HTMLHeadingElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLHeadingElement.cpp
rename to dom/html/HTMLHeadingElement.cpp
diff --git a/content/html/content/src/HTMLHeadingElement.h b/dom/html/HTMLHeadingElement.h
similarity index 100%
rename from content/html/content/src/HTMLHeadingElement.h
rename to dom/html/HTMLHeadingElement.h
diff --git a/content/html/content/src/HTMLIFrameElement.cpp b/dom/html/HTMLIFrameElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLIFrameElement.cpp
rename to dom/html/HTMLIFrameElement.cpp
diff --git a/content/html/content/src/HTMLIFrameElement.h b/dom/html/HTMLIFrameElement.h
similarity index 100%
rename from content/html/content/src/HTMLIFrameElement.h
rename to dom/html/HTMLIFrameElement.h
diff --git a/content/html/content/src/HTMLImageElement.cpp b/dom/html/HTMLImageElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLImageElement.cpp
rename to dom/html/HTMLImageElement.cpp
diff --git a/content/html/content/src/HTMLImageElement.h b/dom/html/HTMLImageElement.h
similarity index 100%
rename from content/html/content/src/HTMLImageElement.h
rename to dom/html/HTMLImageElement.h
diff --git a/content/html/content/src/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLInputElement.cpp
rename to dom/html/HTMLInputElement.cpp
diff --git a/content/html/content/src/HTMLInputElement.h b/dom/html/HTMLInputElement.h
similarity index 100%
rename from content/html/content/src/HTMLInputElement.h
rename to dom/html/HTMLInputElement.h
diff --git a/content/html/content/src/HTMLLIElement.cpp b/dom/html/HTMLLIElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLLIElement.cpp
rename to dom/html/HTMLLIElement.cpp
diff --git a/content/html/content/src/HTMLLIElement.h b/dom/html/HTMLLIElement.h
similarity index 100%
rename from content/html/content/src/HTMLLIElement.h
rename to dom/html/HTMLLIElement.h
diff --git a/content/html/content/src/HTMLLabelElement.cpp b/dom/html/HTMLLabelElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLLabelElement.cpp
rename to dom/html/HTMLLabelElement.cpp
diff --git a/content/html/content/src/HTMLLabelElement.h b/dom/html/HTMLLabelElement.h
similarity index 100%
rename from content/html/content/src/HTMLLabelElement.h
rename to dom/html/HTMLLabelElement.h
diff --git a/content/html/content/src/HTMLLegendElement.cpp b/dom/html/HTMLLegendElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLLegendElement.cpp
rename to dom/html/HTMLLegendElement.cpp
diff --git a/content/html/content/src/HTMLLegendElement.h b/dom/html/HTMLLegendElement.h
similarity index 100%
rename from content/html/content/src/HTMLLegendElement.h
rename to dom/html/HTMLLegendElement.h
diff --git a/content/html/content/src/HTMLLinkElement.cpp b/dom/html/HTMLLinkElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLLinkElement.cpp
rename to dom/html/HTMLLinkElement.cpp
diff --git a/content/html/content/src/HTMLLinkElement.h b/dom/html/HTMLLinkElement.h
similarity index 100%
rename from content/html/content/src/HTMLLinkElement.h
rename to dom/html/HTMLLinkElement.h
diff --git a/content/html/content/src/HTMLMapElement.cpp b/dom/html/HTMLMapElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMapElement.cpp
rename to dom/html/HTMLMapElement.cpp
diff --git a/content/html/content/src/HTMLMapElement.h b/dom/html/HTMLMapElement.h
similarity index 100%
rename from content/html/content/src/HTMLMapElement.h
rename to dom/html/HTMLMapElement.h
diff --git a/content/html/content/src/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMediaElement.cpp
rename to dom/html/HTMLMediaElement.cpp
diff --git a/content/html/content/public/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
similarity index 100%
rename from content/html/content/public/HTMLMediaElement.h
rename to dom/html/HTMLMediaElement.h
diff --git a/content/html/content/src/HTMLMenuElement.cpp b/dom/html/HTMLMenuElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMenuElement.cpp
rename to dom/html/HTMLMenuElement.cpp
diff --git a/content/html/content/src/HTMLMenuElement.h b/dom/html/HTMLMenuElement.h
similarity index 100%
rename from content/html/content/src/HTMLMenuElement.h
rename to dom/html/HTMLMenuElement.h
diff --git a/content/html/content/src/HTMLMenuItemElement.cpp b/dom/html/HTMLMenuItemElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMenuItemElement.cpp
rename to dom/html/HTMLMenuItemElement.cpp
diff --git a/content/html/content/src/HTMLMenuItemElement.h b/dom/html/HTMLMenuItemElement.h
similarity index 100%
rename from content/html/content/src/HTMLMenuItemElement.h
rename to dom/html/HTMLMenuItemElement.h
diff --git a/content/html/content/src/HTMLMetaElement.cpp b/dom/html/HTMLMetaElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMetaElement.cpp
rename to dom/html/HTMLMetaElement.cpp
diff --git a/content/html/content/src/HTMLMetaElement.h b/dom/html/HTMLMetaElement.h
similarity index 100%
rename from content/html/content/src/HTMLMetaElement.h
rename to dom/html/HTMLMetaElement.h
diff --git a/content/html/content/src/HTMLMeterElement.cpp b/dom/html/HTMLMeterElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLMeterElement.cpp
rename to dom/html/HTMLMeterElement.cpp
diff --git a/content/html/content/src/HTMLMeterElement.h b/dom/html/HTMLMeterElement.h
similarity index 100%
rename from content/html/content/src/HTMLMeterElement.h
rename to dom/html/HTMLMeterElement.h
diff --git a/content/html/content/src/HTMLModElement.cpp b/dom/html/HTMLModElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLModElement.cpp
rename to dom/html/HTMLModElement.cpp
diff --git a/content/html/content/src/HTMLModElement.h b/dom/html/HTMLModElement.h
similarity index 100%
rename from content/html/content/src/HTMLModElement.h
rename to dom/html/HTMLModElement.h
diff --git a/content/html/content/src/HTMLObjectElement.cpp b/dom/html/HTMLObjectElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLObjectElement.cpp
rename to dom/html/HTMLObjectElement.cpp
diff --git a/content/html/content/src/HTMLObjectElement.h b/dom/html/HTMLObjectElement.h
similarity index 100%
rename from content/html/content/src/HTMLObjectElement.h
rename to dom/html/HTMLObjectElement.h
diff --git a/content/html/content/src/HTMLOptGroupElement.cpp b/dom/html/HTMLOptGroupElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLOptGroupElement.cpp
rename to dom/html/HTMLOptGroupElement.cpp
diff --git a/content/html/content/src/HTMLOptGroupElement.h b/dom/html/HTMLOptGroupElement.h
similarity index 100%
rename from content/html/content/src/HTMLOptGroupElement.h
rename to dom/html/HTMLOptGroupElement.h
diff --git a/content/html/content/src/HTMLOptionElement.cpp b/dom/html/HTMLOptionElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLOptionElement.cpp
rename to dom/html/HTMLOptionElement.cpp
diff --git a/content/html/content/src/HTMLOptionElement.h b/dom/html/HTMLOptionElement.h
similarity index 100%
rename from content/html/content/src/HTMLOptionElement.h
rename to dom/html/HTMLOptionElement.h
diff --git a/content/html/content/src/HTMLOptionsCollection.cpp b/dom/html/HTMLOptionsCollection.cpp
similarity index 100%
rename from content/html/content/src/HTMLOptionsCollection.cpp
rename to dom/html/HTMLOptionsCollection.cpp
diff --git a/content/html/content/src/HTMLOptionsCollection.h b/dom/html/HTMLOptionsCollection.h
similarity index 100%
rename from content/html/content/src/HTMLOptionsCollection.h
rename to dom/html/HTMLOptionsCollection.h
diff --git a/content/html/content/src/HTMLOutputElement.cpp b/dom/html/HTMLOutputElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLOutputElement.cpp
rename to dom/html/HTMLOutputElement.cpp
diff --git a/content/html/content/src/HTMLOutputElement.h b/dom/html/HTMLOutputElement.h
similarity index 100%
rename from content/html/content/src/HTMLOutputElement.h
rename to dom/html/HTMLOutputElement.h
diff --git a/content/html/content/src/HTMLParagraphElement.cpp b/dom/html/HTMLParagraphElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLParagraphElement.cpp
rename to dom/html/HTMLParagraphElement.cpp
diff --git a/content/html/content/src/HTMLParagraphElement.h b/dom/html/HTMLParagraphElement.h
similarity index 100%
rename from content/html/content/src/HTMLParagraphElement.h
rename to dom/html/HTMLParagraphElement.h
diff --git a/content/html/content/src/HTMLPictureElement.cpp b/dom/html/HTMLPictureElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLPictureElement.cpp
rename to dom/html/HTMLPictureElement.cpp
diff --git a/content/html/content/src/HTMLPictureElement.h b/dom/html/HTMLPictureElement.h
similarity index 100%
rename from content/html/content/src/HTMLPictureElement.h
rename to dom/html/HTMLPictureElement.h
diff --git a/content/html/content/src/HTMLPreElement.cpp b/dom/html/HTMLPreElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLPreElement.cpp
rename to dom/html/HTMLPreElement.cpp
diff --git a/content/html/content/src/HTMLPreElement.h b/dom/html/HTMLPreElement.h
similarity index 100%
rename from content/html/content/src/HTMLPreElement.h
rename to dom/html/HTMLPreElement.h
diff --git a/content/html/content/src/HTMLProgressElement.cpp b/dom/html/HTMLProgressElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLProgressElement.cpp
rename to dom/html/HTMLProgressElement.cpp
diff --git a/content/html/content/src/HTMLProgressElement.h b/dom/html/HTMLProgressElement.h
similarity index 100%
rename from content/html/content/src/HTMLProgressElement.h
rename to dom/html/HTMLProgressElement.h
diff --git a/content/html/content/src/HTMLPropertiesCollection.cpp b/dom/html/HTMLPropertiesCollection.cpp
similarity index 100%
rename from content/html/content/src/HTMLPropertiesCollection.cpp
rename to dom/html/HTMLPropertiesCollection.cpp
diff --git a/content/html/content/src/HTMLPropertiesCollection.h b/dom/html/HTMLPropertiesCollection.h
similarity index 100%
rename from content/html/content/src/HTMLPropertiesCollection.h
rename to dom/html/HTMLPropertiesCollection.h
diff --git a/content/html/content/src/HTMLScriptElement.cpp b/dom/html/HTMLScriptElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLScriptElement.cpp
rename to dom/html/HTMLScriptElement.cpp
diff --git a/content/html/content/src/HTMLScriptElement.h b/dom/html/HTMLScriptElement.h
similarity index 100%
rename from content/html/content/src/HTMLScriptElement.h
rename to dom/html/HTMLScriptElement.h
diff --git a/content/html/content/src/HTMLSelectElement.cpp b/dom/html/HTMLSelectElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSelectElement.cpp
rename to dom/html/HTMLSelectElement.cpp
diff --git a/content/html/content/src/HTMLSelectElement.h b/dom/html/HTMLSelectElement.h
similarity index 100%
rename from content/html/content/src/HTMLSelectElement.h
rename to dom/html/HTMLSelectElement.h
diff --git a/content/html/content/src/HTMLShadowElement.cpp b/dom/html/HTMLShadowElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLShadowElement.cpp
rename to dom/html/HTMLShadowElement.cpp
diff --git a/content/html/content/src/HTMLShadowElement.h b/dom/html/HTMLShadowElement.h
similarity index 100%
rename from content/html/content/src/HTMLShadowElement.h
rename to dom/html/HTMLShadowElement.h
diff --git a/content/html/content/src/HTMLSharedElement.cpp b/dom/html/HTMLSharedElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSharedElement.cpp
rename to dom/html/HTMLSharedElement.cpp
diff --git a/content/html/content/src/HTMLSharedElement.h b/dom/html/HTMLSharedElement.h
similarity index 100%
rename from content/html/content/src/HTMLSharedElement.h
rename to dom/html/HTMLSharedElement.h
diff --git a/content/html/content/src/HTMLSharedListElement.cpp b/dom/html/HTMLSharedListElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSharedListElement.cpp
rename to dom/html/HTMLSharedListElement.cpp
diff --git a/content/html/content/src/HTMLSharedListElement.h b/dom/html/HTMLSharedListElement.h
similarity index 100%
rename from content/html/content/src/HTMLSharedListElement.h
rename to dom/html/HTMLSharedListElement.h
diff --git a/content/html/content/src/HTMLSharedObjectElement.cpp b/dom/html/HTMLSharedObjectElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSharedObjectElement.cpp
rename to dom/html/HTMLSharedObjectElement.cpp
diff --git a/content/html/content/src/HTMLSharedObjectElement.h b/dom/html/HTMLSharedObjectElement.h
similarity index 100%
rename from content/html/content/src/HTMLSharedObjectElement.h
rename to dom/html/HTMLSharedObjectElement.h
diff --git a/content/html/content/src/HTMLSourceElement.cpp b/dom/html/HTMLSourceElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSourceElement.cpp
rename to dom/html/HTMLSourceElement.cpp
diff --git a/content/html/content/src/HTMLSourceElement.h b/dom/html/HTMLSourceElement.h
similarity index 100%
rename from content/html/content/src/HTMLSourceElement.h
rename to dom/html/HTMLSourceElement.h
diff --git a/content/html/content/src/HTMLSpanElement.cpp b/dom/html/HTMLSpanElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLSpanElement.cpp
rename to dom/html/HTMLSpanElement.cpp
diff --git a/content/html/content/src/HTMLSpanElement.h b/dom/html/HTMLSpanElement.h
similarity index 100%
rename from content/html/content/src/HTMLSpanElement.h
rename to dom/html/HTMLSpanElement.h
diff --git a/content/html/content/src/HTMLStyleElement.cpp b/dom/html/HTMLStyleElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLStyleElement.cpp
rename to dom/html/HTMLStyleElement.cpp
diff --git a/content/html/content/src/HTMLStyleElement.h b/dom/html/HTMLStyleElement.h
similarity index 100%
rename from content/html/content/src/HTMLStyleElement.h
rename to dom/html/HTMLStyleElement.h
diff --git a/content/html/content/src/HTMLTableCaptionElement.cpp b/dom/html/HTMLTableCaptionElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableCaptionElement.cpp
rename to dom/html/HTMLTableCaptionElement.cpp
diff --git a/content/html/content/src/HTMLTableCaptionElement.h b/dom/html/HTMLTableCaptionElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableCaptionElement.h
rename to dom/html/HTMLTableCaptionElement.h
diff --git a/content/html/content/src/HTMLTableCellElement.cpp b/dom/html/HTMLTableCellElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableCellElement.cpp
rename to dom/html/HTMLTableCellElement.cpp
diff --git a/content/html/content/src/HTMLTableCellElement.h b/dom/html/HTMLTableCellElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableCellElement.h
rename to dom/html/HTMLTableCellElement.h
diff --git a/content/html/content/src/HTMLTableColElement.cpp b/dom/html/HTMLTableColElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableColElement.cpp
rename to dom/html/HTMLTableColElement.cpp
diff --git a/content/html/content/src/HTMLTableColElement.h b/dom/html/HTMLTableColElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableColElement.h
rename to dom/html/HTMLTableColElement.h
diff --git a/content/html/content/src/HTMLTableElement.cpp b/dom/html/HTMLTableElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableElement.cpp
rename to dom/html/HTMLTableElement.cpp
diff --git a/content/html/content/src/HTMLTableElement.h b/dom/html/HTMLTableElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableElement.h
rename to dom/html/HTMLTableElement.h
diff --git a/content/html/content/src/HTMLTableRowElement.cpp b/dom/html/HTMLTableRowElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableRowElement.cpp
rename to dom/html/HTMLTableRowElement.cpp
diff --git a/content/html/content/src/HTMLTableRowElement.h b/dom/html/HTMLTableRowElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableRowElement.h
rename to dom/html/HTMLTableRowElement.h
diff --git a/content/html/content/src/HTMLTableSectionElement.cpp b/dom/html/HTMLTableSectionElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTableSectionElement.cpp
rename to dom/html/HTMLTableSectionElement.cpp
diff --git a/content/html/content/src/HTMLTableSectionElement.h b/dom/html/HTMLTableSectionElement.h
similarity index 100%
rename from content/html/content/src/HTMLTableSectionElement.h
rename to dom/html/HTMLTableSectionElement.h
diff --git a/content/html/content/src/HTMLTemplateElement.cpp b/dom/html/HTMLTemplateElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTemplateElement.cpp
rename to dom/html/HTMLTemplateElement.cpp
diff --git a/content/html/content/src/HTMLTemplateElement.h b/dom/html/HTMLTemplateElement.h
similarity index 100%
rename from content/html/content/src/HTMLTemplateElement.h
rename to dom/html/HTMLTemplateElement.h
diff --git a/content/html/content/src/HTMLTextAreaElement.cpp b/dom/html/HTMLTextAreaElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTextAreaElement.cpp
rename to dom/html/HTMLTextAreaElement.cpp
diff --git a/content/html/content/src/HTMLTextAreaElement.h b/dom/html/HTMLTextAreaElement.h
similarity index 100%
rename from content/html/content/src/HTMLTextAreaElement.h
rename to dom/html/HTMLTextAreaElement.h
diff --git a/content/html/content/src/HTMLTimeElement.cpp b/dom/html/HTMLTimeElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTimeElement.cpp
rename to dom/html/HTMLTimeElement.cpp
diff --git a/content/html/content/src/HTMLTimeElement.h b/dom/html/HTMLTimeElement.h
similarity index 100%
rename from content/html/content/src/HTMLTimeElement.h
rename to dom/html/HTMLTimeElement.h
diff --git a/content/html/content/src/HTMLTitleElement.cpp b/dom/html/HTMLTitleElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTitleElement.cpp
rename to dom/html/HTMLTitleElement.cpp
diff --git a/content/html/content/src/HTMLTitleElement.h b/dom/html/HTMLTitleElement.h
similarity index 100%
rename from content/html/content/src/HTMLTitleElement.h
rename to dom/html/HTMLTitleElement.h
diff --git a/content/html/content/src/HTMLTrackElement.cpp b/dom/html/HTMLTrackElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLTrackElement.cpp
rename to dom/html/HTMLTrackElement.cpp
diff --git a/content/html/content/src/HTMLTrackElement.h b/dom/html/HTMLTrackElement.h
similarity index 100%
rename from content/html/content/src/HTMLTrackElement.h
rename to dom/html/HTMLTrackElement.h
diff --git a/content/html/content/src/HTMLUnknownElement.cpp b/dom/html/HTMLUnknownElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLUnknownElement.cpp
rename to dom/html/HTMLUnknownElement.cpp
diff --git a/content/html/content/src/HTMLUnknownElement.h b/dom/html/HTMLUnknownElement.h
similarity index 100%
rename from content/html/content/src/HTMLUnknownElement.h
rename to dom/html/HTMLUnknownElement.h
diff --git a/content/html/content/src/HTMLVideoElement.cpp b/dom/html/HTMLVideoElement.cpp
similarity index 100%
rename from content/html/content/src/HTMLVideoElement.cpp
rename to dom/html/HTMLVideoElement.cpp
diff --git a/content/html/content/public/HTMLVideoElement.h b/dom/html/HTMLVideoElement.h
similarity index 100%
rename from content/html/content/public/HTMLVideoElement.h
rename to dom/html/HTMLVideoElement.h
diff --git a/content/html/document/src/ImageDocument.cpp b/dom/html/ImageDocument.cpp
similarity index 100%
rename from content/html/document/src/ImageDocument.cpp
rename to dom/html/ImageDocument.cpp
diff --git a/content/html/document/src/ImageDocument.h b/dom/html/ImageDocument.h
similarity index 100%
rename from content/html/document/src/ImageDocument.h
rename to dom/html/ImageDocument.h
diff --git a/content/html/document/src/MediaDocument.cpp b/dom/html/MediaDocument.cpp
similarity index 100%
rename from content/html/document/src/MediaDocument.cpp
rename to dom/html/MediaDocument.cpp
diff --git a/content/html/document/src/MediaDocument.h b/dom/html/MediaDocument.h
similarity index 100%
rename from content/html/document/src/MediaDocument.h
rename to dom/html/MediaDocument.h
diff --git a/content/html/content/src/MediaError.cpp b/dom/html/MediaError.cpp
similarity index 100%
rename from content/html/content/src/MediaError.cpp
rename to dom/html/MediaError.cpp
diff --git a/content/html/content/src/MediaError.h b/dom/html/MediaError.h
similarity index 100%
rename from content/html/content/src/MediaError.h
rename to dom/html/MediaError.h
diff --git a/content/html/document/src/PluginDocument.cpp b/dom/html/PluginDocument.cpp
similarity index 100%
rename from content/html/document/src/PluginDocument.cpp
rename to dom/html/PluginDocument.cpp
diff --git a/content/html/content/src/RadioNodeList.cpp b/dom/html/RadioNodeList.cpp
similarity index 100%
rename from content/html/content/src/RadioNodeList.cpp
rename to dom/html/RadioNodeList.cpp
diff --git a/content/html/content/src/RadioNodeList.h b/dom/html/RadioNodeList.h
similarity index 100%
rename from content/html/content/src/RadioNodeList.h
rename to dom/html/RadioNodeList.h
diff --git a/content/html/content/src/TextTrackManager.cpp b/dom/html/TextTrackManager.cpp
similarity index 100%
rename from content/html/content/src/TextTrackManager.cpp
rename to dom/html/TextTrackManager.cpp
diff --git a/content/html/content/src/TextTrackManager.h b/dom/html/TextTrackManager.h
similarity index 100%
rename from content/html/content/src/TextTrackManager.h
rename to dom/html/TextTrackManager.h
diff --git a/content/html/content/src/TimeRanges.cpp b/dom/html/TimeRanges.cpp
similarity index 100%
rename from content/html/content/src/TimeRanges.cpp
rename to dom/html/TimeRanges.cpp
diff --git a/content/html/content/src/TimeRanges.h b/dom/html/TimeRanges.h
similarity index 100%
rename from content/html/content/src/TimeRanges.h
rename to dom/html/TimeRanges.h
diff --git a/content/html/content/src/UndoManager.cpp b/dom/html/UndoManager.cpp
similarity index 100%
rename from content/html/content/src/UndoManager.cpp
rename to dom/html/UndoManager.cpp
diff --git a/content/html/content/src/UndoManager.h b/dom/html/UndoManager.h
similarity index 100%
rename from content/html/content/src/UndoManager.h
rename to dom/html/UndoManager.h
diff --git a/content/html/content/src/ValidityState.cpp b/dom/html/ValidityState.cpp
similarity index 100%
rename from content/html/content/src/ValidityState.cpp
rename to dom/html/ValidityState.cpp
diff --git a/content/html/content/src/ValidityState.h b/dom/html/ValidityState.h
similarity index 100%
rename from content/html/content/src/ValidityState.h
rename to dom/html/ValidityState.h
diff --git a/content/html/document/src/VideoDocument.cpp b/dom/html/VideoDocument.cpp
similarity index 100%
rename from content/html/document/src/VideoDocument.cpp
rename to dom/html/VideoDocument.cpp
diff --git a/content/html/content/crashtests/1032654.html b/dom/html/crashtests/1032654.html
similarity index 100%
rename from content/html/content/crashtests/1032654.html
rename to dom/html/crashtests/1032654.html
diff --git a/content/html/content/crashtests/257818-1.html b/dom/html/crashtests/257818-1.html
similarity index 100%
rename from content/html/content/crashtests/257818-1.html
rename to dom/html/crashtests/257818-1.html
diff --git a/content/html/document/crashtests/285166-1.html b/dom/html/crashtests/285166-1.html
similarity index 100%
rename from content/html/document/crashtests/285166-1.html
rename to dom/html/crashtests/285166-1.html
diff --git a/content/html/document/crashtests/294235-1.html b/dom/html/crashtests/294235-1.html
similarity index 100%
rename from content/html/document/crashtests/294235-1.html
rename to dom/html/crashtests/294235-1.html
diff --git a/content/html/content/crashtests/307616-1.html b/dom/html/crashtests/307616-1.html
similarity index 100%
rename from content/html/content/crashtests/307616-1.html
rename to dom/html/crashtests/307616-1.html
diff --git a/content/html/content/crashtests/324918-1.xhtml b/dom/html/crashtests/324918-1.xhtml
similarity index 100%
rename from content/html/content/crashtests/324918-1.xhtml
rename to dom/html/crashtests/324918-1.xhtml
diff --git a/content/html/content/crashtests/338649-1.xhtml b/dom/html/crashtests/338649-1.xhtml
similarity index 100%
rename from content/html/content/crashtests/338649-1.xhtml
rename to dom/html/crashtests/338649-1.xhtml
diff --git a/content/html/content/crashtests/339501-1.xhtml b/dom/html/crashtests/339501-1.xhtml
similarity index 100%
rename from content/html/content/crashtests/339501-1.xhtml
rename to dom/html/crashtests/339501-1.xhtml
diff --git a/content/html/content/crashtests/339501-2.xhtml b/dom/html/crashtests/339501-2.xhtml
similarity index 100%
rename from content/html/content/crashtests/339501-2.xhtml
rename to dom/html/crashtests/339501-2.xhtml
diff --git a/content/html/document/crashtests/378993-1.xhtml b/dom/html/crashtests/378993-1.xhtml
similarity index 100%
rename from content/html/document/crashtests/378993-1.xhtml
rename to dom/html/crashtests/378993-1.xhtml
diff --git a/content/html/content/crashtests/382568-1-inner.xhtml b/dom/html/crashtests/382568-1-inner.xhtml
similarity index 100%
rename from content/html/content/crashtests/382568-1-inner.xhtml
rename to dom/html/crashtests/382568-1-inner.xhtml
diff --git a/content/html/content/crashtests/382568-1.html b/dom/html/crashtests/382568-1.html
similarity index 100%
rename from content/html/content/crashtests/382568-1.html
rename to dom/html/crashtests/382568-1.html
diff --git a/content/html/content/crashtests/383137.xhtml b/dom/html/crashtests/383137.xhtml
similarity index 100%
rename from content/html/content/crashtests/383137.xhtml
rename to dom/html/crashtests/383137.xhtml
diff --git a/content/html/document/crashtests/388183-1.html b/dom/html/crashtests/388183-1.html
similarity index 100%
rename from content/html/document/crashtests/388183-1.html
rename to dom/html/crashtests/388183-1.html
diff --git a/content/html/document/crashtests/395340-1.html b/dom/html/crashtests/395340-1.html
similarity index 100%
rename from content/html/document/crashtests/395340-1.html
rename to dom/html/crashtests/395340-1.html
diff --git a/content/html/document/crashtests/399694-1.html b/dom/html/crashtests/399694-1.html
similarity index 100%
rename from content/html/document/crashtests/399694-1.html
rename to dom/html/crashtests/399694-1.html
diff --git a/content/html/document/crashtests/407053.html b/dom/html/crashtests/407053.html
similarity index 100%
rename from content/html/document/crashtests/407053.html
rename to dom/html/crashtests/407053.html
diff --git a/content/html/content/crashtests/423371-1.html b/dom/html/crashtests/423371-1.html
similarity index 100%
rename from content/html/content/crashtests/423371-1.html
rename to dom/html/crashtests/423371-1.html
diff --git a/content/html/document/crashtests/448564.html b/dom/html/crashtests/448564.html
similarity index 100%
rename from content/html/document/crashtests/448564.html
rename to dom/html/crashtests/448564.html
diff --git a/content/html/content/crashtests/451123-1.html b/dom/html/crashtests/451123-1.html
similarity index 100%
rename from content/html/content/crashtests/451123-1.html
rename to dom/html/crashtests/451123-1.html
diff --git a/content/html/content/crashtests/453406-1.html b/dom/html/crashtests/453406-1.html
similarity index 100%
rename from content/html/content/crashtests/453406-1.html
rename to dom/html/crashtests/453406-1.html
diff --git a/content/html/content/crashtests/464197-1.html b/dom/html/crashtests/464197-1.html
similarity index 100%
rename from content/html/content/crashtests/464197-1.html
rename to dom/html/crashtests/464197-1.html
diff --git a/content/html/content/crashtests/465466-1.xhtml b/dom/html/crashtests/465466-1.xhtml
similarity index 100%
rename from content/html/content/crashtests/465466-1.xhtml
rename to dom/html/crashtests/465466-1.xhtml
diff --git a/content/html/document/crashtests/468562-1.html b/dom/html/crashtests/468562-1.html
similarity index 100%
rename from content/html/document/crashtests/468562-1.html
rename to dom/html/crashtests/468562-1.html
diff --git a/content/html/document/crashtests/468562-2.html b/dom/html/crashtests/468562-2.html
similarity index 100%
rename from content/html/document/crashtests/468562-2.html
rename to dom/html/crashtests/468562-2.html
diff --git a/content/html/document/crashtests/494225.html b/dom/html/crashtests/494225.html
similarity index 100%
rename from content/html/document/crashtests/494225.html
rename to dom/html/crashtests/494225.html
diff --git a/content/html/document/crashtests/495543.svg b/dom/html/crashtests/495543.svg
similarity index 100%
rename from content/html/document/crashtests/495543.svg
rename to dom/html/crashtests/495543.svg
diff --git a/content/html/content/crashtests/504183-1.html b/dom/html/crashtests/504183-1.html
similarity index 100%
rename from content/html/content/crashtests/504183-1.html
rename to dom/html/crashtests/504183-1.html
diff --git a/content/html/content/crashtests/515829-1.html b/dom/html/crashtests/515829-1.html
similarity index 100%
rename from content/html/content/crashtests/515829-1.html
rename to dom/html/crashtests/515829-1.html
diff --git a/content/html/content/crashtests/515829-2.html b/dom/html/crashtests/515829-2.html
similarity index 100%
rename from content/html/content/crashtests/515829-2.html
rename to dom/html/crashtests/515829-2.html
diff --git a/content/html/document/crashtests/564461.xhtml b/dom/html/crashtests/564461.xhtml
similarity index 100%
rename from content/html/document/crashtests/564461.xhtml
rename to dom/html/crashtests/564461.xhtml
diff --git a/content/html/content/crashtests/570566-1.html b/dom/html/crashtests/570566-1.html
similarity index 100%
rename from content/html/content/crashtests/570566-1.html
rename to dom/html/crashtests/570566-1.html
diff --git a/content/html/content/crashtests/571428-1.html b/dom/html/crashtests/571428-1.html
similarity index 100%
rename from content/html/content/crashtests/571428-1.html
rename to dom/html/crashtests/571428-1.html
diff --git a/content/html/content/crashtests/580507-1.xhtml b/dom/html/crashtests/580507-1.xhtml
similarity index 100%
rename from content/html/content/crashtests/580507-1.xhtml
rename to dom/html/crashtests/580507-1.xhtml
diff --git a/content/html/content/crashtests/590387.html b/dom/html/crashtests/590387.html
similarity index 100%
rename from content/html/content/crashtests/590387.html
rename to dom/html/crashtests/590387.html
diff --git a/content/html/content/crashtests/596785-1.html b/dom/html/crashtests/596785-1.html
similarity index 100%
rename from content/html/content/crashtests/596785-1.html
rename to dom/html/crashtests/596785-1.html
diff --git a/content/html/content/crashtests/596785-2.html b/dom/html/crashtests/596785-2.html
similarity index 100%
rename from content/html/content/crashtests/596785-2.html
rename to dom/html/crashtests/596785-2.html
diff --git a/content/html/document/crashtests/601422.html b/dom/html/crashtests/601422.html
similarity index 100%
rename from content/html/document/crashtests/601422.html
rename to dom/html/crashtests/601422.html
diff --git a/content/html/content/crashtests/602117.html b/dom/html/crashtests/602117.html
similarity index 100%
rename from content/html/content/crashtests/602117.html
rename to dom/html/crashtests/602117.html
diff --git a/content/html/content/crashtests/604807.html b/dom/html/crashtests/604807.html
similarity index 100%
rename from content/html/content/crashtests/604807.html
rename to dom/html/crashtests/604807.html
diff --git a/content/html/content/crashtests/605264.html b/dom/html/crashtests/605264.html
similarity index 100%
rename from content/html/content/crashtests/605264.html
rename to dom/html/crashtests/605264.html
diff --git a/content/html/content/crashtests/606430-1.html b/dom/html/crashtests/606430-1.html
similarity index 100%
rename from content/html/content/crashtests/606430-1.html
rename to dom/html/crashtests/606430-1.html
diff --git a/content/html/content/crashtests/613027.html b/dom/html/crashtests/613027.html
similarity index 100%
rename from content/html/content/crashtests/613027.html
rename to dom/html/crashtests/613027.html
diff --git a/content/html/content/crashtests/614279.html b/dom/html/crashtests/614279.html
similarity index 100%
rename from content/html/content/crashtests/614279.html
rename to dom/html/crashtests/614279.html
diff --git a/content/html/content/crashtests/614988-1.html b/dom/html/crashtests/614988-1.html
similarity index 100%
rename from content/html/content/crashtests/614988-1.html
rename to dom/html/crashtests/614988-1.html
diff --git a/content/html/content/crashtests/616401.html b/dom/html/crashtests/616401.html
similarity index 100%
rename from content/html/content/crashtests/616401.html
rename to dom/html/crashtests/616401.html
diff --git a/content/html/content/crashtests/620078-1.html b/dom/html/crashtests/620078-1.html
similarity index 100%
rename from content/html/content/crashtests/620078-1.html
rename to dom/html/crashtests/620078-1.html
diff --git a/content/html/content/crashtests/620078-2.html b/dom/html/crashtests/620078-2.html
similarity index 100%
rename from content/html/content/crashtests/620078-2.html
rename to dom/html/crashtests/620078-2.html
diff --git a/content/html/document/crashtests/631421.html b/dom/html/crashtests/631421.html
similarity index 100%
rename from content/html/document/crashtests/631421.html
rename to dom/html/crashtests/631421.html
diff --git a/content/html/document/crashtests/631421.png b/dom/html/crashtests/631421.png
similarity index 100%
rename from content/html/document/crashtests/631421.png
rename to dom/html/crashtests/631421.png
diff --git a/content/html/content/crashtests/673853.html b/dom/html/crashtests/673853.html
similarity index 100%
rename from content/html/content/crashtests/673853.html
rename to dom/html/crashtests/673853.html
diff --git a/content/html/content/crashtests/680922-1.xul b/dom/html/crashtests/680922-1.xul
similarity index 100%
rename from content/html/content/crashtests/680922-1.xul
rename to dom/html/crashtests/680922-1.xul
diff --git a/content/html/content/crashtests/680922-binding.xml b/dom/html/crashtests/680922-binding.xml
similarity index 100%
rename from content/html/content/crashtests/680922-binding.xml
rename to dom/html/crashtests/680922-binding.xml
diff --git a/content/html/content/crashtests/682058.xhtml b/dom/html/crashtests/682058.xhtml
similarity index 100%
rename from content/html/content/crashtests/682058.xhtml
rename to dom/html/crashtests/682058.xhtml
diff --git a/content/html/content/crashtests/682460.html b/dom/html/crashtests/682460.html
similarity index 100%
rename from content/html/content/crashtests/682460.html
rename to dom/html/crashtests/682460.html
diff --git a/content/html/content/crashtests/68912-1.html b/dom/html/crashtests/68912-1.html
similarity index 100%
rename from content/html/content/crashtests/68912-1.html
rename to dom/html/crashtests/68912-1.html
diff --git a/content/html/content/crashtests/738744.xhtml b/dom/html/crashtests/738744.xhtml
similarity index 100%
rename from content/html/content/crashtests/738744.xhtml
rename to dom/html/crashtests/738744.xhtml
diff --git a/content/html/document/crashtests/741218.json b/dom/html/crashtests/741218.json
similarity index 100%
rename from content/html/document/crashtests/741218.json
rename to dom/html/crashtests/741218.json
diff --git a/content/html/document/crashtests/741218.json^headers^ b/dom/html/crashtests/741218.json^headers^
similarity index 100%
rename from content/html/document/crashtests/741218.json^headers^
rename to dom/html/crashtests/741218.json^headers^
diff --git a/content/html/content/crashtests/741250.xhtml b/dom/html/crashtests/741250.xhtml
similarity index 100%
rename from content/html/content/crashtests/741250.xhtml
rename to dom/html/crashtests/741250.xhtml
diff --git a/content/html/content/crashtests/795221-1.html b/dom/html/crashtests/795221-1.html
similarity index 100%
rename from content/html/content/crashtests/795221-1.html
rename to dom/html/crashtests/795221-1.html
diff --git a/content/html/content/crashtests/795221-2.html b/dom/html/crashtests/795221-2.html
similarity index 100%
rename from content/html/content/crashtests/795221-2.html
rename to dom/html/crashtests/795221-2.html
diff --git a/content/html/content/crashtests/795221-3.html b/dom/html/crashtests/795221-3.html
similarity index 100%
rename from content/html/content/crashtests/795221-3.html
rename to dom/html/crashtests/795221-3.html
diff --git a/content/html/content/crashtests/795221-4.html b/dom/html/crashtests/795221-4.html
similarity index 100%
rename from content/html/content/crashtests/795221-4.html
rename to dom/html/crashtests/795221-4.html
diff --git a/content/html/content/crashtests/795221-5.xml b/dom/html/crashtests/795221-5.xml
similarity index 100%
rename from content/html/content/crashtests/795221-5.xml
rename to dom/html/crashtests/795221-5.xml
diff --git a/content/html/content/crashtests/798802-1.html b/dom/html/crashtests/798802-1.html
similarity index 100%
rename from content/html/content/crashtests/798802-1.html
rename to dom/html/crashtests/798802-1.html
diff --git a/content/html/content/crashtests/811226.html b/dom/html/crashtests/811226.html
similarity index 100%
rename from content/html/content/crashtests/811226.html
rename to dom/html/crashtests/811226.html
diff --git a/content/html/content/crashtests/819745.html b/dom/html/crashtests/819745.html
similarity index 100%
rename from content/html/content/crashtests/819745.html
rename to dom/html/crashtests/819745.html
diff --git a/content/html/content/crashtests/828180.html b/dom/html/crashtests/828180.html
similarity index 100%
rename from content/html/content/crashtests/828180.html
rename to dom/html/crashtests/828180.html
diff --git a/content/html/content/crashtests/828472.html b/dom/html/crashtests/828472.html
similarity index 100%
rename from content/html/content/crashtests/828472.html
rename to dom/html/crashtests/828472.html
diff --git a/content/html/content/crashtests/837033.html b/dom/html/crashtests/837033.html
similarity index 100%
rename from content/html/content/crashtests/837033.html
rename to dom/html/crashtests/837033.html
diff --git a/content/html/content/crashtests/838256-1.html b/dom/html/crashtests/838256-1.html
similarity index 100%
rename from content/html/content/crashtests/838256-1.html
rename to dom/html/crashtests/838256-1.html
diff --git a/content/html/content/crashtests/862084.html b/dom/html/crashtests/862084.html
similarity index 100%
rename from content/html/content/crashtests/862084.html
rename to dom/html/crashtests/862084.html
diff --git a/content/html/content/crashtests/865147.html b/dom/html/crashtests/865147.html
similarity index 100%
rename from content/html/content/crashtests/865147.html
rename to dom/html/crashtests/865147.html
diff --git a/content/html/content/crashtests/877910.html b/dom/html/crashtests/877910.html
similarity index 100%
rename from content/html/content/crashtests/877910.html
rename to dom/html/crashtests/877910.html
diff --git a/content/html/content/crashtests/903106.html b/dom/html/crashtests/903106.html
similarity index 100%
rename from content/html/content/crashtests/903106.html
rename to dom/html/crashtests/903106.html
diff --git a/content/html/content/crashtests/916322-1.html b/dom/html/crashtests/916322-1.html
similarity index 100%
rename from content/html/content/crashtests/916322-1.html
rename to dom/html/crashtests/916322-1.html
diff --git a/content/html/content/crashtests/916322-2.html b/dom/html/crashtests/916322-2.html
similarity index 100%
rename from content/html/content/crashtests/916322-2.html
rename to dom/html/crashtests/916322-2.html
diff --git a/content/html/content/crashtests/crashtests.list b/dom/html/crashtests/crashtests.list
similarity index 79%
rename from content/html/content/crashtests/crashtests.list
rename to dom/html/crashtests/crashtests.list
index 9238f441446..db18c6ba4a7 100644
--- a/content/html/content/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -1,41 +1,57 @@
-load 68912-1.html
 load 257818-1.html
+load 285166-1.html
+load 294235-1.html
 load 307616-1.html
 load 324918-1.xhtml
 load 338649-1.xhtml
 load 339501-1.xhtml
 load 339501-2.xhtml
+load 378993-1.xhtml
 load 382568-1.html
 load 383137.xhtml
+load 388183-1.html
+load 395340-1.html
+load 399694-1.html
+load 407053.html
 load 423371-1.html
+load 448564.html
 load 451123-1.html
 load 453406-1.html
 load 464197-1.html
 load 465466-1.xhtml
+load 468562-1.html
+load 468562-2.html
+load 494225.html
+load 495543.svg
 load 504183-1.html
 load 515829-1.html
 load 515829-2.html
+load 564461.xhtml
 load 570566-1.html
 load 571428-1.html
 load 580507-1.xhtml
 load 590387.html
 load 596785-1.html
 load 596785-2.html
+load 601422.html
+load 602117.html
 load 604807.html
 load 605264.html
 load 606430-1.html
-load 602117.html
 load 613027.html
 load 614279.html
 load 614988-1.html
 load 616401.html
 load 620078-1.html
 load 620078-2.html
+load 631421.html
+load 673853.html
 load 680922-1.xul
 load 682058.xhtml
 load 682460.html
-load 673853.html
+load 68912-1.html
 load 738744.xhtml
+load 741218.json
 load 741250.xhtml
 load 795221-1.html
 load 795221-2.html
@@ -45,8 +61,8 @@ load 795221-5.xml
 load 798802-1.html
 load 811226.html
 load 819745.html
-pref(dom.experimental_forms,true) load 828472.html
 load 828180.html
+pref(dom.experimental_forms,true) load 828472.html
 load 837033.html
 load 838256-1.html
 load 862084.html
diff --git a/content/html/content/src/moz.build b/dom/html/moz.build
similarity index 81%
rename from content/html/content/src/moz.build
rename to dom/html/moz.build
index 4770897cb21..f56d7790f1c 100644
--- a/content/html/content/src/moz.build
+++ b/dom/html/moz.build
@@ -4,19 +4,55 @@
 # 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/.
 
+MOCHITEST_MANIFESTS += [
+    'test/forms/mochitest.ini',
+    'test/imports/mochitest.ini',
+    'test/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += [
+    'test/chrome.ini',
+    'test/forms/chrome.ini',
+]
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+XPIDL_SOURCES += [
+    'nsIFormSubmitObserver.idl',
+    'nsIHTMLMenu.idl',
+    'nsIImageDocument.idl',
+    'nsIMenuBuilder.idl',
+    'nsIPhonetic.idl',
+]
+
+XPIDL_MODULE = 'content_html'
+
 EXPORTS += [
     'HTMLPropertiesCollection.h',
+    'nsFormSubmission.h',
     'nsGenericHTMLElement.h',
     'nsHTMLDNSPrefetch.h',
+    'nsIConstraintValidation.h',
+    'nsIForm.h',
+    'nsIFormControl.h',
+    'nsIFormProcessor.h',
+    'nsIHTMLCollection.h',
+    'nsIHTMLDocument.h',
+    'nsIRadioGroupContainer.h',
+    'nsIRadioVisitor.h',
+    'nsITextControlElement.h',
     'nsTextEditorState.h',
 ]
 
 EXPORTS.mozilla.dom += [
+    'HTMLAllCollection.h',
     'HTMLAnchorElement.h',
     'HTMLAreaElement.h',
+    'HTMLAudioElement.h',
     'HTMLBodyElement.h',
     'HTMLBRElement.h',
     'HTMLButtonElement.h',
+    'HTMLCanvasElement.h',
     'HTMLContentElement.h',
     'HTMLDataElement.h',
     'HTMLDataListElement.h',
@@ -37,6 +73,7 @@ EXPORTS.mozilla.dom += [
     'HTMLLIElement.h',
     'HTMLLinkElement.h',
     'HTMLMapElement.h',
+    'HTMLMediaElement.h',
     'HTMLMenuElement.h',
     'HTMLMenuItemElement.h',
     'HTMLMetaElement.h',
@@ -72,6 +109,8 @@ EXPORTS.mozilla.dom += [
     'HTMLTitleElement.h',
     'HTMLTrackElement.h',
     'HTMLUnknownElement.h',
+    'HTMLVideoElement.h',
+    'ImageDocument.h',
     'MediaError.h',
     'RadioNodeList.h',
     'TextTrackManager.h',
@@ -81,6 +120,7 @@ EXPORTS.mozilla.dom += [
 ]
 
 UNIFIED_SOURCES += [
+    'HTMLAllCollection.cpp',
     'HTMLAnchorElement.cpp',
     'HTMLAreaElement.cpp',
     'HTMLAudioElement.cpp',
@@ -147,12 +187,16 @@ UNIFIED_SOURCES += [
     'HTMLTrackElement.cpp',
     'HTMLUnknownElement.cpp',
     'HTMLVideoElement.cpp',
+    'ImageDocument.cpp',
+    'MediaDocument.cpp',
     'MediaError.cpp',
     'nsDOMStringMap.cpp',
     'nsFormSubmission.cpp',
     'nsGenericHTMLElement.cpp',
     'nsGenericHTMLFrameElement.cpp',
+    'nsHTMLContentSink.cpp',
     'nsHTMLDNSPrefetch.cpp',
+    'nsHTMLDocument.cpp',
     'nsIConstraintValidation.cpp',
     'nsRadioVisitor.cpp',
     'nsTextEditorState.cpp',
@@ -161,6 +205,12 @@ UNIFIED_SOURCES += [
     'TimeRanges.cpp',
     'UndoManager.cpp',
     'ValidityState.cpp',
+    'VideoDocument.cpp',
+]
+
+SOURCES += [
+    # Includes npapi.h.
+    'PluginDocument.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
@@ -169,10 +219,10 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
+    '/caps',
     '/content/base/src',
-    '/content/html/document/src',
+    '/docshell/base',
     '/dom/base',
     '/dom/canvas',
     '/dom/media/',
@@ -188,3 +238,4 @@ LOCAL_INCLUDES += [
     '/netwerk/base/src',
 ]
 
+FINAL_LIBRARY = 'xul'
diff --git a/content/html/content/src/nsDOMStringMap.cpp b/dom/html/nsDOMStringMap.cpp
similarity index 100%
rename from content/html/content/src/nsDOMStringMap.cpp
rename to dom/html/nsDOMStringMap.cpp
diff --git a/content/html/content/src/nsDOMStringMap.h b/dom/html/nsDOMStringMap.h
similarity index 100%
rename from content/html/content/src/nsDOMStringMap.h
rename to dom/html/nsDOMStringMap.h
diff --git a/content/html/content/src/nsFormSubmission.cpp b/dom/html/nsFormSubmission.cpp
similarity index 100%
rename from content/html/content/src/nsFormSubmission.cpp
rename to dom/html/nsFormSubmission.cpp
diff --git a/content/html/content/public/nsFormSubmission.h b/dom/html/nsFormSubmission.h
similarity index 100%
rename from content/html/content/public/nsFormSubmission.h
rename to dom/html/nsFormSubmission.h
diff --git a/content/html/content/src/nsFormSubmissionConstants.h b/dom/html/nsFormSubmissionConstants.h
similarity index 100%
rename from content/html/content/src/nsFormSubmissionConstants.h
rename to dom/html/nsFormSubmissionConstants.h
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp
similarity index 100%
rename from content/html/content/src/nsGenericHTMLElement.cpp
rename to dom/html/nsGenericHTMLElement.cpp
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/dom/html/nsGenericHTMLElement.h
similarity index 100%
rename from content/html/content/src/nsGenericHTMLElement.h
rename to dom/html/nsGenericHTMLElement.h
diff --git a/content/html/content/src/nsGenericHTMLFrameElement.cpp b/dom/html/nsGenericHTMLFrameElement.cpp
similarity index 100%
rename from content/html/content/src/nsGenericHTMLFrameElement.cpp
rename to dom/html/nsGenericHTMLFrameElement.cpp
diff --git a/content/html/content/src/nsGenericHTMLFrameElement.h b/dom/html/nsGenericHTMLFrameElement.h
similarity index 100%
rename from content/html/content/src/nsGenericHTMLFrameElement.h
rename to dom/html/nsGenericHTMLFrameElement.h
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/dom/html/nsHTMLContentSink.cpp
similarity index 100%
rename from content/html/document/src/nsHTMLContentSink.cpp
rename to dom/html/nsHTMLContentSink.cpp
diff --git a/content/html/content/src/nsHTMLDNSPrefetch.cpp b/dom/html/nsHTMLDNSPrefetch.cpp
similarity index 100%
rename from content/html/content/src/nsHTMLDNSPrefetch.cpp
rename to dom/html/nsHTMLDNSPrefetch.cpp
diff --git a/content/html/content/src/nsHTMLDNSPrefetch.h b/dom/html/nsHTMLDNSPrefetch.h
similarity index 100%
rename from content/html/content/src/nsHTMLDNSPrefetch.h
rename to dom/html/nsHTMLDNSPrefetch.h
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
similarity index 100%
rename from content/html/document/src/nsHTMLDocument.cpp
rename to dom/html/nsHTMLDocument.cpp
diff --git a/content/html/document/src/nsHTMLDocument.h b/dom/html/nsHTMLDocument.h
similarity index 100%
rename from content/html/document/src/nsHTMLDocument.h
rename to dom/html/nsHTMLDocument.h
diff --git a/content/html/content/src/nsIConstraintValidation.cpp b/dom/html/nsIConstraintValidation.cpp
similarity index 100%
rename from content/html/content/src/nsIConstraintValidation.cpp
rename to dom/html/nsIConstraintValidation.cpp
diff --git a/content/html/content/public/nsIConstraintValidation.h b/dom/html/nsIConstraintValidation.h
similarity index 100%
rename from content/html/content/public/nsIConstraintValidation.h
rename to dom/html/nsIConstraintValidation.h
diff --git a/content/html/content/public/nsIForm.h b/dom/html/nsIForm.h
similarity index 100%
rename from content/html/content/public/nsIForm.h
rename to dom/html/nsIForm.h
diff --git a/content/html/content/public/nsIFormControl.h b/dom/html/nsIFormControl.h
similarity index 100%
rename from content/html/content/public/nsIFormControl.h
rename to dom/html/nsIFormControl.h
diff --git a/content/html/content/public/nsIFormProcessor.h b/dom/html/nsIFormProcessor.h
similarity index 100%
rename from content/html/content/public/nsIFormProcessor.h
rename to dom/html/nsIFormProcessor.h
diff --git a/content/html/content/public/nsIFormSubmitObserver.idl b/dom/html/nsIFormSubmitObserver.idl
similarity index 100%
rename from content/html/content/public/nsIFormSubmitObserver.idl
rename to dom/html/nsIFormSubmitObserver.idl
diff --git a/content/html/content/public/nsIHTMLCollection.h b/dom/html/nsIHTMLCollection.h
similarity index 100%
rename from content/html/content/public/nsIHTMLCollection.h
rename to dom/html/nsIHTMLCollection.h
diff --git a/content/html/document/src/nsIHTMLDocument.h b/dom/html/nsIHTMLDocument.h
similarity index 100%
rename from content/html/document/src/nsIHTMLDocument.h
rename to dom/html/nsIHTMLDocument.h
diff --git a/content/html/content/public/nsIHTMLMenu.idl b/dom/html/nsIHTMLMenu.idl
similarity index 100%
rename from content/html/content/public/nsIHTMLMenu.idl
rename to dom/html/nsIHTMLMenu.idl
diff --git a/content/html/document/public/nsIImageDocument.idl b/dom/html/nsIImageDocument.idl
similarity index 100%
rename from content/html/document/public/nsIImageDocument.idl
rename to dom/html/nsIImageDocument.idl
diff --git a/content/html/content/public/nsIMenuBuilder.idl b/dom/html/nsIMenuBuilder.idl
similarity index 100%
rename from content/html/content/public/nsIMenuBuilder.idl
rename to dom/html/nsIMenuBuilder.idl
diff --git a/content/html/content/public/nsIPhonetic.idl b/dom/html/nsIPhonetic.idl
similarity index 100%
rename from content/html/content/public/nsIPhonetic.idl
rename to dom/html/nsIPhonetic.idl
diff --git a/content/html/content/public/nsIRadioGroupContainer.h b/dom/html/nsIRadioGroupContainer.h
similarity index 100%
rename from content/html/content/public/nsIRadioGroupContainer.h
rename to dom/html/nsIRadioGroupContainer.h
diff --git a/content/html/content/public/nsIRadioVisitor.h b/dom/html/nsIRadioVisitor.h
similarity index 100%
rename from content/html/content/public/nsIRadioVisitor.h
rename to dom/html/nsIRadioVisitor.h
diff --git a/content/html/content/public/nsITextControlElement.h b/dom/html/nsITextControlElement.h
similarity index 100%
rename from content/html/content/public/nsITextControlElement.h
rename to dom/html/nsITextControlElement.h
diff --git a/content/html/content/src/nsRadioVisitor.cpp b/dom/html/nsRadioVisitor.cpp
similarity index 100%
rename from content/html/content/src/nsRadioVisitor.cpp
rename to dom/html/nsRadioVisitor.cpp
diff --git a/content/html/content/src/nsRadioVisitor.h b/dom/html/nsRadioVisitor.h
similarity index 100%
rename from content/html/content/src/nsRadioVisitor.h
rename to dom/html/nsRadioVisitor.h
diff --git a/content/html/content/src/nsTextEditorState.cpp b/dom/html/nsTextEditorState.cpp
similarity index 100%
rename from content/html/content/src/nsTextEditorState.cpp
rename to dom/html/nsTextEditorState.cpp
diff --git a/content/html/content/src/nsTextEditorState.h b/dom/html/nsTextEditorState.h
similarity index 100%
rename from content/html/content/src/nsTextEditorState.h
rename to dom/html/nsTextEditorState.h
diff --git a/content/html/content/reftests/41464-1-ref.html b/dom/html/reftests/41464-1-ref.html
similarity index 100%
rename from content/html/content/reftests/41464-1-ref.html
rename to dom/html/reftests/41464-1-ref.html
diff --git a/content/html/content/reftests/41464-1a.html b/dom/html/reftests/41464-1a.html
similarity index 100%
rename from content/html/content/reftests/41464-1a.html
rename to dom/html/reftests/41464-1a.html
diff --git a/content/html/content/reftests/41464-1b.html b/dom/html/reftests/41464-1b.html
similarity index 100%
rename from content/html/content/reftests/41464-1b.html
rename to dom/html/reftests/41464-1b.html
diff --git a/content/html/content/reftests/468263-1a.html b/dom/html/reftests/468263-1a.html
similarity index 100%
rename from content/html/content/reftests/468263-1a.html
rename to dom/html/reftests/468263-1a.html
diff --git a/content/html/content/reftests/468263-1b.html b/dom/html/reftests/468263-1b.html
similarity index 100%
rename from content/html/content/reftests/468263-1b.html
rename to dom/html/reftests/468263-1b.html
diff --git a/content/html/content/reftests/468263-1c.html b/dom/html/reftests/468263-1c.html
similarity index 100%
rename from content/html/content/reftests/468263-1c.html
rename to dom/html/reftests/468263-1c.html
diff --git a/content/html/content/reftests/468263-1d.html b/dom/html/reftests/468263-1d.html
similarity index 100%
rename from content/html/content/reftests/468263-1d.html
rename to dom/html/reftests/468263-1d.html
diff --git a/content/html/content/reftests/468263-2-alternate-ref.html b/dom/html/reftests/468263-2-alternate-ref.html
similarity index 100%
rename from content/html/content/reftests/468263-2-alternate-ref.html
rename to dom/html/reftests/468263-2-alternate-ref.html
diff --git a/content/html/content/reftests/468263-2-ref.html b/dom/html/reftests/468263-2-ref.html
similarity index 100%
rename from content/html/content/reftests/468263-2-ref.html
rename to dom/html/reftests/468263-2-ref.html
diff --git a/content/html/content/reftests/468263-2.html b/dom/html/reftests/468263-2.html
similarity index 100%
rename from content/html/content/reftests/468263-2.html
rename to dom/html/reftests/468263-2.html
diff --git a/content/html/content/reftests/484200-1-ref.html b/dom/html/reftests/484200-1-ref.html
similarity index 100%
rename from content/html/content/reftests/484200-1-ref.html
rename to dom/html/reftests/484200-1-ref.html
diff --git a/content/html/content/reftests/484200-1.html b/dom/html/reftests/484200-1.html
similarity index 100%
rename from content/html/content/reftests/484200-1.html
rename to dom/html/reftests/484200-1.html
diff --git a/content/html/content/reftests/485377-ref.html b/dom/html/reftests/485377-ref.html
similarity index 100%
rename from content/html/content/reftests/485377-ref.html
rename to dom/html/reftests/485377-ref.html
diff --git a/content/html/content/reftests/485377.html b/dom/html/reftests/485377.html
similarity index 100%
rename from content/html/content/reftests/485377.html
rename to dom/html/reftests/485377.html
diff --git a/content/html/content/reftests/52019-1-ref.html b/dom/html/reftests/52019-1-ref.html
similarity index 100%
rename from content/html/content/reftests/52019-1-ref.html
rename to dom/html/reftests/52019-1-ref.html
diff --git a/content/html/content/reftests/52019-1.html b/dom/html/reftests/52019-1.html
similarity index 100%
rename from content/html/content/reftests/52019-1.html
rename to dom/html/reftests/52019-1.html
diff --git a/content/html/content/reftests/557840-ref.html b/dom/html/reftests/557840-ref.html
similarity index 100%
rename from content/html/content/reftests/557840-ref.html
rename to dom/html/reftests/557840-ref.html
diff --git a/content/html/content/reftests/557840.html b/dom/html/reftests/557840.html
similarity index 100%
rename from content/html/content/reftests/557840.html
rename to dom/html/reftests/557840.html
diff --git a/content/html/content/reftests/560059-video-dimensions-ref.html b/dom/html/reftests/560059-video-dimensions-ref.html
similarity index 100%
rename from content/html/content/reftests/560059-video-dimensions-ref.html
rename to dom/html/reftests/560059-video-dimensions-ref.html
diff --git a/content/html/content/reftests/560059-video-dimensions.html b/dom/html/reftests/560059-video-dimensions.html
similarity index 100%
rename from content/html/content/reftests/560059-video-dimensions.html
rename to dom/html/reftests/560059-video-dimensions.html
diff --git a/content/html/content/reftests/573322-no-quirks-ref.html b/dom/html/reftests/573322-no-quirks-ref.html
similarity index 100%
rename from content/html/content/reftests/573322-no-quirks-ref.html
rename to dom/html/reftests/573322-no-quirks-ref.html
diff --git a/content/html/content/reftests/573322-no-quirks.html b/dom/html/reftests/573322-no-quirks.html
similarity index 100%
rename from content/html/content/reftests/573322-no-quirks.html
rename to dom/html/reftests/573322-no-quirks.html
diff --git a/content/html/content/reftests/573322-quirks-ref.html b/dom/html/reftests/573322-quirks-ref.html
similarity index 100%
rename from content/html/content/reftests/573322-quirks-ref.html
rename to dom/html/reftests/573322-quirks-ref.html
diff --git a/content/html/content/reftests/573322-quirks.html b/dom/html/reftests/573322-quirks.html
similarity index 100%
rename from content/html/content/reftests/573322-quirks.html
rename to dom/html/reftests/573322-quirks.html
diff --git a/content/html/content/reftests/596455-1a.html b/dom/html/reftests/596455-1a.html
similarity index 100%
rename from content/html/content/reftests/596455-1a.html
rename to dom/html/reftests/596455-1a.html
diff --git a/content/html/content/reftests/596455-1b.html b/dom/html/reftests/596455-1b.html
similarity index 100%
rename from content/html/content/reftests/596455-1b.html
rename to dom/html/reftests/596455-1b.html
diff --git a/content/html/content/reftests/596455-2a.html b/dom/html/reftests/596455-2a.html
similarity index 100%
rename from content/html/content/reftests/596455-2a.html
rename to dom/html/reftests/596455-2a.html
diff --git a/content/html/content/reftests/596455-2b.html b/dom/html/reftests/596455-2b.html
similarity index 100%
rename from content/html/content/reftests/596455-2b.html
rename to dom/html/reftests/596455-2b.html
diff --git a/content/html/content/reftests/596455-ref-1.html b/dom/html/reftests/596455-ref-1.html
similarity index 100%
rename from content/html/content/reftests/596455-ref-1.html
rename to dom/html/reftests/596455-ref-1.html
diff --git a/content/html/content/reftests/596455-ref-2.html b/dom/html/reftests/596455-ref-2.html
similarity index 100%
rename from content/html/content/reftests/596455-ref-2.html
rename to dom/html/reftests/596455-ref-2.html
diff --git a/content/html/content/reftests/610935-ref.html b/dom/html/reftests/610935-ref.html
similarity index 100%
rename from content/html/content/reftests/610935-ref.html
rename to dom/html/reftests/610935-ref.html
diff --git a/content/html/content/reftests/610935.html b/dom/html/reftests/610935.html
similarity index 100%
rename from content/html/content/reftests/610935.html
rename to dom/html/reftests/610935.html
diff --git a/content/html/content/reftests/649134-1.html b/dom/html/reftests/649134-1.html
similarity index 100%
rename from content/html/content/reftests/649134-1.html
rename to dom/html/reftests/649134-1.html
diff --git a/content/html/content/reftests/649134-2-ref.html b/dom/html/reftests/649134-2-ref.html
similarity index 100%
rename from content/html/content/reftests/649134-2-ref.html
rename to dom/html/reftests/649134-2-ref.html
diff --git a/content/html/content/reftests/649134-2.html b/dom/html/reftests/649134-2.html
similarity index 100%
rename from content/html/content/reftests/649134-2.html
rename to dom/html/reftests/649134-2.html
diff --git a/content/html/content/reftests/649134-ref.html b/dom/html/reftests/649134-ref.html
similarity index 100%
rename from content/html/content/reftests/649134-ref.html
rename to dom/html/reftests/649134-ref.html
diff --git a/content/html/content/reftests/autofocus/autofocus-after-body-focus-ref.html b/dom/html/reftests/autofocus/autofocus-after-body-focus-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-after-body-focus-ref.html
rename to dom/html/reftests/autofocus/autofocus-after-body-focus-ref.html
diff --git a/content/html/content/reftests/autofocus/autofocus-after-body-focus.html b/dom/html/reftests/autofocus/autofocus-after-body-focus.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-after-body-focus.html
rename to dom/html/reftests/autofocus/autofocus-after-body-focus.html
diff --git a/content/html/content/reftests/autofocus/autofocus-after-load-ref.html b/dom/html/reftests/autofocus/autofocus-after-load-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-after-load-ref.html
rename to dom/html/reftests/autofocus/autofocus-after-load-ref.html
diff --git a/content/html/content/reftests/autofocus/autofocus-after-load.html b/dom/html/reftests/autofocus/autofocus-after-load.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-after-load.html
rename to dom/html/reftests/autofocus/autofocus-after-load.html
diff --git a/content/html/content/reftests/autofocus/autofocus-leaves-iframe-ref.html b/dom/html/reftests/autofocus/autofocus-leaves-iframe-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-leaves-iframe-ref.html
rename to dom/html/reftests/autofocus/autofocus-leaves-iframe-ref.html
diff --git a/content/html/content/reftests/autofocus/autofocus-leaves-iframe.html b/dom/html/reftests/autofocus/autofocus-leaves-iframe.html
similarity index 100%
rename from content/html/content/reftests/autofocus/autofocus-leaves-iframe.html
rename to dom/html/reftests/autofocus/autofocus-leaves-iframe.html
diff --git a/content/html/content/reftests/autofocus/button-create.html b/dom/html/reftests/autofocus/button-create.html
similarity index 100%
rename from content/html/content/reftests/autofocus/button-create.html
rename to dom/html/reftests/autofocus/button-create.html
diff --git a/content/html/content/reftests/autofocus/button-load.html b/dom/html/reftests/autofocus/button-load.html
similarity index 100%
rename from content/html/content/reftests/autofocus/button-load.html
rename to dom/html/reftests/autofocus/button-load.html
diff --git a/content/html/content/reftests/autofocus/button-ref.html b/dom/html/reftests/autofocus/button-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/button-ref.html
rename to dom/html/reftests/autofocus/button-ref.html
diff --git a/content/html/content/reftests/autofocus/input-create.html b/dom/html/reftests/autofocus/input-create.html
similarity index 100%
rename from content/html/content/reftests/autofocus/input-create.html
rename to dom/html/reftests/autofocus/input-create.html
diff --git a/content/html/content/reftests/autofocus/input-load.html b/dom/html/reftests/autofocus/input-load.html
similarity index 100%
rename from content/html/content/reftests/autofocus/input-load.html
rename to dom/html/reftests/autofocus/input-load.html
diff --git a/content/html/content/reftests/autofocus/input-number-ref.html b/dom/html/reftests/autofocus/input-number-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/input-number-ref.html
rename to dom/html/reftests/autofocus/input-number-ref.html
diff --git a/content/html/content/reftests/autofocus/input-number.html b/dom/html/reftests/autofocus/input-number.html
similarity index 100%
rename from content/html/content/reftests/autofocus/input-number.html
rename to dom/html/reftests/autofocus/input-number.html
diff --git a/content/html/content/reftests/autofocus/input-ref.html b/dom/html/reftests/autofocus/input-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/input-ref.html
rename to dom/html/reftests/autofocus/input-ref.html
diff --git a/content/html/content/reftests/autofocus/reftest.list b/dom/html/reftests/autofocus/reftest.list
similarity index 100%
rename from content/html/content/reftests/autofocus/reftest.list
rename to dom/html/reftests/autofocus/reftest.list
diff --git a/content/html/content/reftests/autofocus/select-create.html b/dom/html/reftests/autofocus/select-create.html
similarity index 100%
rename from content/html/content/reftests/autofocus/select-create.html
rename to dom/html/reftests/autofocus/select-create.html
diff --git a/content/html/content/reftests/autofocus/select-load.html b/dom/html/reftests/autofocus/select-load.html
similarity index 100%
rename from content/html/content/reftests/autofocus/select-load.html
rename to dom/html/reftests/autofocus/select-load.html
diff --git a/content/html/content/reftests/autofocus/select-ref.html b/dom/html/reftests/autofocus/select-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/select-ref.html
rename to dom/html/reftests/autofocus/select-ref.html
diff --git a/content/html/content/reftests/autofocus/style.css b/dom/html/reftests/autofocus/style.css
similarity index 100%
rename from content/html/content/reftests/autofocus/style.css
rename to dom/html/reftests/autofocus/style.css
diff --git a/content/html/content/reftests/autofocus/textarea-create.html b/dom/html/reftests/autofocus/textarea-create.html
similarity index 100%
rename from content/html/content/reftests/autofocus/textarea-create.html
rename to dom/html/reftests/autofocus/textarea-create.html
diff --git a/content/html/content/reftests/autofocus/textarea-load.html b/dom/html/reftests/autofocus/textarea-load.html
similarity index 100%
rename from content/html/content/reftests/autofocus/textarea-load.html
rename to dom/html/reftests/autofocus/textarea-load.html
diff --git a/content/html/content/reftests/autofocus/textarea-ref.html b/dom/html/reftests/autofocus/textarea-ref.html
similarity index 100%
rename from content/html/content/reftests/autofocus/textarea-ref.html
rename to dom/html/reftests/autofocus/textarea-ref.html
diff --git a/content/html/document/reftests/bug448564-1_ideal.html b/dom/html/reftests/bug448564-1_ideal.html
similarity index 100%
rename from content/html/document/reftests/bug448564-1_ideal.html
rename to dom/html/reftests/bug448564-1_ideal.html
diff --git a/content/html/document/reftests/bug448564-1_malformed.html b/dom/html/reftests/bug448564-1_malformed.html
similarity index 100%
rename from content/html/document/reftests/bug448564-1_malformed.html
rename to dom/html/reftests/bug448564-1_malformed.html
diff --git a/content/html/document/reftests/bug448564-1_well-formed.html b/dom/html/reftests/bug448564-1_well-formed.html
similarity index 100%
rename from content/html/document/reftests/bug448564-1_well-formed.html
rename to dom/html/reftests/bug448564-1_well-formed.html
diff --git a/content/html/document/reftests/bug448564-4a.html b/dom/html/reftests/bug448564-4a.html
similarity index 100%
rename from content/html/document/reftests/bug448564-4a.html
rename to dom/html/reftests/bug448564-4a.html
diff --git a/content/html/document/reftests/bug448564-4b.html b/dom/html/reftests/bug448564-4b.html
similarity index 100%
rename from content/html/document/reftests/bug448564-4b.html
rename to dom/html/reftests/bug448564-4b.html
diff --git a/content/html/document/reftests/bug448564_forms.css b/dom/html/reftests/bug448564_forms.css
similarity index 100%
rename from content/html/document/reftests/bug448564_forms.css
rename to dom/html/reftests/bug448564_forms.css
diff --git a/content/html/document/reftests/bug502168-1_malformed.html b/dom/html/reftests/bug502168-1_malformed.html
similarity index 100%
rename from content/html/document/reftests/bug502168-1_malformed.html
rename to dom/html/reftests/bug502168-1_malformed.html
diff --git a/content/html/document/reftests/bug502168-1_well-formed.html b/dom/html/reftests/bug502168-1_well-formed.html
similarity index 100%
rename from content/html/document/reftests/bug502168-1_well-formed.html
rename to dom/html/reftests/bug502168-1_well-formed.html
diff --git a/content/html/document/reftests/bug917595-1-ref.html b/dom/html/reftests/bug917595-1-ref.html
similarity index 100%
rename from content/html/document/reftests/bug917595-1-ref.html
rename to dom/html/reftests/bug917595-1-ref.html
diff --git a/content/html/document/reftests/bug917595-exif-rotated.jpg b/dom/html/reftests/bug917595-exif-rotated.jpg
similarity index 100%
rename from content/html/document/reftests/bug917595-exif-rotated.jpg
rename to dom/html/reftests/bug917595-exif-rotated.jpg
diff --git a/content/html/document/reftests/bug917595-iframe-1.html b/dom/html/reftests/bug917595-iframe-1.html
similarity index 100%
rename from content/html/document/reftests/bug917595-iframe-1.html
rename to dom/html/reftests/bug917595-iframe-1.html
diff --git a/content/html/document/reftests/bug917595-pixel-rotated.jpg b/dom/html/reftests/bug917595-pixel-rotated.jpg
similarity index 100%
rename from content/html/document/reftests/bug917595-pixel-rotated.jpg
rename to dom/html/reftests/bug917595-pixel-rotated.jpg
diff --git a/content/html/document/reftests/bug917595-unrotated.jpg b/dom/html/reftests/bug917595-unrotated.jpg
similarity index 100%
rename from content/html/document/reftests/bug917595-unrotated.jpg
rename to dom/html/reftests/bug917595-unrotated.jpg
diff --git a/content/html/content/reftests/figure-ref.html b/dom/html/reftests/figure-ref.html
similarity index 100%
rename from content/html/content/reftests/figure-ref.html
rename to dom/html/reftests/figure-ref.html
diff --git a/content/html/content/reftests/figure.html b/dom/html/reftests/figure.html
similarity index 100%
rename from content/html/content/reftests/figure.html
rename to dom/html/reftests/figure.html
diff --git a/content/html/content/reftests/href-attr-change-restyles-ref.html b/dom/html/reftests/href-attr-change-restyles-ref.html
similarity index 100%
rename from content/html/content/reftests/href-attr-change-restyles-ref.html
rename to dom/html/reftests/href-attr-change-restyles-ref.html
diff --git a/content/html/content/reftests/href-attr-change-restyles.html b/dom/html/reftests/href-attr-change-restyles.html
similarity index 100%
rename from content/html/content/reftests/href-attr-change-restyles.html
rename to dom/html/reftests/href-attr-change-restyles.html
diff --git a/content/html/content/reftests/pass.png b/dom/html/reftests/pass.png
similarity index 100%
rename from content/html/content/reftests/pass.png
rename to dom/html/reftests/pass.png
diff --git a/content/html/content/reftests/pre-1-ref.html b/dom/html/reftests/pre-1-ref.html
similarity index 100%
rename from content/html/content/reftests/pre-1-ref.html
rename to dom/html/reftests/pre-1-ref.html
diff --git a/content/html/content/reftests/pre-1.html b/dom/html/reftests/pre-1.html
similarity index 100%
rename from content/html/content/reftests/pre-1.html
rename to dom/html/reftests/pre-1.html
diff --git a/content/html/content/reftests/reftest.list b/dom/html/reftests/reftest.list
similarity index 66%
rename from content/html/content/reftests/reftest.list
rename to dom/html/reftests/reftest.list
index 599cea5b8f1..ea3aace0b5d 100644
--- a/content/html/content/reftests/reftest.list
+++ b/dom/html/reftests/reftest.list
@@ -25,6 +25,19 @@ skip-if(B2G) == 41464-1b.html 41464-1-ref.html
 == 649134-1.html 649134-ref.html
 skip-if(Android||B2G) == 649134-2.html 649134-2-ref.html
 
+== bug448564-1_malformed.html bug448564-1_well-formed.html
+== bug448564-1_malformed.html bug448564-1_ideal.html
+
+== bug448564-4a.html          bug448564-4b.html
+== bug502168-1_malformed.html bug502168-1_well-formed.html
+
+# Test that image documents taken into account CSS properties like
+# image-orientation when determining the size of the image.
+# (Fuzzy necessary due to pixel-wise comparison of different JPEGs.
+# The vast majority of the fuzziness comes from Linux and WinXP.)
+fuzzy(1,149) == bug917595-iframe-1.html    bug917595-1-ref.html
+fuzzy(3,640) == bug917595-exif-rotated.jpg bug917595-pixel-rotated.jpg
+
 == href-attr-change-restyles.html href-attr-change-restyles-ref.html
 == figure.html figure-ref.html
 == pre-1.html pre-1-ref.html
diff --git a/content/html/content/reftests/table-border-1-ref.html b/dom/html/reftests/table-border-1-ref.html
similarity index 100%
rename from content/html/content/reftests/table-border-1-ref.html
rename to dom/html/reftests/table-border-1-ref.html
diff --git a/content/html/content/reftests/table-border-1.html b/dom/html/reftests/table-border-1.html
similarity index 100%
rename from content/html/content/reftests/table-border-1.html
rename to dom/html/reftests/table-border-1.html
diff --git a/content/html/content/reftests/table-border-2-notref.html b/dom/html/reftests/table-border-2-notref.html
similarity index 100%
rename from content/html/content/reftests/table-border-2-notref.html
rename to dom/html/reftests/table-border-2-notref.html
diff --git a/content/html/content/reftests/table-border-2-ref.html b/dom/html/reftests/table-border-2-ref.html
similarity index 100%
rename from content/html/content/reftests/table-border-2-ref.html
rename to dom/html/reftests/table-border-2-ref.html
diff --git a/content/html/content/reftests/table-border-2.html b/dom/html/reftests/table-border-2.html
similarity index 100%
rename from content/html/content/reftests/table-border-2.html
rename to dom/html/reftests/table-border-2.html
diff --git a/content/html/content/reftests/toblob-todataurl/blob.js b/dom/html/reftests/toblob-todataurl/blob.js
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/blob.js
rename to dom/html/reftests/toblob-todataurl/blob.js
diff --git a/content/html/content/reftests/toblob-todataurl/dataurl.js b/dom/html/reftests/toblob-todataurl/dataurl.js
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/dataurl.js
rename to dom/html/reftests/toblob-todataurl/dataurl.js
diff --git a/content/html/content/reftests/toblob-todataurl/images/original.png b/dom/html/reftests/toblob-todataurl/images/original.png
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/original.png
rename to dom/html/reftests/toblob-todataurl/images/original.png
diff --git a/content/html/content/reftests/toblob-todataurl/images/q0.jpg b/dom/html/reftests/toblob-todataurl/images/q0.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q0.jpg
rename to dom/html/reftests/toblob-todataurl/images/q0.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/images/q100.jpg b/dom/html/reftests/toblob-todataurl/images/q100.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q100.jpg
rename to dom/html/reftests/toblob-todataurl/images/q100.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/images/q25.jpg b/dom/html/reftests/toblob-todataurl/images/q25.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q25.jpg
rename to dom/html/reftests/toblob-todataurl/images/q25.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/images/q50.jpg b/dom/html/reftests/toblob-todataurl/images/q50.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q50.jpg
rename to dom/html/reftests/toblob-todataurl/images/q50.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/images/q75.jpg b/dom/html/reftests/toblob-todataurl/images/q75.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q75.jpg
rename to dom/html/reftests/toblob-todataurl/images/q75.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/images/q92.jpg b/dom/html/reftests/toblob-todataurl/images/q92.jpg
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/images/q92.jpg
rename to dom/html/reftests/toblob-todataurl/images/q92.jpg
diff --git a/content/html/content/reftests/toblob-todataurl/quality-0-ref.html b/dom/html/reftests/toblob-todataurl/quality-0-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-0-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-0-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/quality-100-ref.html b/dom/html/reftests/toblob-todataurl/quality-100-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-100-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-100-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/quality-25-ref.html b/dom/html/reftests/toblob-todataurl/quality-25-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-25-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-25-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/quality-50-ref.html b/dom/html/reftests/toblob-todataurl/quality-50-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-50-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-50-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/quality-75-ref.html b/dom/html/reftests/toblob-todataurl/quality-75-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-75-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-75-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/quality-92-ref.html b/dom/html/reftests/toblob-todataurl/quality-92-ref.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/quality-92-ref.html
rename to dom/html/reftests/toblob-todataurl/quality-92-ref.html
diff --git a/content/html/content/reftests/toblob-todataurl/reftest.list b/dom/html/reftests/toblob-todataurl/reftest.list
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/reftest.list
rename to dom/html/reftests/toblob-todataurl/reftest.list
diff --git a/content/html/content/reftests/toblob-todataurl/sample.js b/dom/html/reftests/toblob-todataurl/sample.js
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/sample.js
rename to dom/html/reftests/toblob-todataurl/sample.js
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-0.html b/dom/html/reftests/toblob-todataurl/toblob-quality-0.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-0.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-0.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-100.html b/dom/html/reftests/toblob-todataurl/toblob-quality-100.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-100.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-100.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-25.html b/dom/html/reftests/toblob-todataurl/toblob-quality-25.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-25.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-25.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-50.html b/dom/html/reftests/toblob-todataurl/toblob-quality-50.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-50.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-50.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-75.html b/dom/html/reftests/toblob-todataurl/toblob-quality-75.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-75.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-75.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-92.html b/dom/html/reftests/toblob-todataurl/toblob-quality-92.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-92.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-92.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-default.html b/dom/html/reftests/toblob-todataurl/toblob-quality-default.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-default.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-default.html
diff --git a/content/html/content/reftests/toblob-todataurl/toblob-quality-undefined.html b/dom/html/reftests/toblob-todataurl/toblob-quality-undefined.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/toblob-quality-undefined.html
rename to dom/html/reftests/toblob-todataurl/toblob-quality-undefined.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-0.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-0.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-0.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-0.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-100.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-100.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-100.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-100.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-25.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-25.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-25.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-25.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-50.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-50.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-50.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-50.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-75.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-75.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-75.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-75.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-92.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-92.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-92.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-92.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-default.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-default.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-default.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-default.html
diff --git a/content/html/content/reftests/toblob-todataurl/todataurl-quality-undefined.html b/dom/html/reftests/toblob-todataurl/todataurl-quality-undefined.html
similarity index 100%
rename from content/html/content/reftests/toblob-todataurl/todataurl-quality-undefined.html
rename to dom/html/reftests/toblob-todataurl/todataurl-quality-undefined.html
diff --git a/content/html/content/test/347174transform.xsl b/dom/html/test/347174transform.xsl
similarity index 100%
rename from content/html/content/test/347174transform.xsl
rename to dom/html/test/347174transform.xsl
diff --git a/content/html/content/test/347174transformable.xml b/dom/html/test/347174transformable.xml
similarity index 100%
rename from content/html/content/test/347174transformable.xml
rename to dom/html/test/347174transformable.xml
diff --git a/content/html/content/test/allowMedia.sjs b/dom/html/test/allowMedia.sjs
similarity index 100%
rename from content/html/content/test/allowMedia.sjs
rename to dom/html/test/allowMedia.sjs
diff --git a/content/html/content/test/browser.ini b/dom/html/test/browser.ini
similarity index 73%
rename from content/html/content/test/browser.ini
rename to dom/html/test/browser.ini
index ab5d452a18b..569e92a1656 100644
--- a/content/html/content/test/browser.ini
+++ b/dom/html/test/browser.ini
@@ -1,7 +1,10 @@
 [DEFAULT]
 support-files =
+  bug592641_img.jpg
   file_bug649778.html
   file_bug649778.html^headers^
 
+[browser_bug592641.js]
 [browser_bug649778.js]
 skip-if = e10s # Bug ?????? - leaked until shutdown [nsGlobalWindow #16 about:blank]
+[browser_bug1081537.js]
diff --git a/content/html/document/test/browser_bug1081537.js b/dom/html/test/browser_bug1081537.js
similarity index 100%
rename from content/html/document/test/browser_bug1081537.js
rename to dom/html/test/browser_bug1081537.js
diff --git a/content/html/document/test/browser_bug592641.js b/dom/html/test/browser_bug592641.js
similarity index 95%
rename from content/html/document/test/browser_bug592641.js
rename to dom/html/test/browser_bug592641.js
index 96b432c42dc..72cc4d23145 100644
--- a/content/html/document/test/browser_bug592641.js
+++ b/dom/html/test/browser_bug592641.js
@@ -1,7 +1,7 @@
 // Test for bug 592641 - Image document doesn't show dimensions of cached images
 
 // Globals
-var testPath = "http://mochi.test:8888/browser/content/html/document/test/";
+var testPath = "http://mochi.test:8888/browser/dom/html/test/";
 var ctx = {loadsDone : 0};
 
 // Entry point from Mochikit
diff --git a/content/html/content/test/browser_bug649778.js b/dom/html/test/browser_bug649778.js
similarity index 97%
rename from content/html/content/test/browser_bug649778.js
rename to dom/html/test/browser_bug649778.js
index 8c5518093c2..80d966741ed 100644
--- a/content/html/content/test/browser_bug649778.js
+++ b/dom/html/test/browser_bug649778.js
@@ -1,7 +1,7 @@
 // Test for bug 649778 - document.write may cause a document to be written to disk cache even when the page has Cache-Control: no-store
 
 // Globals
-var testPath = "http://mochi.test:8888/browser/content/html/content/test/";
+var testPath = "http://mochi.test:8888/browser/dom/html/test/";
 var popup;
 
 let {LoadContextInfo} = Cu.import("resource://gre/modules/LoadContextInfo.jsm", null);
diff --git a/content/html/content/test/bug100533_iframe.html b/dom/html/test/bug100533_iframe.html
similarity index 100%
rename from content/html/content/test/bug100533_iframe.html
rename to dom/html/test/bug100533_iframe.html
diff --git a/content/html/content/test/bug100533_load.html b/dom/html/test/bug100533_load.html
similarity index 100%
rename from content/html/content/test/bug100533_load.html
rename to dom/html/test/bug100533_load.html
diff --git a/content/html/document/test/bug196523-subframe.html b/dom/html/test/bug196523-subframe.html
similarity index 100%
rename from content/html/document/test/bug196523-subframe.html
rename to dom/html/test/bug196523-subframe.html
diff --git a/content/html/document/test/bug199692-nested-d2.html b/dom/html/test/bug199692-nested-d2.html
similarity index 100%
rename from content/html/document/test/bug199692-nested-d2.html
rename to dom/html/test/bug199692-nested-d2.html
diff --git a/content/html/document/test/bug199692-nested.html b/dom/html/test/bug199692-nested.html
similarity index 100%
rename from content/html/document/test/bug199692-nested.html
rename to dom/html/test/bug199692-nested.html
diff --git a/content/html/document/test/bug199692-popup.html b/dom/html/test/bug199692-popup.html
similarity index 100%
rename from content/html/document/test/bug199692-popup.html
rename to dom/html/test/bug199692-popup.html
diff --git a/content/html/document/test/bug199692-scrolled.html b/dom/html/test/bug199692-scrolled.html
similarity index 100%
rename from content/html/document/test/bug199692-scrolled.html
rename to dom/html/test/bug199692-scrolled.html
diff --git a/content/html/content/test/bug242709_iframe.html b/dom/html/test/bug242709_iframe.html
similarity index 100%
rename from content/html/content/test/bug242709_iframe.html
rename to dom/html/test/bug242709_iframe.html
diff --git a/content/html/content/test/bug242709_load.html b/dom/html/test/bug242709_load.html
similarity index 100%
rename from content/html/content/test/bug242709_load.html
rename to dom/html/test/bug242709_load.html
diff --git a/content/html/content/test/bug277724_iframe1.html b/dom/html/test/bug277724_iframe1.html
similarity index 100%
rename from content/html/content/test/bug277724_iframe1.html
rename to dom/html/test/bug277724_iframe1.html
diff --git a/content/html/content/test/bug277724_iframe2.xhtml b/dom/html/test/bug277724_iframe2.xhtml
similarity index 100%
rename from content/html/content/test/bug277724_iframe2.xhtml
rename to dom/html/test/bug277724_iframe2.xhtml
diff --git a/content/html/content/test/bug277890_iframe.html b/dom/html/test/bug277890_iframe.html
similarity index 100%
rename from content/html/content/test/bug277890_iframe.html
rename to dom/html/test/bug277890_iframe.html
diff --git a/content/html/content/test/bug277890_load.html b/dom/html/test/bug277890_load.html
similarity index 100%
rename from content/html/content/test/bug277890_load.html
rename to dom/html/test/bug277890_load.html
diff --git a/content/html/content/test/bug340800_iframe.txt b/dom/html/test/bug340800_iframe.txt
similarity index 100%
rename from content/html/content/test/bug340800_iframe.txt
rename to dom/html/test/bug340800_iframe.txt
diff --git a/content/html/document/test/bug369370-popup.png b/dom/html/test/bug369370-popup.png
similarity index 100%
rename from content/html/document/test/bug369370-popup.png
rename to dom/html/test/bug369370-popup.png
diff --git a/content/html/content/test/bug372098-link-target.html b/dom/html/test/bug372098-link-target.html
similarity index 100%
rename from content/html/content/test/bug372098-link-target.html
rename to dom/html/test/bug372098-link-target.html
diff --git a/content/html/content/test/bug392567.jar b/dom/html/test/bug392567.jar
similarity index 100%
rename from content/html/content/test/bug392567.jar
rename to dom/html/test/bug392567.jar
diff --git a/content/html/content/test/bug392567.jar^headers^ b/dom/html/test/bug392567.jar^headers^
similarity index 100%
rename from content/html/content/test/bug392567.jar^headers^
rename to dom/html/test/bug392567.jar^headers^
diff --git a/content/html/content/test/bug441930_iframe.html b/dom/html/test/bug441930_iframe.html
similarity index 100%
rename from content/html/content/test/bug441930_iframe.html
rename to dom/html/test/bug441930_iframe.html
diff --git a/content/html/document/test/bug445004-inner.html b/dom/html/test/bug445004-inner.html
similarity index 80%
rename from content/html/document/test/bug445004-inner.html
rename to dom/html/test/bug445004-inner.html
index 35f03e38611..b946520ea66 100644
--- a/content/html/document/test/bug445004-inner.html
+++ b/dom/html/test/bug445004-inner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <base href="http://test1.example.org/tests/content/html/document/test/bug445004-inner.html">
+    <base href="http://test1.example.org/tests/dom/html/test/bug445004-inner.html">
     <script src="bug445004-inner.js"></script>
   </head>
   <body>
diff --git a/content/html/document/test/bug445004-inner.js b/dom/html/test/bug445004-inner.js
similarity index 100%
rename from content/html/document/test/bug445004-inner.js
rename to dom/html/test/bug445004-inner.js
diff --git a/content/html/document/test/bug445004-outer-abs.html b/dom/html/test/bug445004-outer-abs.html
similarity index 61%
rename from content/html/document/test/bug445004-outer-abs.html
rename to dom/html/test/bug445004-outer-abs.html
index 80f42a8fc2d..8a93ef2b735 100644
--- a/content/html/document/test/bug445004-outer-abs.html
+++ b/dom/html/test/bug445004-outer-abs.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <base href="http://example.org/tests/content/html/document/test/bug445004-outer.html">
+    <base href="http://example.org/tests/dom/html/test/bug445004-outer.html">
     <script>document.domain = "example.org"</script>
   </head>  
   <body>
-    <iframe width="500" height="200" src="http://test1.example.org/tests/content/html/document/test/bug445004-inner.html"
+    <iframe width="500" height="200" src="http://test1.example.org/tests/dom/html/test/bug445004-inner.html"
             onload="window.frames[0].doIt()"></iframe>
   </body>
 </html>
diff --git a/content/html/document/test/bug445004-outer-rel.html b/dom/html/test/bug445004-outer-rel.html
similarity index 72%
rename from content/html/document/test/bug445004-outer-rel.html
rename to dom/html/test/bug445004-outer-rel.html
index c539a37b08b..09673388993 100644
--- a/content/html/document/test/bug445004-outer-rel.html
+++ b/dom/html/test/bug445004-outer-rel.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <base href="http://example.org/tests/content/html/document/test/bug445004-outer.html">
+    <base href="http://example.org/tests/dom/html/test/bug445004-outer.html">
     <script>document.domain = "example.org"</script>
   </head>  
   <body>
diff --git a/content/html/document/test/bug445004-outer-write.html b/dom/html/test/bug445004-outer-write.html
similarity index 94%
rename from content/html/document/test/bug445004-outer-write.html
rename to dom/html/test/bug445004-outer-write.html
index 7df82c62c94..be6e37b6d77 100644
--- a/content/html/document/test/bug445004-outer-write.html
+++ b/dom/html/test/bug445004-outer-write.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <base href="http://example.org/tests/content/html/document/test/bug445004-outer.html">
+    <base href="http://example.org/tests/dom/html/test/bug445004-outer.html">
     <script>document.domain = "example.org"</script>
   </head>  
   <body>
diff --git a/content/html/document/test/bug446483-iframe.html b/dom/html/test/bug446483-iframe.html
similarity index 100%
rename from content/html/document/test/bug446483-iframe.html
rename to dom/html/test/bug446483-iframe.html
diff --git a/content/html/document/test/bug448564-echo.sjs b/dom/html/test/bug448564-echo.sjs
similarity index 100%
rename from content/html/document/test/bug448564-echo.sjs
rename to dom/html/test/bug448564-echo.sjs
diff --git a/content/html/document/test/bug448564-iframe-1.html b/dom/html/test/bug448564-iframe-1.html
similarity index 100%
rename from content/html/document/test/bug448564-iframe-1.html
rename to dom/html/test/bug448564-iframe-1.html
diff --git a/content/html/document/test/bug448564-iframe-2.html b/dom/html/test/bug448564-iframe-2.html
similarity index 100%
rename from content/html/document/test/bug448564-iframe-2.html
rename to dom/html/test/bug448564-iframe-2.html
diff --git a/content/html/document/test/bug448564-iframe-3.html b/dom/html/test/bug448564-iframe-3.html
similarity index 100%
rename from content/html/document/test/bug448564-iframe-3.html
rename to dom/html/test/bug448564-iframe-3.html
diff --git a/content/html/document/test/bug448564-submit.js b/dom/html/test/bug448564-submit.js
similarity index 100%
rename from content/html/document/test/bug448564-submit.js
rename to dom/html/test/bug448564-submit.js
diff --git a/content/html/document/test/bug499092.html b/dom/html/test/bug499092.html
similarity index 100%
rename from content/html/document/test/bug499092.html
rename to dom/html/test/bug499092.html
diff --git a/content/html/document/test/bug499092.xml b/dom/html/test/bug499092.xml
similarity index 100%
rename from content/html/document/test/bug499092.xml
rename to dom/html/test/bug499092.xml
diff --git a/content/html/content/test/bug514856_iframe.html b/dom/html/test/bug514856_iframe.html
similarity index 100%
rename from content/html/content/test/bug514856_iframe.html
rename to dom/html/test/bug514856_iframe.html
diff --git a/content/html/document/test/bug592641_img.jpg b/dom/html/test/bug592641_img.jpg
similarity index 100%
rename from content/html/document/test/bug592641_img.jpg
rename to dom/html/test/bug592641_img.jpg
diff --git a/content/html/content/test/bug649134/file_bug649134-1.sjs b/dom/html/test/bug649134/file_bug649134-1.sjs
similarity index 100%
rename from content/html/content/test/bug649134/file_bug649134-1.sjs
rename to dom/html/test/bug649134/file_bug649134-1.sjs
diff --git a/content/html/content/test/bug649134/file_bug649134-2.sjs b/dom/html/test/bug649134/file_bug649134-2.sjs
similarity index 100%
rename from content/html/content/test/bug649134/file_bug649134-2.sjs
rename to dom/html/test/bug649134/file_bug649134-2.sjs
diff --git a/content/html/content/test/bug649134/index.html b/dom/html/test/bug649134/index.html
similarity index 100%
rename from content/html/content/test/bug649134/index.html
rename to dom/html/test/bug649134/index.html
diff --git a/content/html/content/test/chrome.ini b/dom/html/test/chrome.ini
similarity index 100%
rename from content/html/content/test/chrome.ini
rename to dom/html/test/chrome.ini
diff --git a/content/html/content/test/enableTestPlugin.js b/dom/html/test/enableTestPlugin.js
similarity index 100%
rename from content/html/content/test/enableTestPlugin.js
rename to dom/html/test/enableTestPlugin.js
diff --git a/content/html/content/test/file_anchor_ping.html b/dom/html/test/file_anchor_ping.html
similarity index 100%
rename from content/html/content/test/file_anchor_ping.html
rename to dom/html/test/file_anchor_ping.html
diff --git a/content/html/content/test/file_bug209275_1.html b/dom/html/test/file_bug209275_1.html
similarity index 100%
rename from content/html/content/test/file_bug209275_1.html
rename to dom/html/test/file_bug209275_1.html
diff --git a/content/html/content/test/file_bug209275_2.html b/dom/html/test/file_bug209275_2.html
similarity index 100%
rename from content/html/content/test/file_bug209275_2.html
rename to dom/html/test/file_bug209275_2.html
diff --git a/content/html/content/test/file_bug209275_3.html b/dom/html/test/file_bug209275_3.html
similarity index 100%
rename from content/html/content/test/file_bug209275_3.html
rename to dom/html/test/file_bug209275_3.html
diff --git a/content/html/content/test/file_bug297761.html b/dom/html/test/file_bug297761.html
similarity index 100%
rename from content/html/content/test/file_bug297761.html
rename to dom/html/test/file_bug297761.html
diff --git a/content/html/content/test/file_bug417760.png b/dom/html/test/file_bug417760.png
similarity index 100%
rename from content/html/content/test/file_bug417760.png
rename to dom/html/test/file_bug417760.png
diff --git a/content/html/content/test/file_bug649778.html b/dom/html/test/file_bug649778.html
similarity index 100%
rename from content/html/content/test/file_bug649778.html
rename to dom/html/test/file_bug649778.html
diff --git a/content/html/content/test/file_bug649778.html^headers^ b/dom/html/test/file_bug649778.html^headers^
similarity index 100%
rename from content/html/content/test/file_bug649778.html^headers^
rename to dom/html/test/file_bug649778.html^headers^
diff --git a/content/html/document/test/file_bug871161-1.html b/dom/html/test/file_bug871161-1.html
similarity index 66%
rename from content/html/document/test/file_bug871161-1.html
rename to dom/html/test/file_bug871161-1.html
index 7222cdf1a96..16015f0c4e5 100644
--- a/content/html/document/test/file_bug871161-1.html
+++ b/dom/html/test/file_bug871161-1.html
@@ -10,7 +10,7 @@ function run() {
 </script>
 </head>
 <body onload="run();">
-<form method=post action="http://example.org/tests/content/html/document/test/file_bug871161-2.html"></form>
+<form method=post action="http://example.org/tests/dom/html/test/file_bug871161-2.html"></form>
 </body>
 </html>
 
diff --git a/content/html/document/test/file_bug871161-2.html b/dom/html/test/file_bug871161-2.html
similarity index 100%
rename from content/html/document/test/file_bug871161-2.html
rename to dom/html/test/file_bug871161-2.html
diff --git a/content/html/content/test/file_bug893537.html b/dom/html/test/file_bug893537.html
similarity index 100%
rename from content/html/content/test/file_bug893537.html
rename to dom/html/test/file_bug893537.html
diff --git a/content/html/content/test/file_formSubmission_img.jpg b/dom/html/test/file_formSubmission_img.jpg
similarity index 100%
rename from content/html/content/test/file_formSubmission_img.jpg
rename to dom/html/test/file_formSubmission_img.jpg
diff --git a/content/html/content/test/file_formSubmission_text.txt b/dom/html/test/file_formSubmission_text.txt
similarity index 100%
rename from content/html/content/test/file_formSubmission_text.txt
rename to dom/html/test/file_formSubmission_text.txt
diff --git a/content/html/content/test/file_fullscreen-ancestor-stacking-context.html b/dom/html/test/file_fullscreen-ancestor-stacking-context.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-ancestor-stacking-context.html
rename to dom/html/test/file_fullscreen-ancestor-stacking-context.html
diff --git a/content/html/content/test/file_fullscreen-api-keys.html b/dom/html/test/file_fullscreen-api-keys.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-api-keys.html
rename to dom/html/test/file_fullscreen-api-keys.html
diff --git a/content/html/content/test/file_fullscreen-api.html b/dom/html/test/file_fullscreen-api.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-api.html
rename to dom/html/test/file_fullscreen-api.html
diff --git a/content/html/content/test/file_fullscreen-denied-inner.html b/dom/html/test/file_fullscreen-denied-inner.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-denied-inner.html
rename to dom/html/test/file_fullscreen-denied-inner.html
diff --git a/content/html/content/test/file_fullscreen-denied.html b/dom/html/test/file_fullscreen-denied.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-denied.html
rename to dom/html/test/file_fullscreen-denied.html
diff --git a/content/html/content/test/file_fullscreen-esc-exit-inner.html b/dom/html/test/file_fullscreen-esc-exit-inner.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-esc-exit-inner.html
rename to dom/html/test/file_fullscreen-esc-exit-inner.html
diff --git a/content/html/content/test/file_fullscreen-esc-exit.html b/dom/html/test/file_fullscreen-esc-exit.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-esc-exit.html
rename to dom/html/test/file_fullscreen-esc-exit.html
diff --git a/content/html/content/test/file_fullscreen-hidden.html b/dom/html/test/file_fullscreen-hidden.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-hidden.html
rename to dom/html/test/file_fullscreen-hidden.html
diff --git a/content/html/content/test/file_fullscreen-multiple-inner.html b/dom/html/test/file_fullscreen-multiple-inner.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-multiple-inner.html
rename to dom/html/test/file_fullscreen-multiple-inner.html
diff --git a/content/html/content/test/file_fullscreen-multiple.html b/dom/html/test/file_fullscreen-multiple.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-multiple.html
rename to dom/html/test/file_fullscreen-multiple.html
diff --git a/content/html/content/test/file_fullscreen-navigation.html b/dom/html/test/file_fullscreen-navigation.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-navigation.html
rename to dom/html/test/file_fullscreen-navigation.html
diff --git a/content/html/content/test/file_fullscreen-plugins.html b/dom/html/test/file_fullscreen-plugins.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-plugins.html
rename to dom/html/test/file_fullscreen-plugins.html
diff --git a/content/html/content/test/file_fullscreen-rollback.html b/dom/html/test/file_fullscreen-rollback.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-rollback.html
rename to dom/html/test/file_fullscreen-rollback.html
diff --git a/content/html/content/test/file_fullscreen-svg-element.html b/dom/html/test/file_fullscreen-svg-element.html
similarity index 100%
rename from content/html/content/test/file_fullscreen-svg-element.html
rename to dom/html/test/file_fullscreen-svg-element.html
diff --git a/content/html/content/test/file_fullscreen-utils.js b/dom/html/test/file_fullscreen-utils.js
similarity index 100%
rename from content/html/content/test/file_fullscreen-utils.js
rename to dom/html/test/file_fullscreen-utils.js
diff --git a/content/html/content/test/file_iframe_sandbox_a_if1.html b/dom/html/test/file_iframe_sandbox_a_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if1.html
rename to dom/html/test/file_iframe_sandbox_a_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if10.html b/dom/html/test/file_iframe_sandbox_a_if10.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if10.html
rename to dom/html/test/file_iframe_sandbox_a_if10.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if11.html b/dom/html/test/file_iframe_sandbox_a_if11.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if11.html
rename to dom/html/test/file_iframe_sandbox_a_if11.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if12.html b/dom/html/test/file_iframe_sandbox_a_if12.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if12.html
rename to dom/html/test/file_iframe_sandbox_a_if12.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if13.html b/dom/html/test/file_iframe_sandbox_a_if13.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if13.html
rename to dom/html/test/file_iframe_sandbox_a_if13.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if14.html b/dom/html/test/file_iframe_sandbox_a_if14.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if14.html
rename to dom/html/test/file_iframe_sandbox_a_if14.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if15.html b/dom/html/test/file_iframe_sandbox_a_if15.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if15.html
rename to dom/html/test/file_iframe_sandbox_a_if15.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if16.html b/dom/html/test/file_iframe_sandbox_a_if16.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if16.html
rename to dom/html/test/file_iframe_sandbox_a_if16.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if17.html b/dom/html/test/file_iframe_sandbox_a_if17.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if17.html
rename to dom/html/test/file_iframe_sandbox_a_if17.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if18.html b/dom/html/test/file_iframe_sandbox_a_if18.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if18.html
rename to dom/html/test/file_iframe_sandbox_a_if18.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if19.html b/dom/html/test/file_iframe_sandbox_a_if19.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if19.html
rename to dom/html/test/file_iframe_sandbox_a_if19.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if2.html b/dom/html/test/file_iframe_sandbox_a_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if2.html
rename to dom/html/test/file_iframe_sandbox_a_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if3.html b/dom/html/test/file_iframe_sandbox_a_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if3.html
rename to dom/html/test/file_iframe_sandbox_a_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if4.html b/dom/html/test/file_iframe_sandbox_a_if4.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if4.html
rename to dom/html/test/file_iframe_sandbox_a_if4.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if5.html b/dom/html/test/file_iframe_sandbox_a_if5.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if5.html
rename to dom/html/test/file_iframe_sandbox_a_if5.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if6.html b/dom/html/test/file_iframe_sandbox_a_if6.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if6.html
rename to dom/html/test/file_iframe_sandbox_a_if6.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if7.html b/dom/html/test/file_iframe_sandbox_a_if7.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if7.html
rename to dom/html/test/file_iframe_sandbox_a_if7.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if8.html b/dom/html/test/file_iframe_sandbox_a_if8.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if8.html
rename to dom/html/test/file_iframe_sandbox_a_if8.html
diff --git a/content/html/content/test/file_iframe_sandbox_a_if9.html b/dom/html/test/file_iframe_sandbox_a_if9.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_a_if9.html
rename to dom/html/test/file_iframe_sandbox_a_if9.html
diff --git a/content/html/content/test/file_iframe_sandbox_b_if1.html b/dom/html/test/file_iframe_sandbox_b_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_b_if1.html
rename to dom/html/test/file_iframe_sandbox_b_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_b_if2.html b/dom/html/test/file_iframe_sandbox_b_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_b_if2.html
rename to dom/html/test/file_iframe_sandbox_b_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_b_if3.html b/dom/html/test/file_iframe_sandbox_b_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_b_if3.html
rename to dom/html/test/file_iframe_sandbox_b_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if1.html b/dom/html/test/file_iframe_sandbox_c_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if1.html
rename to dom/html/test/file_iframe_sandbox_c_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if2.html b/dom/html/test/file_iframe_sandbox_c_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if2.html
rename to dom/html/test/file_iframe_sandbox_c_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if3.html b/dom/html/test/file_iframe_sandbox_c_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if3.html
rename to dom/html/test/file_iframe_sandbox_c_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if4.html b/dom/html/test/file_iframe_sandbox_c_if4.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if4.html
rename to dom/html/test/file_iframe_sandbox_c_if4.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if5.html b/dom/html/test/file_iframe_sandbox_c_if5.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if5.html
rename to dom/html/test/file_iframe_sandbox_c_if5.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if6.html b/dom/html/test/file_iframe_sandbox_c_if6.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if6.html
rename to dom/html/test/file_iframe_sandbox_c_if6.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if7.html b/dom/html/test/file_iframe_sandbox_c_if7.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if7.html
rename to dom/html/test/file_iframe_sandbox_c_if7.html
diff --git a/content/html/content/test/file_iframe_sandbox_c_if8.html b/dom/html/test/file_iframe_sandbox_c_if8.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_c_if8.html
rename to dom/html/test/file_iframe_sandbox_c_if8.html
diff --git a/content/html/content/test/file_iframe_sandbox_close.html b/dom/html/test/file_iframe_sandbox_close.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_close.html
rename to dom/html/test/file_iframe_sandbox_close.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if1.html b/dom/html/test/file_iframe_sandbox_d_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if1.html
rename to dom/html/test/file_iframe_sandbox_d_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if10.html b/dom/html/test/file_iframe_sandbox_d_if10.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if10.html
rename to dom/html/test/file_iframe_sandbox_d_if10.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if11.html b/dom/html/test/file_iframe_sandbox_d_if11.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if11.html
rename to dom/html/test/file_iframe_sandbox_d_if11.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if12.html b/dom/html/test/file_iframe_sandbox_d_if12.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if12.html
rename to dom/html/test/file_iframe_sandbox_d_if12.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if13.html b/dom/html/test/file_iframe_sandbox_d_if13.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if13.html
rename to dom/html/test/file_iframe_sandbox_d_if13.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if14.html b/dom/html/test/file_iframe_sandbox_d_if14.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if14.html
rename to dom/html/test/file_iframe_sandbox_d_if14.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if15.html b/dom/html/test/file_iframe_sandbox_d_if15.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if15.html
rename to dom/html/test/file_iframe_sandbox_d_if15.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if16.html b/dom/html/test/file_iframe_sandbox_d_if16.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if16.html
rename to dom/html/test/file_iframe_sandbox_d_if16.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if17.html b/dom/html/test/file_iframe_sandbox_d_if17.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if17.html
rename to dom/html/test/file_iframe_sandbox_d_if17.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if18.html b/dom/html/test/file_iframe_sandbox_d_if18.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if18.html
rename to dom/html/test/file_iframe_sandbox_d_if18.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if19.html b/dom/html/test/file_iframe_sandbox_d_if19.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if19.html
rename to dom/html/test/file_iframe_sandbox_d_if19.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if2.html b/dom/html/test/file_iframe_sandbox_d_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if2.html
rename to dom/html/test/file_iframe_sandbox_d_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if20.html b/dom/html/test/file_iframe_sandbox_d_if20.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if20.html
rename to dom/html/test/file_iframe_sandbox_d_if20.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if21.html b/dom/html/test/file_iframe_sandbox_d_if21.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if21.html
rename to dom/html/test/file_iframe_sandbox_d_if21.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if22.html b/dom/html/test/file_iframe_sandbox_d_if22.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if22.html
rename to dom/html/test/file_iframe_sandbox_d_if22.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if23.html b/dom/html/test/file_iframe_sandbox_d_if23.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if23.html
rename to dom/html/test/file_iframe_sandbox_d_if23.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if3.html b/dom/html/test/file_iframe_sandbox_d_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if3.html
rename to dom/html/test/file_iframe_sandbox_d_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if4.html b/dom/html/test/file_iframe_sandbox_d_if4.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if4.html
rename to dom/html/test/file_iframe_sandbox_d_if4.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if5.html b/dom/html/test/file_iframe_sandbox_d_if5.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if5.html
rename to dom/html/test/file_iframe_sandbox_d_if5.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if6.html b/dom/html/test/file_iframe_sandbox_d_if6.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if6.html
rename to dom/html/test/file_iframe_sandbox_d_if6.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if7.html b/dom/html/test/file_iframe_sandbox_d_if7.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if7.html
rename to dom/html/test/file_iframe_sandbox_d_if7.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if8.html b/dom/html/test/file_iframe_sandbox_d_if8.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if8.html
rename to dom/html/test/file_iframe_sandbox_d_if8.html
diff --git a/content/html/content/test/file_iframe_sandbox_d_if9.html b/dom/html/test/file_iframe_sandbox_d_if9.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_d_if9.html
rename to dom/html/test/file_iframe_sandbox_d_if9.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if1.html b/dom/html/test/file_iframe_sandbox_e_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if1.html
rename to dom/html/test/file_iframe_sandbox_e_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if10.html b/dom/html/test/file_iframe_sandbox_e_if10.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if10.html
rename to dom/html/test/file_iframe_sandbox_e_if10.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if11.html b/dom/html/test/file_iframe_sandbox_e_if11.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if11.html
rename to dom/html/test/file_iframe_sandbox_e_if11.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if12.html b/dom/html/test/file_iframe_sandbox_e_if12.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if12.html
rename to dom/html/test/file_iframe_sandbox_e_if12.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if13.html b/dom/html/test/file_iframe_sandbox_e_if13.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if13.html
rename to dom/html/test/file_iframe_sandbox_e_if13.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if14.html b/dom/html/test/file_iframe_sandbox_e_if14.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if14.html
rename to dom/html/test/file_iframe_sandbox_e_if14.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if15.html b/dom/html/test/file_iframe_sandbox_e_if15.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if15.html
rename to dom/html/test/file_iframe_sandbox_e_if15.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if16.html b/dom/html/test/file_iframe_sandbox_e_if16.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if16.html
rename to dom/html/test/file_iframe_sandbox_e_if16.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if2.html b/dom/html/test/file_iframe_sandbox_e_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if2.html
rename to dom/html/test/file_iframe_sandbox_e_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if3.html b/dom/html/test/file_iframe_sandbox_e_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if3.html
rename to dom/html/test/file_iframe_sandbox_e_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if4.html b/dom/html/test/file_iframe_sandbox_e_if4.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if4.html
rename to dom/html/test/file_iframe_sandbox_e_if4.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if5.html b/dom/html/test/file_iframe_sandbox_e_if5.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if5.html
rename to dom/html/test/file_iframe_sandbox_e_if5.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if6.html b/dom/html/test/file_iframe_sandbox_e_if6.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if6.html
rename to dom/html/test/file_iframe_sandbox_e_if6.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if7.html b/dom/html/test/file_iframe_sandbox_e_if7.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if7.html
rename to dom/html/test/file_iframe_sandbox_e_if7.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if8.html b/dom/html/test/file_iframe_sandbox_e_if8.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if8.html
rename to dom/html/test/file_iframe_sandbox_e_if8.html
diff --git a/content/html/content/test/file_iframe_sandbox_e_if9.html b/dom/html/test/file_iframe_sandbox_e_if9.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_e_if9.html
rename to dom/html/test/file_iframe_sandbox_e_if9.html
diff --git a/content/html/content/test/file_iframe_sandbox_f_if1.html b/dom/html/test/file_iframe_sandbox_f_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_f_if1.html
rename to dom/html/test/file_iframe_sandbox_f_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_f_if2.html b/dom/html/test/file_iframe_sandbox_f_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_f_if2.html
rename to dom/html/test/file_iframe_sandbox_f_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_f_if2.html^headers^ b/dom/html/test/file_iframe_sandbox_f_if2.html^headers^
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_f_if2.html^headers^
rename to dom/html/test/file_iframe_sandbox_f_if2.html^headers^
diff --git a/content/html/content/test/file_iframe_sandbox_fail.js b/dom/html/test/file_iframe_sandbox_fail.js
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_fail.js
rename to dom/html/test/file_iframe_sandbox_fail.js
diff --git a/content/html/content/test/file_iframe_sandbox_form_fail.html b/dom/html/test/file_iframe_sandbox_form_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_form_fail.html
rename to dom/html/test/file_iframe_sandbox_form_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_form_pass.html b/dom/html/test/file_iframe_sandbox_form_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_form_pass.html
rename to dom/html/test/file_iframe_sandbox_form_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_g_if1.html b/dom/html/test/file_iframe_sandbox_g_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_g_if1.html
rename to dom/html/test/file_iframe_sandbox_g_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_h_if1.html b/dom/html/test/file_iframe_sandbox_h_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_h_if1.html
rename to dom/html/test/file_iframe_sandbox_h_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_j_if1.html b/dom/html/test/file_iframe_sandbox_j_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_j_if1.html
rename to dom/html/test/file_iframe_sandbox_j_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_j_if2.html b/dom/html/test/file_iframe_sandbox_j_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_j_if2.html
rename to dom/html/test/file_iframe_sandbox_j_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_j_if3.html b/dom/html/test/file_iframe_sandbox_j_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_j_if3.html
rename to dom/html/test/file_iframe_sandbox_j_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if1.html b/dom/html/test/file_iframe_sandbox_k_if1.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if1.html
rename to dom/html/test/file_iframe_sandbox_k_if1.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if2.html b/dom/html/test/file_iframe_sandbox_k_if2.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if2.html
rename to dom/html/test/file_iframe_sandbox_k_if2.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if3.html b/dom/html/test/file_iframe_sandbox_k_if3.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if3.html
rename to dom/html/test/file_iframe_sandbox_k_if3.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if4.html b/dom/html/test/file_iframe_sandbox_k_if4.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if4.html
rename to dom/html/test/file_iframe_sandbox_k_if4.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if5.html b/dom/html/test/file_iframe_sandbox_k_if5.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if5.html
rename to dom/html/test/file_iframe_sandbox_k_if5.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if6.html b/dom/html/test/file_iframe_sandbox_k_if6.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if6.html
rename to dom/html/test/file_iframe_sandbox_k_if6.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if7.html b/dom/html/test/file_iframe_sandbox_k_if7.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if7.html
rename to dom/html/test/file_iframe_sandbox_k_if7.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if8.html b/dom/html/test/file_iframe_sandbox_k_if8.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if8.html
rename to dom/html/test/file_iframe_sandbox_k_if8.html
diff --git a/content/html/content/test/file_iframe_sandbox_k_if9.html b/dom/html/test/file_iframe_sandbox_k_if9.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_k_if9.html
rename to dom/html/test/file_iframe_sandbox_k_if9.html
diff --git a/content/html/content/test/file_iframe_sandbox_navigation_fail.html b/dom/html/test/file_iframe_sandbox_navigation_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_navigation_fail.html
rename to dom/html/test/file_iframe_sandbox_navigation_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_navigation_pass.html b/dom/html/test/file_iframe_sandbox_navigation_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_navigation_pass.html
rename to dom/html/test/file_iframe_sandbox_navigation_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_navigation_start.html b/dom/html/test/file_iframe_sandbox_navigation_start.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_navigation_start.html
rename to dom/html/test/file_iframe_sandbox_navigation_start.html
diff --git a/content/html/content/test/file_iframe_sandbox_open_window_fail.html b/dom/html/test/file_iframe_sandbox_open_window_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_open_window_fail.html
rename to dom/html/test/file_iframe_sandbox_open_window_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_open_window_pass.html b/dom/html/test/file_iframe_sandbox_open_window_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_open_window_pass.html
rename to dom/html/test/file_iframe_sandbox_open_window_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_pass.js b/dom/html/test/file_iframe_sandbox_pass.js
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_pass.js
rename to dom/html/test/file_iframe_sandbox_pass.js
diff --git a/content/html/content/test/file_iframe_sandbox_redirect.html b/dom/html/test/file_iframe_sandbox_redirect.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_redirect.html
rename to dom/html/test/file_iframe_sandbox_redirect.html
diff --git a/content/html/content/test/file_iframe_sandbox_redirect.html^headers^ b/dom/html/test/file_iframe_sandbox_redirect.html^headers^
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_redirect.html^headers^
rename to dom/html/test/file_iframe_sandbox_redirect.html^headers^
diff --git a/content/html/content/test/file_iframe_sandbox_redirect_target.html b/dom/html/test/file_iframe_sandbox_redirect_target.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_redirect_target.html
rename to dom/html/test/file_iframe_sandbox_redirect_target.html
diff --git a/content/html/content/test/file_iframe_sandbox_top_navigation_fail.html b/dom/html/test/file_iframe_sandbox_top_navigation_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_top_navigation_fail.html
rename to dom/html/test/file_iframe_sandbox_top_navigation_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_top_navigation_pass.html b/dom/html/test/file_iframe_sandbox_top_navigation_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_top_navigation_pass.html
rename to dom/html/test/file_iframe_sandbox_top_navigation_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_form_fail.html b/dom/html/test/file_iframe_sandbox_window_form_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_form_fail.html
rename to dom/html/test/file_iframe_sandbox_window_form_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_form_pass.html b/dom/html/test/file_iframe_sandbox_window_form_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_form_pass.html
rename to dom/html/test/file_iframe_sandbox_window_form_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_navigation_fail.html b/dom/html/test/file_iframe_sandbox_window_navigation_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_navigation_fail.html
rename to dom/html/test/file_iframe_sandbox_window_navigation_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_navigation_pass.html b/dom/html/test/file_iframe_sandbox_window_navigation_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_navigation_pass.html
rename to dom/html/test/file_iframe_sandbox_window_navigation_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_top_navigation_fail.html b/dom/html/test/file_iframe_sandbox_window_top_navigation_fail.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_top_navigation_fail.html
rename to dom/html/test/file_iframe_sandbox_window_top_navigation_fail.html
diff --git a/content/html/content/test/file_iframe_sandbox_window_top_navigation_pass.html b/dom/html/test/file_iframe_sandbox_window_top_navigation_pass.html
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_window_top_navigation_pass.html
rename to dom/html/test/file_iframe_sandbox_window_top_navigation_pass.html
diff --git a/content/html/content/test/file_iframe_sandbox_worker.js b/dom/html/test/file_iframe_sandbox_worker.js
similarity index 100%
rename from content/html/content/test/file_iframe_sandbox_worker.js
rename to dom/html/test/file_iframe_sandbox_worker.js
diff --git a/content/html/content/test/file_ignoreuserfocus.html b/dom/html/test/file_ignoreuserfocus.html
similarity index 100%
rename from content/html/content/test/file_ignoreuserfocus.html
rename to dom/html/test/file_ignoreuserfocus.html
diff --git a/content/html/content/test/file_imports_basics.html b/dom/html/test/file_imports_basics.html
similarity index 100%
rename from content/html/content/test/file_imports_basics.html
rename to dom/html/test/file_imports_basics.html
diff --git a/content/html/content/test/file_imports_redirect.html b/dom/html/test/file_imports_redirect.html
similarity index 100%
rename from content/html/content/test/file_imports_redirect.html
rename to dom/html/test/file_imports_redirect.html
diff --git a/dom/html/test/file_imports_redirect.html^headers^ b/dom/html/test/file_imports_redirect.html^headers^
new file mode 100644
index 00000000000..39585a340fc
--- /dev/null
+++ b/dom/html/test/file_imports_redirect.html^headers^
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: http://mochi.test:8888/tests/dom/html/test/file_imports_redirected.html
diff --git a/content/html/content/test/file_imports_redirected.html b/dom/html/test/file_imports_redirected.html
similarity index 100%
rename from content/html/content/test/file_imports_redirected.html
rename to dom/html/test/file_imports_redirected.html
diff --git a/content/html/content/test/file_srcdoc-2.html b/dom/html/test/file_srcdoc-2.html
similarity index 100%
rename from content/html/content/test/file_srcdoc-2.html
rename to dom/html/test/file_srcdoc-2.html
diff --git a/content/html/content/test/file_srcdoc.html b/dom/html/test/file_srcdoc.html
similarity index 100%
rename from content/html/content/test/file_srcdoc.html
rename to dom/html/test/file_srcdoc.html
diff --git a/content/html/content/test/form_submit_server.sjs b/dom/html/test/form_submit_server.sjs
similarity index 100%
rename from content/html/content/test/form_submit_server.sjs
rename to dom/html/test/form_submit_server.sjs
diff --git a/content/html/content/test/forms/chrome.ini b/dom/html/test/forms/chrome.ini
similarity index 100%
rename from content/html/content/test/forms/chrome.ini
rename to dom/html/test/forms/chrome.ini
diff --git a/content/html/content/test/forms/mochitest.ini b/dom/html/test/forms/mochitest.ini
similarity index 100%
rename from content/html/content/test/forms/mochitest.ini
rename to dom/html/test/forms/mochitest.ini
diff --git a/content/html/content/test/forms/save_restore_radio_groups.sjs b/dom/html/test/forms/save_restore_radio_groups.sjs
similarity index 100%
rename from content/html/content/test/forms/save_restore_radio_groups.sjs
rename to dom/html/test/forms/save_restore_radio_groups.sjs
diff --git a/content/html/content/test/forms/submit_invalid_file.sjs b/dom/html/test/forms/submit_invalid_file.sjs
similarity index 100%
rename from content/html/content/test/forms/submit_invalid_file.sjs
rename to dom/html/test/forms/submit_invalid_file.sjs
diff --git a/content/html/content/test/forms/test_autocompleteinfo.html b/dom/html/test/forms/test_autocompleteinfo.html
similarity index 100%
rename from content/html/content/test/forms/test_autocompleteinfo.html
rename to dom/html/test/forms/test_autocompleteinfo.html
diff --git a/content/html/content/test/forms/test_bug1039548.html b/dom/html/test/forms/test_bug1039548.html
similarity index 100%
rename from content/html/content/test/forms/test_bug1039548.html
rename to dom/html/test/forms/test_bug1039548.html
diff --git a/content/html/content/test/forms/test_button_attributes_reflection.html b/dom/html/test/forms/test_button_attributes_reflection.html
similarity index 98%
rename from content/html/content/test/forms/test_button_attributes_reflection.html
rename to dom/html/test/forms/test_button_attributes_reflection.html
index 4a3fe04fc6e..26858e939b9 100644
--- a/content/html/content/test/forms/test_button_attributes_reflection.html
+++ b/dom/html/test/forms/test_button_attributes_reflection.html
@@ -28,7 +28,7 @@ reflectBoolean({
 });
 
 // TODO: formAction (URL).  But note that we currently reflect it weirdly; see
-// content/html/content/test/test_bug607145.html
+// dom/html/test/test_bug607145.html
 
 // .formEnctype
 reflectLimitedEnumerated({
diff --git a/content/html/content/test/forms/test_change_event.html b/dom/html/test/forms/test_change_event.html
similarity index 100%
rename from content/html/content/test/forms/test_change_event.html
rename to dom/html/test/forms/test_change_event.html
diff --git a/content/html/content/test/forms/test_datalist_element.html b/dom/html/test/forms/test_datalist_element.html
similarity index 100%
rename from content/html/content/test/forms/test_datalist_element.html
rename to dom/html/test/forms/test_datalist_element.html
diff --git a/content/html/content/test/forms/test_experimental_forms_pref.html b/dom/html/test/forms/test_experimental_forms_pref.html
similarity index 100%
rename from content/html/content/test/forms/test_experimental_forms_pref.html
rename to dom/html/test/forms/test_experimental_forms_pref.html
diff --git a/content/html/content/test/forms/test_form_attribute-1.html b/dom/html/test/forms/test_form_attribute-1.html
similarity index 100%
rename from content/html/content/test/forms/test_form_attribute-1.html
rename to dom/html/test/forms/test_form_attribute-1.html
diff --git a/content/html/content/test/forms/test_form_attribute-2.html b/dom/html/test/forms/test_form_attribute-2.html
similarity index 100%
rename from content/html/content/test/forms/test_form_attribute-2.html
rename to dom/html/test/forms/test_form_attribute-2.html
diff --git a/content/html/content/test/forms/test_form_attribute-3.html b/dom/html/test/forms/test_form_attribute-3.html
similarity index 100%
rename from content/html/content/test/forms/test_form_attribute-3.html
rename to dom/html/test/forms/test_form_attribute-3.html
diff --git a/content/html/content/test/forms/test_form_attribute-4.html b/dom/html/test/forms/test_form_attribute-4.html
similarity index 100%
rename from content/html/content/test/forms/test_form_attribute-4.html
rename to dom/html/test/forms/test_form_attribute-4.html
diff --git a/content/html/content/test/forms/test_form_attributes_reflection.html b/dom/html/test/forms/test_form_attributes_reflection.html
similarity index 97%
rename from content/html/content/test/forms/test_form_attributes_reflection.html
rename to dom/html/test/forms/test_form_attributes_reflection.html
index 1569646d53f..0c64ac4ea02 100644
--- a/content/html/content/test/forms/test_form_attributes_reflection.html
+++ b/dom/html/test/forms/test_form_attributes_reflection.html
@@ -23,7 +23,7 @@ reflectString({
 });
 
 // TODO: action (URL).  But note that we currently reflect it weirdly; see
-// content/html/content/test/test_bug607145.html
+// dom/html/test/test_bug607145.html
 
 // .autocomplete
 reflectLimitedEnumerated({
diff --git a/content/html/content/test/forms/test_form_named_getter_dynamic.html b/dom/html/test/forms/test_form_named_getter_dynamic.html
similarity index 100%
rename from content/html/content/test/forms/test_form_named_getter_dynamic.html
rename to dom/html/test/forms/test_form_named_getter_dynamic.html
diff --git a/content/html/content/test/forms/test_formaction_attribute.html b/dom/html/test/forms/test_formaction_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_formaction_attribute.html
rename to dom/html/test/forms/test_formaction_attribute.html
diff --git a/content/html/content/test/forms/test_formnovalidate_attribute.html b/dom/html/test/forms/test_formnovalidate_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_formnovalidate_attribute.html
rename to dom/html/test/forms/test_formnovalidate_attribute.html
diff --git a/content/html/content/test/forms/test_input_attributes_reflection.html b/dom/html/test/forms/test_input_attributes_reflection.html
similarity index 99%
rename from content/html/content/test/forms/test_input_attributes_reflection.html
rename to dom/html/test/forms/test_input_attributes_reflection.html
index 89a0c342b8a..070acbf139e 100644
--- a/content/html/content/test/forms/test_input_attributes_reflection.html
+++ b/dom/html/test/forms/test_input_attributes_reflection.html
@@ -98,7 +98,7 @@ reflectBoolean({
 // TODO: form (HTMLFormElement)
 // TODO: files (FileList)
 // TODO: formAction (URL).  But note that we currently reflect it weirdly; see
-// content/html/content/test/test_bug607145.html
+// dom/html/test/test_bug607145.html
 
 // .formEnctype
 reflectLimitedEnumerated({
diff --git a/content/html/content/test/forms/test_input_autocomplete.html b/dom/html/test/forms/test_input_autocomplete.html
similarity index 100%
rename from content/html/content/test/forms/test_input_autocomplete.html
rename to dom/html/test/forms/test_input_autocomplete.html
diff --git a/content/html/content/test/forms/test_input_color_input_change_events.html b/dom/html/test/forms/test_input_color_input_change_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_color_input_change_events.html
rename to dom/html/test/forms/test_input_color_input_change_events.html
diff --git a/content/html/content/test/forms/test_input_color_picker_initial.html b/dom/html/test/forms/test_input_color_picker_initial.html
similarity index 100%
rename from content/html/content/test/forms/test_input_color_picker_initial.html
rename to dom/html/test/forms/test_input_color_picker_initial.html
diff --git a/content/html/content/test/forms/test_input_color_picker_popup.html b/dom/html/test/forms/test_input_color_picker_popup.html
similarity index 100%
rename from content/html/content/test/forms/test_input_color_picker_popup.html
rename to dom/html/test/forms/test_input_color_picker_popup.html
diff --git a/content/html/content/test/forms/test_input_color_picker_update.html b/dom/html/test/forms/test_input_color_picker_update.html
similarity index 100%
rename from content/html/content/test/forms/test_input_color_picker_update.html
rename to dom/html/test/forms/test_input_color_picker_update.html
diff --git a/content/html/content/test/forms/test_input_defaultValue.html b/dom/html/test/forms/test_input_defaultValue.html
similarity index 100%
rename from content/html/content/test/forms/test_input_defaultValue.html
rename to dom/html/test/forms/test_input_defaultValue.html
diff --git a/content/html/content/test/forms/test_input_email.html b/dom/html/test/forms/test_input_email.html
similarity index 100%
rename from content/html/content/test/forms/test_input_email.html
rename to dom/html/test/forms/test_input_email.html
diff --git a/content/html/content/test/forms/test_input_event.html b/dom/html/test/forms/test_input_event.html
similarity index 100%
rename from content/html/content/test/forms/test_input_event.html
rename to dom/html/test/forms/test_input_event.html
diff --git a/content/html/content/test/forms/test_input_file_picker.html b/dom/html/test/forms/test_input_file_picker.html
similarity index 100%
rename from content/html/content/test/forms/test_input_file_picker.html
rename to dom/html/test/forms/test_input_file_picker.html
diff --git a/content/html/content/test/forms/test_input_list_attribute.html b/dom/html/test/forms/test_input_list_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_input_list_attribute.html
rename to dom/html/test/forms/test_input_list_attribute.html
diff --git a/content/html/content/test/forms/test_input_number_data.js b/dom/html/test/forms/test_input_number_data.js
similarity index 100%
rename from content/html/content/test/forms/test_input_number_data.js
rename to dom/html/test/forms/test_input_number_data.js
diff --git a/content/html/content/test/forms/test_input_number_key_events.html b/dom/html/test/forms/test_input_number_key_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_number_key_events.html
rename to dom/html/test/forms/test_input_number_key_events.html
diff --git a/content/html/content/test/forms/test_input_number_l10n.html b/dom/html/test/forms/test_input_number_l10n.html
similarity index 100%
rename from content/html/content/test/forms/test_input_number_l10n.html
rename to dom/html/test/forms/test_input_number_l10n.html
diff --git a/content/html/content/test/forms/test_input_number_mouse_events.html b/dom/html/test/forms/test_input_number_mouse_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_number_mouse_events.html
rename to dom/html/test/forms/test_input_number_mouse_events.html
diff --git a/content/html/content/test/forms/test_input_number_rounding.html b/dom/html/test/forms/test_input_number_rounding.html
similarity index 100%
rename from content/html/content/test/forms/test_input_number_rounding.html
rename to dom/html/test/forms/test_input_number_rounding.html
diff --git a/content/html/content/test/forms/test_input_number_validation.html b/dom/html/test/forms/test_input_number_validation.html
similarity index 100%
rename from content/html/content/test/forms/test_input_number_validation.html
rename to dom/html/test/forms/test_input_number_validation.html
diff --git a/content/html/content/test/forms/test_input_radio_radiogroup.html b/dom/html/test/forms/test_input_radio_radiogroup.html
similarity index 100%
rename from content/html/content/test/forms/test_input_radio_radiogroup.html
rename to dom/html/test/forms/test_input_radio_radiogroup.html
diff --git a/content/html/content/test/forms/test_input_range_attr_order.html b/dom/html/test/forms/test_input_range_attr_order.html
similarity index 100%
rename from content/html/content/test/forms/test_input_range_attr_order.html
rename to dom/html/test/forms/test_input_range_attr_order.html
diff --git a/content/html/content/test/forms/test_input_range_key_events.html b/dom/html/test/forms/test_input_range_key_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_range_key_events.html
rename to dom/html/test/forms/test_input_range_key_events.html
diff --git a/content/html/content/test/forms/test_input_range_mouse_and_touch_events.html b/dom/html/test/forms/test_input_range_mouse_and_touch_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_range_mouse_and_touch_events.html
rename to dom/html/test/forms/test_input_range_mouse_and_touch_events.html
diff --git a/content/html/content/test/forms/test_input_range_rounding.html b/dom/html/test/forms/test_input_range_rounding.html
similarity index 100%
rename from content/html/content/test/forms/test_input_range_rounding.html
rename to dom/html/test/forms/test_input_range_rounding.html
diff --git a/content/html/content/test/forms/test_input_sanitization.html b/dom/html/test/forms/test_input_sanitization.html
similarity index 100%
rename from content/html/content/test/forms/test_input_sanitization.html
rename to dom/html/test/forms/test_input_sanitization.html
diff --git a/content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html b/dom/html/test/forms/test_input_textarea_set_value_no_scroll.html
similarity index 100%
rename from content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html
rename to dom/html/test/forms/test_input_textarea_set_value_no_scroll.html
diff --git a/content/html/content/test/forms/test_input_typing_sanitization.html b/dom/html/test/forms/test_input_typing_sanitization.html
similarity index 97%
rename from content/html/content/test/forms/test_input_typing_sanitization.html
rename to dom/html/test/forms/test_input_typing_sanitization.html
index 38d0f39b2af..2abc56fd666 100644
--- a/content/html/content/test/forms/test_input_typing_sanitization.html
+++ b/dom/html/test/forms/test_input_typing_sanitization.html
@@ -63,7 +63,7 @@ function runTestsForNextInputType()
 function checkValueSubmittedIsValid()
 {
   is(frames['submit_frame'].location.href,
-     'http://mochi.test:8888/tests/content/html/content/test/forms/foo?i='
+     'http://mochi.test:8888/tests/dom/html/test/forms/foo?i='
      + urlify(gValidData[valueIndex++]),
      "The submitted value should not have been sanitized");
 
@@ -86,7 +86,7 @@ function checkValueSubmittedIsValid()
 function checkValueSubmittedIsInvalid()
 {
   is(frames['submit_frame'].location.href,
-     'http://mochi.test:8888/tests/content/html/content/test/forms/foo?i=',
+     'http://mochi.test:8888/tests/dom/html/test/forms/foo?i=',
      "The submitted value should have been sanitized");
 
   valueIndex++;
diff --git a/content/html/content/test/forms/test_input_untrusted_key_events.html b/dom/html/test/forms/test_input_untrusted_key_events.html
similarity index 100%
rename from content/html/content/test/forms/test_input_untrusted_key_events.html
rename to dom/html/test/forms/test_input_untrusted_key_events.html
diff --git a/content/html/content/test/forms/test_input_url.html b/dom/html/test/forms/test_input_url.html
similarity index 100%
rename from content/html/content/test/forms/test_input_url.html
rename to dom/html/test/forms/test_input_url.html
diff --git a/content/html/content/test/forms/test_label_control_attribute.html b/dom/html/test/forms/test_label_control_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_label_control_attribute.html
rename to dom/html/test/forms/test_label_control_attribute.html
diff --git a/content/html/content/test/forms/test_label_input_controls.html b/dom/html/test/forms/test_label_input_controls.html
similarity index 100%
rename from content/html/content/test/forms/test_label_input_controls.html
rename to dom/html/test/forms/test_label_input_controls.html
diff --git a/content/html/content/test/forms/test_max_attribute.html b/dom/html/test/forms/test_max_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_max_attribute.html
rename to dom/html/test/forms/test_max_attribute.html
diff --git a/content/html/content/test/forms/test_maxlength_attribute.html b/dom/html/test/forms/test_maxlength_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_maxlength_attribute.html
rename to dom/html/test/forms/test_maxlength_attribute.html
diff --git a/content/html/content/test/forms/test_meter_element.html b/dom/html/test/forms/test_meter_element.html
similarity index 99%
rename from content/html/content/test/forms/test_meter_element.html
rename to dom/html/test/forms/test_meter_element.html
index 6b6547ac99d..81efc1c244e 100644
--- a/content/html/content/test/forms/test_meter_element.html
+++ b/dom/html/test/forms/test_meter_element.html
@@ -320,7 +320,7 @@ function checkNotResetableAndFormSubmission(aElement)
      * element value should not appear.
      */
     is(frames['submit_frame'].location.href,
-      'http://mochi.test:8888/tests/content/html/content/test/forms/foo?a=tulip',
+      'http://mochi.test:8888/tests/dom/html/test/forms/foo?a=tulip',
        "The meter element value should not be submitted");
 
     checkNotResetable();
diff --git a/content/html/content/test/forms/test_meter_pseudo-classes.html b/dom/html/test/forms/test_meter_pseudo-classes.html
similarity index 100%
rename from content/html/content/test/forms/test_meter_pseudo-classes.html
rename to dom/html/test/forms/test_meter_pseudo-classes.html
diff --git a/content/html/content/test/forms/test_min_attribute.html b/dom/html/test/forms/test_min_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_min_attribute.html
rename to dom/html/test/forms/test_min_attribute.html
diff --git a/content/html/content/test/forms/test_mozistextfield.html b/dom/html/test/forms/test_mozistextfield.html
similarity index 100%
rename from content/html/content/test/forms/test_mozistextfield.html
rename to dom/html/test/forms/test_mozistextfield.html
diff --git a/content/html/content/test/forms/test_novalidate_attribute.html b/dom/html/test/forms/test_novalidate_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_novalidate_attribute.html
rename to dom/html/test/forms/test_novalidate_attribute.html
diff --git a/content/html/content/test/forms/test_option_disabled.html b/dom/html/test/forms/test_option_disabled.html
similarity index 100%
rename from content/html/content/test/forms/test_option_disabled.html
rename to dom/html/test/forms/test_option_disabled.html
diff --git a/content/html/content/test/forms/test_option_index_attribute.html b/dom/html/test/forms/test_option_index_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_option_index_attribute.html
rename to dom/html/test/forms/test_option_index_attribute.html
diff --git a/content/html/content/test/forms/test_option_text.html b/dom/html/test/forms/test_option_text.html
similarity index 100%
rename from content/html/content/test/forms/test_option_text.html
rename to dom/html/test/forms/test_option_text.html
diff --git a/content/html/content/test/forms/test_output_element.html b/dom/html/test/forms/test_output_element.html
similarity index 98%
rename from content/html/content/test/forms/test_output_element.html
rename to dom/html/test/forms/test_output_element.html
index c4539dba39c..2be6f83215d 100644
--- a/content/html/content/test/forms/test_output_element.html
+++ b/dom/html/test/forms/test_output_element.html
@@ -136,7 +136,7 @@ function checkFormSubmission()
    */
 
   is(frames['submit_frame'].location.href,
-    'http://mochi.test:8888/tests/content/html/content/test/forms/foo?a=afield&b=bfield',
+    'http://mochi.test:8888/tests/dom/html/test/forms/foo?a=afield&b=bfield',
      "The output element value should not be submitted");
   SimpleTest.finish();
 }
diff --git a/content/html/content/test/forms/test_pattern_attribute.html b/dom/html/test/forms/test_pattern_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_pattern_attribute.html
rename to dom/html/test/forms/test_pattern_attribute.html
diff --git a/content/html/content/test/forms/test_progress_element.html b/dom/html/test/forms/test_progress_element.html
similarity index 99%
rename from content/html/content/test/forms/test_progress_element.html
rename to dom/html/test/forms/test_progress_element.html
index 7ac89fcbac4..fa4c2805e7d 100644
--- a/content/html/content/test/forms/test_progress_element.html
+++ b/dom/html/test/forms/test_progress_element.html
@@ -255,7 +255,7 @@ function checkNotResetableAndFormSubmission(aElement)
      * element value should not appear.
      */
     is(frames['submit_frame'].location.href,
-      'http://mochi.test:8888/tests/content/html/content/test/forms/foo?a=tulip',
+      'http://mochi.test:8888/tests/dom/html/test/forms/foo?a=tulip',
        "The progress element value should not be submitted");
 
     checkNotResetable();
diff --git a/content/html/content/test/forms/test_radio_radionodelist.html b/dom/html/test/forms/test_radio_radionodelist.html
similarity index 100%
rename from content/html/content/test/forms/test_radio_radionodelist.html
rename to dom/html/test/forms/test_radio_radionodelist.html
diff --git a/content/html/content/test/forms/test_required_attribute.html b/dom/html/test/forms/test_required_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_required_attribute.html
rename to dom/html/test/forms/test_required_attribute.html
diff --git a/content/html/content/test/forms/test_restore_form_elements.html b/dom/html/test/forms/test_restore_form_elements.html
similarity index 100%
rename from content/html/content/test/forms/test_restore_form_elements.html
rename to dom/html/test/forms/test_restore_form_elements.html
diff --git a/content/html/content/test/forms/test_save_restore_radio_groups.html b/dom/html/test/forms/test_save_restore_radio_groups.html
similarity index 100%
rename from content/html/content/test/forms/test_save_restore_radio_groups.html
rename to dom/html/test/forms/test_save_restore_radio_groups.html
diff --git a/content/html/content/test/forms/test_select_selectedOptions.html b/dom/html/test/forms/test_select_selectedOptions.html
similarity index 100%
rename from content/html/content/test/forms/test_select_selectedOptions.html
rename to dom/html/test/forms/test_select_selectedOptions.html
diff --git a/content/html/content/test/forms/test_select_validation.html b/dom/html/test/forms/test_select_validation.html
similarity index 100%
rename from content/html/content/test/forms/test_select_validation.html
rename to dom/html/test/forms/test_select_validation.html
diff --git a/content/html/content/test/forms/test_set_range_text.html b/dom/html/test/forms/test_set_range_text.html
similarity index 100%
rename from content/html/content/test/forms/test_set_range_text.html
rename to dom/html/test/forms/test_set_range_text.html
diff --git a/content/html/content/test/forms/test_step_attribute.html b/dom/html/test/forms/test_step_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_step_attribute.html
rename to dom/html/test/forms/test_step_attribute.html
diff --git a/content/html/content/test/forms/test_stepup_stepdown.html b/dom/html/test/forms/test_stepup_stepdown.html
similarity index 100%
rename from content/html/content/test/forms/test_stepup_stepdown.html
rename to dom/html/test/forms/test_stepup_stepdown.html
diff --git a/content/html/content/test/forms/test_submit_invalid_file.html b/dom/html/test/forms/test_submit_invalid_file.html
similarity index 92%
rename from content/html/content/test/forms/test_submit_invalid_file.html
rename to dom/html/test/forms/test_submit_invalid_file.html
index 145d8f456e3..3941bf2b6d9 100644
--- a/content/html/content/test/forms/test_submit_invalid_file.html
+++ b/dom/html/test/forms/test_submit_invalid_file.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=702949
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=702949">Mozilla Bug 702949</a>
 <p id="display"></p>
 <div id="content" style="display: none">
-  <form action='http://mochi.test:8888/chrome/content/html/content/test/forms/submit_invalid_file.sjs' method='post' target='result'
+  <form action='http://mochi.test:8888/chrome/dom/html/test/forms/submit_invalid_file.sjs' method='post' target='result'
         enctype='multipart/form-data'>
     <input type='file' name='file'>
   </form>
diff --git a/content/html/content/test/forms/test_textarea_attributes_reflection.html b/dom/html/test/forms/test_textarea_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/forms/test_textarea_attributes_reflection.html
rename to dom/html/test/forms/test_textarea_attributes_reflection.html
diff --git a/content/html/content/test/forms/test_validation.html b/dom/html/test/forms/test_validation.html
similarity index 100%
rename from content/html/content/test/forms/test_validation.html
rename to dom/html/test/forms/test_validation.html
diff --git a/content/html/content/test/forms/test_validation_not_in_doc.html b/dom/html/test/forms/test_validation_not_in_doc.html
similarity index 100%
rename from content/html/content/test/forms/test_validation_not_in_doc.html
rename to dom/html/test/forms/test_validation_not_in_doc.html
diff --git a/content/html/content/test/forms/test_valueAsDate_pref.html b/dom/html/test/forms/test_valueAsDate_pref.html
similarity index 100%
rename from content/html/content/test/forms/test_valueAsDate_pref.html
rename to dom/html/test/forms/test_valueAsDate_pref.html
diff --git a/content/html/content/test/forms/test_valueasdate_attribute.html b/dom/html/test/forms/test_valueasdate_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_valueasdate_attribute.html
rename to dom/html/test/forms/test_valueasdate_attribute.html
diff --git a/content/html/content/test/forms/test_valueasnumber_attribute.html b/dom/html/test/forms/test_valueasnumber_attribute.html
similarity index 100%
rename from content/html/content/test/forms/test_valueasnumber_attribute.html
rename to dom/html/test/forms/test_valueasnumber_attribute.html
diff --git a/content/html/content/test/image-allow-credentials.png b/dom/html/test/image-allow-credentials.png
similarity index 100%
rename from content/html/content/test/image-allow-credentials.png
rename to dom/html/test/image-allow-credentials.png
diff --git a/content/html/content/test/image-allow-credentials.png^headers^ b/dom/html/test/image-allow-credentials.png^headers^
similarity index 100%
rename from content/html/content/test/image-allow-credentials.png^headers^
rename to dom/html/test/image-allow-credentials.png^headers^
diff --git a/content/html/content/test/image.png b/dom/html/test/image.png
similarity index 100%
rename from content/html/content/test/image.png
rename to dom/html/test/image.png
diff --git a/content/html/content/test/imports/file_cycle_1_A.html b/dom/html/test/imports/file_cycle_1_A.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_1_A.html
rename to dom/html/test/imports/file_cycle_1_A.html
diff --git a/content/html/content/test/imports/file_cycle_1_B.html b/dom/html/test/imports/file_cycle_1_B.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_1_B.html
rename to dom/html/test/imports/file_cycle_1_B.html
diff --git a/content/html/content/test/imports/file_cycle_1_C.html b/dom/html/test/imports/file_cycle_1_C.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_1_C.html
rename to dom/html/test/imports/file_cycle_1_C.html
diff --git a/content/html/content/test/imports/file_cycle_2_A.html b/dom/html/test/imports/file_cycle_2_A.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_2_A.html
rename to dom/html/test/imports/file_cycle_2_A.html
diff --git a/content/html/content/test/imports/file_cycle_2_B.html b/dom/html/test/imports/file_cycle_2_B.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_2_B.html
rename to dom/html/test/imports/file_cycle_2_B.html
diff --git a/content/html/content/test/imports/file_cycle_2_C.html b/dom/html/test/imports/file_cycle_2_C.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_2_C.html
rename to dom/html/test/imports/file_cycle_2_C.html
diff --git a/content/html/content/test/imports/file_cycle_2_D.html b/dom/html/test/imports/file_cycle_2_D.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_2_D.html
rename to dom/html/test/imports/file_cycle_2_D.html
diff --git a/content/html/content/test/imports/file_cycle_3_A.html b/dom/html/test/imports/file_cycle_3_A.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_3_A.html
rename to dom/html/test/imports/file_cycle_3_A.html
diff --git a/content/html/content/test/imports/file_cycle_3_B.html b/dom/html/test/imports/file_cycle_3_B.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_3_B.html
rename to dom/html/test/imports/file_cycle_3_B.html
diff --git a/content/html/content/test/imports/file_cycle_3_C.html b/dom/html/test/imports/file_cycle_3_C.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_3_C.html
rename to dom/html/test/imports/file_cycle_3_C.html
diff --git a/content/html/content/test/imports/file_cycle_4_A.html b/dom/html/test/imports/file_cycle_4_A.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_4_A.html
rename to dom/html/test/imports/file_cycle_4_A.html
diff --git a/content/html/content/test/imports/file_cycle_4_B.html b/dom/html/test/imports/file_cycle_4_B.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_4_B.html
rename to dom/html/test/imports/file_cycle_4_B.html
diff --git a/content/html/content/test/imports/file_cycle_4_C.html b/dom/html/test/imports/file_cycle_4_C.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_4_C.html
rename to dom/html/test/imports/file_cycle_4_C.html
diff --git a/content/html/content/test/imports/file_cycle_4_D.html b/dom/html/test/imports/file_cycle_4_D.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_4_D.html
rename to dom/html/test/imports/file_cycle_4_D.html
diff --git a/content/html/content/test/imports/file_cycle_4_E.html b/dom/html/test/imports/file_cycle_4_E.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_4_E.html
rename to dom/html/test/imports/file_cycle_4_E.html
diff --git a/content/html/content/test/imports/file_cycle_5_A.html b/dom/html/test/imports/file_cycle_5_A.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_5_A.html
rename to dom/html/test/imports/file_cycle_5_A.html
diff --git a/content/html/content/test/imports/file_cycle_5_B.html b/dom/html/test/imports/file_cycle_5_B.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_5_B.html
rename to dom/html/test/imports/file_cycle_5_B.html
diff --git a/content/html/content/test/imports/file_cycle_5_C.html b/dom/html/test/imports/file_cycle_5_C.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_5_C.html
rename to dom/html/test/imports/file_cycle_5_C.html
diff --git a/content/html/content/test/imports/file_cycle_5_D.html b/dom/html/test/imports/file_cycle_5_D.html
similarity index 100%
rename from content/html/content/test/imports/file_cycle_5_D.html
rename to dom/html/test/imports/file_cycle_5_D.html
diff --git a/content/html/content/test/imports/file_encoding.html b/dom/html/test/imports/file_encoding.html
similarity index 100%
rename from content/html/content/test/imports/file_encoding.html
rename to dom/html/test/imports/file_encoding.html
diff --git a/content/html/content/test/imports/file_importA1.html b/dom/html/test/imports/file_importA1.html
similarity index 100%
rename from content/html/content/test/imports/file_importA1.html
rename to dom/html/test/imports/file_importA1.html
diff --git a/content/html/content/test/imports/file_importA2.html b/dom/html/test/imports/file_importA2.html
similarity index 100%
rename from content/html/content/test/imports/file_importA2.html
rename to dom/html/test/imports/file_importA2.html
diff --git a/content/html/content/test/imports/file_importB1.html b/dom/html/test/imports/file_importB1.html
similarity index 100%
rename from content/html/content/test/imports/file_importB1.html
rename to dom/html/test/imports/file_importB1.html
diff --git a/content/html/content/test/imports/file_importB2.html b/dom/html/test/imports/file_importB2.html
similarity index 100%
rename from content/html/content/test/imports/file_importB2.html
rename to dom/html/test/imports/file_importB2.html
diff --git a/content/html/content/test/imports/file_importC1.html b/dom/html/test/imports/file_importC1.html
similarity index 100%
rename from content/html/content/test/imports/file_importC1.html
rename to dom/html/test/imports/file_importC1.html
diff --git a/content/html/content/test/imports/file_importC10.html b/dom/html/test/imports/file_importC10.html
similarity index 100%
rename from content/html/content/test/imports/file_importC10.html
rename to dom/html/test/imports/file_importC10.html
diff --git a/content/html/content/test/imports/file_importC2.html b/dom/html/test/imports/file_importC2.html
similarity index 100%
rename from content/html/content/test/imports/file_importC2.html
rename to dom/html/test/imports/file_importC2.html
diff --git a/content/html/content/test/imports/file_importC3.html b/dom/html/test/imports/file_importC3.html
similarity index 100%
rename from content/html/content/test/imports/file_importC3.html
rename to dom/html/test/imports/file_importC3.html
diff --git a/content/html/content/test/imports/file_importC4.html b/dom/html/test/imports/file_importC4.html
similarity index 100%
rename from content/html/content/test/imports/file_importC4.html
rename to dom/html/test/imports/file_importC4.html
diff --git a/content/html/content/test/imports/file_importC5.html b/dom/html/test/imports/file_importC5.html
similarity index 100%
rename from content/html/content/test/imports/file_importC5.html
rename to dom/html/test/imports/file_importC5.html
diff --git a/content/html/content/test/imports/file_importC6.html b/dom/html/test/imports/file_importC6.html
similarity index 100%
rename from content/html/content/test/imports/file_importC6.html
rename to dom/html/test/imports/file_importC6.html
diff --git a/content/html/content/test/imports/file_importC7.html b/dom/html/test/imports/file_importC7.html
similarity index 100%
rename from content/html/content/test/imports/file_importC7.html
rename to dom/html/test/imports/file_importC7.html
diff --git a/content/html/content/test/imports/file_importC8.html b/dom/html/test/imports/file_importC8.html
similarity index 100%
rename from content/html/content/test/imports/file_importC8.html
rename to dom/html/test/imports/file_importC8.html
diff --git a/content/html/content/test/imports/file_importC9.html b/dom/html/test/imports/file_importC9.html
similarity index 100%
rename from content/html/content/test/imports/file_importC9.html
rename to dom/html/test/imports/file_importC9.html
diff --git a/content/html/content/test/imports/file_importD.html b/dom/html/test/imports/file_importD.html
similarity index 100%
rename from content/html/content/test/imports/file_importD.html
rename to dom/html/test/imports/file_importD.html
diff --git a/content/html/content/test/imports/file_importE.html b/dom/html/test/imports/file_importE.html
similarity index 100%
rename from content/html/content/test/imports/file_importE.html
rename to dom/html/test/imports/file_importE.html
diff --git a/content/html/content/test/imports/mochitest.ini b/dom/html/test/imports/mochitest.ini
similarity index 100%
rename from content/html/content/test/imports/mochitest.ini
rename to dom/html/test/imports/mochitest.ini
diff --git a/content/html/content/test/imports/test_cycle_1.html b/dom/html/test/imports/test_cycle_1.html
similarity index 100%
rename from content/html/content/test/imports/test_cycle_1.html
rename to dom/html/test/imports/test_cycle_1.html
diff --git a/content/html/content/test/imports/test_cycle_2.html b/dom/html/test/imports/test_cycle_2.html
similarity index 100%
rename from content/html/content/test/imports/test_cycle_2.html
rename to dom/html/test/imports/test_cycle_2.html
diff --git a/content/html/content/test/imports/test_cycle_3.html b/dom/html/test/imports/test_cycle_3.html
similarity index 100%
rename from content/html/content/test/imports/test_cycle_3.html
rename to dom/html/test/imports/test_cycle_3.html
diff --git a/content/html/content/test/imports/test_cycle_4.html b/dom/html/test/imports/test_cycle_4.html
similarity index 100%
rename from content/html/content/test/imports/test_cycle_4.html
rename to dom/html/test/imports/test_cycle_4.html
diff --git a/content/html/content/test/imports/test_cycle_5.html b/dom/html/test/imports/test_cycle_5.html
similarity index 100%
rename from content/html/content/test/imports/test_cycle_5.html
rename to dom/html/test/imports/test_cycle_5.html
diff --git a/content/html/content/test/imports/test_encoding.html b/dom/html/test/imports/test_encoding.html
similarity index 100%
rename from content/html/content/test/imports/test_encoding.html
rename to dom/html/test/imports/test_encoding.html
diff --git a/content/html/content/test/mochitest.ini b/dom/html/test/mochitest.ini
similarity index 86%
rename from content/html/content/test/mochitest.ini
rename to dom/html/test/mochitest.ini
index 860f741cdf5..69c55e93fe7 100644
--- a/content/html/content/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@@ -5,6 +5,11 @@ support-files =
   allowMedia.sjs
   bug100533_iframe.html
   bug100533_load.html
+  bug196523-subframe.html
+  bug199692-nested-d2.html
+  bug199692-nested.html
+  bug199692-popup.html
+  bug199692-scrolled.html
   bug242709_iframe.html
   bug242709_load.html
   bug277724_iframe1.html
@@ -12,12 +17,27 @@ support-files =
   bug277890_iframe.html
   bug277890_load.html
   bug340800_iframe.txt
+  bug369370-popup.png
   bug372098-link-target.html
   bug392567.jar
   bug392567.jar^headers^
   bug441930_iframe.html
+  bug445004-inner.html
+  bug445004-inner.js
+  bug445004-outer-abs.html
+  bug445004-outer-rel.html
+  bug445004-outer-write.html
+  bug446483-iframe.html
+  bug448564-echo.sjs
+  bug448564-iframe-1.html
+  bug448564-iframe-2.html
+  bug448564-iframe-3.html
+  bug448564-submit.js
+  bug499092.html
+  bug499092.xml
   bug514856_iframe.html
   enableTestPlugin.js
+  test_non-ascii-cookie.html^headers^
   file_bug209275_1.html
   file_bug209275_2.html
   file_bug209275_3.html
@@ -500,3 +520,62 @@ skip-if = toolkit == 'android' || (toolkit == 'gonk' && debug) #bug 871015, bug
 [test_ignoreuserfocus.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
 [test_fragment_form_pointer.html]
+[test_bug1682.html]
+[test_bug1823.html]
+[test_bug57600.html]
+[test_bug196523.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
+[test_bug199692.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #bug 811644 #Bug 931116, b2g desktop specific, initial triage
+[test_bug172261.html]
+[test_bug255820.html]
+[test_bug259332.html]
+[test_bug311681.html]
+[test_bug311681.xhtml]
+[test_bug324378.html]
+[test_bug332848.xhtml]
+[test_bug340017.xhtml]
+[test_bug359657.html]
+[test_bug369370.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s
+[test_bug380383.html]
+[test_bug391777.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
+[test_bug402680.html]
+[test_bug403868.html]
+[test_bug403868.xhtml]
+[test_bug435128.html]
+skip-if = true # Disabled for timeouts.
+[test_bug463104.html]
+[test_form-parsing.html]
+[test_viewport.html]
+[test_documentAll.html]
+[test_document-element-inserted.html]
+[test_document.watch.html]
+skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(expects document.cookie setting to work) b2g-desktop(expects document.cookie setting to work)
+[test_bug445004.html]
+skip-if = true || toolkit == 'android' # Disabled permanently (bug 559932).
+[test_bug446483.html]
+skip-if = toolkit == 'android'
+[test_bug448564.html]
+[test_bug478251.html]
+[test_bug481440.html]
+[test_bug481647.html]
+[test_bug482659.html]
+[test_bug486741.html]
+[test_bug489532.html]
+[test_bug497242.xhtml]
+[test_bug499092.html]
+[test_bug512367.html]
+[test_bug677495.html]
+[test_bug677495-1.html]
+[test_bug741266.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs control of popup window size) b2g-debug(needs control of popup window size) b2g-desktop(needs control of popup window size)
+[test_non-ascii-cookie.html]
+skip-if = buildapp == 'b2g' || e10s
+[test_bug765780.html]
+[test_bug871161.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
+support-files = file_bug871161-1.html file_bug871161-2.html
+[test_bug1013316.html]
+
diff --git a/content/html/content/test/nnc_lockup.gif b/dom/html/test/nnc_lockup.gif
similarity index 100%
rename from content/html/content/test/nnc_lockup.gif
rename to dom/html/test/nnc_lockup.gif
diff --git a/content/html/content/test/reflect.js b/dom/html/test/reflect.js
similarity index 100%
rename from content/html/content/test/reflect.js
rename to dom/html/test/reflect.js
diff --git a/content/html/content/test/test_a_text.html b/dom/html/test/test_a_text.html
similarity index 100%
rename from content/html/content/test/test_a_text.html
rename to dom/html/test/test_a_text.html
diff --git a/content/html/content/test/test_allowMedia.html b/dom/html/test/test_allowMedia.html
similarity index 97%
rename from content/html/content/test/test_allowMedia.html
rename to dom/html/test/test_allowMedia.html
index b040470db44..efe367dd57a 100644
--- a/content/html/content/test/test_allowMedia.html
+++ b/dom/html/test/test_allowMedia.html
@@ -15,7 +15,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=759964
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(runNextTest);
 
-var SJS = "http://mochi.test:8888/tests/content/html/content/test/allowMedia.sjs";
+var SJS = "http://mochi.test:8888/tests/dom/html/test/allowMedia.sjs";
 var TEST_PAGE = "data:text/html,<audio src='" + SJS + "?audio'></audio>";
 
 var Ci = Components.interfaces;
diff --git a/content/html/content/test/test_anchor_href_cache_invalidation.html b/dom/html/test/test_anchor_href_cache_invalidation.html
similarity index 100%
rename from content/html/content/test/test_anchor_href_cache_invalidation.html
rename to dom/html/test/test_anchor_href_cache_invalidation.html
diff --git a/content/html/content/test/test_anchor_ping.html b/dom/html/test/test_anchor_ping.html
similarity index 99%
rename from content/html/content/test/test_anchor_ping.html
rename to dom/html/test/test_anchor_ping.html
index 0ebe0ef993d..a158a87c71f 100644
--- a/content/html/content/test/test_anchor_ping.html
+++ b/dom/html/test/test_anchor_ping.html
@@ -145,7 +145,7 @@ let tests = [
     server.start(-1);
 
     // The referrer will be loaded using a secure channel.
-    navigate("https://example.com/chrome/content/html/content/test/" +
+    navigate("https://example.com/chrome/dom/html/test/" +
              "file_anchor_ping.html?" + "http://localhost:" +
              server.identity.primaryPort + ping);
 
diff --git a/content/html/content/test/test_applet_attributes_reflection.html b/dom/html/test/test_applet_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_applet_attributes_reflection.html
rename to dom/html/test/test_applet_attributes_reflection.html
diff --git a/content/html/content/test/test_audio_wakelock.html b/dom/html/test/test_audio_wakelock.html
similarity index 100%
rename from content/html/content/test/test_audio_wakelock.html
rename to dom/html/test/test_audio_wakelock.html
diff --git a/content/html/content/test/test_base_attributes_reflection.html b/dom/html/test/test_base_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_base_attributes_reflection.html
rename to dom/html/test/test_base_attributes_reflection.html
diff --git a/content/html/content/test/test_bug1003539.html b/dom/html/test/test_bug1003539.html
similarity index 100%
rename from content/html/content/test/test_bug1003539.html
rename to dom/html/test/test_bug1003539.html
diff --git a/content/html/content/test/test_bug100533.html b/dom/html/test/test_bug100533.html
similarity index 100%
rename from content/html/content/test/test_bug100533.html
rename to dom/html/test/test_bug100533.html
diff --git a/content/html/document/test/test_bug1013316.html b/dom/html/test/test_bug1013316.html
similarity index 100%
rename from content/html/document/test/test_bug1013316.html
rename to dom/html/test/test_bug1013316.html
diff --git a/content/html/content/test/test_bug1045270.html b/dom/html/test/test_bug1045270.html
similarity index 100%
rename from content/html/content/test/test_bug1045270.html
rename to dom/html/test/test_bug1045270.html
diff --git a/content/html/content/test/test_bug109445.html b/dom/html/test/test_bug109445.html
similarity index 100%
rename from content/html/content/test/test_bug109445.html
rename to dom/html/test/test_bug109445.html
diff --git a/content/html/content/test/test_bug109445.xhtml b/dom/html/test/test_bug109445.xhtml
similarity index 100%
rename from content/html/content/test/test_bug109445.xhtml
rename to dom/html/test/test_bug109445.xhtml
diff --git a/content/html/content/test/test_bug1297.html b/dom/html/test/test_bug1297.html
similarity index 100%
rename from content/html/content/test/test_bug1297.html
rename to dom/html/test/test_bug1297.html
diff --git a/content/html/content/test/test_bug1366.html b/dom/html/test/test_bug1366.html
similarity index 100%
rename from content/html/content/test/test_bug1366.html
rename to dom/html/test/test_bug1366.html
diff --git a/content/html/content/test/test_bug1400.html b/dom/html/test/test_bug1400.html
similarity index 100%
rename from content/html/content/test/test_bug1400.html
rename to dom/html/test/test_bug1400.html
diff --git a/content/html/content/test/test_bug143220.html b/dom/html/test/test_bug143220.html
similarity index 100%
rename from content/html/content/test/test_bug143220.html
rename to dom/html/test/test_bug143220.html
diff --git a/content/html/document/test/test_bug1682.html b/dom/html/test/test_bug1682.html
similarity index 100%
rename from content/html/document/test/test_bug1682.html
rename to dom/html/test/test_bug1682.html
diff --git a/content/html/document/test/test_bug172261.html b/dom/html/test/test_bug172261.html
similarity index 100%
rename from content/html/document/test/test_bug172261.html
rename to dom/html/test/test_bug172261.html
diff --git a/content/html/content/test/test_bug182279.html b/dom/html/test/test_bug182279.html
similarity index 100%
rename from content/html/content/test/test_bug182279.html
rename to dom/html/test/test_bug182279.html
diff --git a/content/html/document/test/test_bug1823.html b/dom/html/test/test_bug1823.html
similarity index 100%
rename from content/html/document/test/test_bug1823.html
rename to dom/html/test/test_bug1823.html
diff --git a/content/html/document/test/test_bug196523.html b/dom/html/test/test_bug196523.html
similarity index 90%
rename from content/html/document/test/test_bug196523.html
rename to dom/html/test/test_bug196523.html
index fcdee5366e8..a380fe06ccd 100644
--- a/content/html/document/test/test_bug196523.html
+++ b/dom/html/test/test_bug196523.html
@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=196523
   }, false);
 </script>
 <p id="display">
-  <iframe src="http://test1.example.org/tests/content/html/document/test/bug196523-subframe.html"></iframe>
+  <iframe src="http://test1.example.org/tests/dom/html/test/bug196523-subframe.html"></iframe>
 </p>
 <div id="content" style="display: none">
   
diff --git a/content/html/document/test/test_bug199692.html b/dom/html/test/test_bug199692.html
similarity index 100%
rename from content/html/document/test/test_bug199692.html
rename to dom/html/test/test_bug199692.html
diff --git a/content/html/content/test/test_bug2082.html b/dom/html/test/test_bug2082.html
similarity index 100%
rename from content/html/content/test/test_bug2082.html
rename to dom/html/test/test_bug2082.html
diff --git a/content/html/content/test/test_bug209275.xhtml b/dom/html/test/test_bug209275.xhtml
similarity index 100%
rename from content/html/content/test/test_bug209275.xhtml
rename to dom/html/test/test_bug209275.xhtml
diff --git a/content/html/content/test/test_bug237071.html b/dom/html/test/test_bug237071.html
similarity index 100%
rename from content/html/content/test/test_bug237071.html
rename to dom/html/test/test_bug237071.html
diff --git a/content/html/content/test/test_bug242709.html b/dom/html/test/test_bug242709.html
similarity index 100%
rename from content/html/content/test/test_bug242709.html
rename to dom/html/test/test_bug242709.html
diff --git a/content/html/content/test/test_bug24958.html b/dom/html/test/test_bug24958.html
similarity index 100%
rename from content/html/content/test/test_bug24958.html
rename to dom/html/test/test_bug24958.html
diff --git a/content/html/document/test/test_bug255820.html b/dom/html/test/test_bug255820.html
similarity index 100%
rename from content/html/document/test/test_bug255820.html
rename to dom/html/test/test_bug255820.html
diff --git a/content/html/document/test/test_bug259332.html b/dom/html/test/test_bug259332.html
similarity index 100%
rename from content/html/document/test/test_bug259332.html
rename to dom/html/test/test_bug259332.html
diff --git a/content/html/content/test/test_bug274626.html b/dom/html/test/test_bug274626.html
similarity index 100%
rename from content/html/content/test/test_bug274626.html
rename to dom/html/test/test_bug274626.html
diff --git a/content/html/content/test/test_bug277724.html b/dom/html/test/test_bug277724.html
similarity index 100%
rename from content/html/content/test/test_bug277724.html
rename to dom/html/test/test_bug277724.html
diff --git a/content/html/content/test/test_bug277890.html b/dom/html/test/test_bug277890.html
similarity index 100%
rename from content/html/content/test/test_bug277890.html
rename to dom/html/test/test_bug277890.html
diff --git a/content/html/content/test/test_bug287465.html b/dom/html/test/test_bug287465.html
similarity index 100%
rename from content/html/content/test/test_bug287465.html
rename to dom/html/test/test_bug287465.html
diff --git a/content/html/content/test/test_bug295561.html b/dom/html/test/test_bug295561.html
similarity index 100%
rename from content/html/content/test/test_bug295561.html
rename to dom/html/test/test_bug295561.html
diff --git a/content/html/content/test/test_bug297761.html b/dom/html/test/test_bug297761.html
similarity index 100%
rename from content/html/content/test/test_bug297761.html
rename to dom/html/test/test_bug297761.html
diff --git a/content/html/content/test/test_bug300691-1.html b/dom/html/test/test_bug300691-1.html
similarity index 100%
rename from content/html/content/test/test_bug300691-1.html
rename to dom/html/test/test_bug300691-1.html
diff --git a/content/html/content/test/test_bug300691-2.html b/dom/html/test/test_bug300691-2.html
similarity index 100%
rename from content/html/content/test/test_bug300691-2.html
rename to dom/html/test/test_bug300691-2.html
diff --git a/content/html/content/test/test_bug300691-3.xhtml b/dom/html/test/test_bug300691-3.xhtml
similarity index 100%
rename from content/html/content/test/test_bug300691-3.xhtml
rename to dom/html/test/test_bug300691-3.xhtml
diff --git a/content/html/document/test/test_bug311681.html b/dom/html/test/test_bug311681.html
similarity index 100%
rename from content/html/document/test/test_bug311681.html
rename to dom/html/test/test_bug311681.html
diff --git a/content/html/document/test/test_bug311681.xhtml b/dom/html/test/test_bug311681.xhtml
similarity index 100%
rename from content/html/document/test/test_bug311681.xhtml
rename to dom/html/test/test_bug311681.xhtml
diff --git a/content/html/document/test/test_bug324378.html b/dom/html/test/test_bug324378.html
similarity index 100%
rename from content/html/document/test/test_bug324378.html
rename to dom/html/test/test_bug324378.html
diff --git a/content/html/content/test/test_bug330705-1.html b/dom/html/test/test_bug330705-1.html
similarity index 100%
rename from content/html/content/test/test_bug330705-1.html
rename to dom/html/test/test_bug330705-1.html
diff --git a/content/html/content/test/test_bug332246.html b/dom/html/test/test_bug332246.html
similarity index 100%
rename from content/html/content/test/test_bug332246.html
rename to dom/html/test/test_bug332246.html
diff --git a/content/html/document/test/test_bug332848.xhtml b/dom/html/test/test_bug332848.xhtml
similarity index 100%
rename from content/html/document/test/test_bug332848.xhtml
rename to dom/html/test/test_bug332848.xhtml
diff --git a/content/html/content/test/test_bug332893-1.html b/dom/html/test/test_bug332893-1.html
similarity index 100%
rename from content/html/content/test/test_bug332893-1.html
rename to dom/html/test/test_bug332893-1.html
diff --git a/content/html/content/test/test_bug332893-2.html b/dom/html/test/test_bug332893-2.html
similarity index 100%
rename from content/html/content/test/test_bug332893-2.html
rename to dom/html/test/test_bug332893-2.html
diff --git a/content/html/content/test/test_bug332893-3.html b/dom/html/test/test_bug332893-3.html
similarity index 100%
rename from content/html/content/test/test_bug332893-3.html
rename to dom/html/test/test_bug332893-3.html
diff --git a/content/html/content/test/test_bug332893-4.html b/dom/html/test/test_bug332893-4.html
similarity index 100%
rename from content/html/content/test/test_bug332893-4.html
rename to dom/html/test/test_bug332893-4.html
diff --git a/content/html/content/test/test_bug332893-5.html b/dom/html/test/test_bug332893-5.html
similarity index 100%
rename from content/html/content/test/test_bug332893-5.html
rename to dom/html/test/test_bug332893-5.html
diff --git a/content/html/content/test/test_bug332893-6.html b/dom/html/test/test_bug332893-6.html
similarity index 100%
rename from content/html/content/test/test_bug332893-6.html
rename to dom/html/test/test_bug332893-6.html
diff --git a/content/html/content/test/test_bug332893-7.html b/dom/html/test/test_bug332893-7.html
similarity index 100%
rename from content/html/content/test/test_bug332893-7.html
rename to dom/html/test/test_bug332893-7.html
diff --git a/content/html/content/test/test_bug3348.html b/dom/html/test/test_bug3348.html
similarity index 100%
rename from content/html/content/test/test_bug3348.html
rename to dom/html/test/test_bug3348.html
diff --git a/content/html/document/test/test_bug340017.xhtml b/dom/html/test/test_bug340017.xhtml
similarity index 100%
rename from content/html/document/test/test_bug340017.xhtml
rename to dom/html/test/test_bug340017.xhtml
diff --git a/content/html/content/test/test_bug340800.html b/dom/html/test/test_bug340800.html
similarity index 100%
rename from content/html/content/test/test_bug340800.html
rename to dom/html/test/test_bug340800.html
diff --git a/content/html/content/test/test_bug347174.html b/dom/html/test/test_bug347174.html
similarity index 100%
rename from content/html/content/test/test_bug347174.html
rename to dom/html/test/test_bug347174.html
diff --git a/content/html/content/test/test_bug347174_write.html b/dom/html/test/test_bug347174_write.html
similarity index 100%
rename from content/html/content/test/test_bug347174_write.html
rename to dom/html/test/test_bug347174_write.html
diff --git a/content/html/content/test/test_bug347174_xsl.html b/dom/html/test/test_bug347174_xsl.html
similarity index 100%
rename from content/html/content/test/test_bug347174_xsl.html
rename to dom/html/test/test_bug347174_xsl.html
diff --git a/content/html/content/test/test_bug347174_xslp.html b/dom/html/test/test_bug347174_xslp.html
similarity index 100%
rename from content/html/content/test/test_bug347174_xslp.html
rename to dom/html/test/test_bug347174_xslp.html
diff --git a/content/html/content/test/test_bug353415-1.html b/dom/html/test/test_bug353415-1.html
similarity index 100%
rename from content/html/content/test/test_bug353415-1.html
rename to dom/html/test/test_bug353415-1.html
diff --git a/content/html/content/test/test_bug353415-2.html b/dom/html/test/test_bug353415-2.html
similarity index 100%
rename from content/html/content/test/test_bug353415-2.html
rename to dom/html/test/test_bug353415-2.html
diff --git a/content/html/document/test/test_bug359657.html b/dom/html/test/test_bug359657.html
similarity index 100%
rename from content/html/document/test/test_bug359657.html
rename to dom/html/test/test_bug359657.html
diff --git a/content/html/document/test/test_bug369370.html b/dom/html/test/test_bug369370.html
similarity index 100%
rename from content/html/document/test/test_bug369370.html
rename to dom/html/test/test_bug369370.html
diff --git a/content/html/content/test/test_bug371375.html b/dom/html/test/test_bug371375.html
similarity index 100%
rename from content/html/content/test/test_bug371375.html
rename to dom/html/test/test_bug371375.html
diff --git a/content/html/content/test/test_bug372098.html b/dom/html/test/test_bug372098.html
similarity index 100%
rename from content/html/content/test/test_bug372098.html
rename to dom/html/test/test_bug372098.html
diff --git a/content/html/content/test/test_bug373589.html b/dom/html/test/test_bug373589.html
similarity index 100%
rename from content/html/content/test/test_bug373589.html
rename to dom/html/test/test_bug373589.html
diff --git a/content/html/content/test/test_bug375003-1.html b/dom/html/test/test_bug375003-1.html
similarity index 100%
rename from content/html/content/test/test_bug375003-1.html
rename to dom/html/test/test_bug375003-1.html
diff --git a/content/html/content/test/test_bug375003-2.html b/dom/html/test/test_bug375003-2.html
similarity index 100%
rename from content/html/content/test/test_bug375003-2.html
rename to dom/html/test/test_bug375003-2.html
diff --git a/content/html/content/test/test_bug377624.html b/dom/html/test/test_bug377624.html
similarity index 100%
rename from content/html/content/test/test_bug377624.html
rename to dom/html/test/test_bug377624.html
diff --git a/content/html/document/test/test_bug380383.html b/dom/html/test/test_bug380383.html
similarity index 100%
rename from content/html/document/test/test_bug380383.html
rename to dom/html/test/test_bug380383.html
diff --git a/content/html/content/test/test_bug383383.html b/dom/html/test/test_bug383383.html
similarity index 100%
rename from content/html/content/test/test_bug383383.html
rename to dom/html/test/test_bug383383.html
diff --git a/content/html/content/test/test_bug383383_2.xhtml b/dom/html/test/test_bug383383_2.xhtml
similarity index 100%
rename from content/html/content/test/test_bug383383_2.xhtml
rename to dom/html/test/test_bug383383_2.xhtml
diff --git a/content/html/content/test/test_bug384419.html b/dom/html/test/test_bug384419.html
similarity index 100%
rename from content/html/content/test/test_bug384419.html
rename to dom/html/test/test_bug384419.html
diff --git a/content/html/content/test/test_bug386496.html b/dom/html/test/test_bug386496.html
similarity index 100%
rename from content/html/content/test/test_bug386496.html
rename to dom/html/test/test_bug386496.html
diff --git a/content/html/content/test/test_bug386728.html b/dom/html/test/test_bug386728.html
similarity index 100%
rename from content/html/content/test/test_bug386728.html
rename to dom/html/test/test_bug386728.html
diff --git a/content/html/content/test/test_bug386996.html b/dom/html/test/test_bug386996.html
similarity index 100%
rename from content/html/content/test/test_bug386996.html
rename to dom/html/test/test_bug386996.html
diff --git a/content/html/content/test/test_bug388558.html b/dom/html/test/test_bug388558.html
similarity index 100%
rename from content/html/content/test/test_bug388558.html
rename to dom/html/test/test_bug388558.html
diff --git a/content/html/content/test/test_bug388746.html b/dom/html/test/test_bug388746.html
similarity index 100%
rename from content/html/content/test/test_bug388746.html
rename to dom/html/test/test_bug388746.html
diff --git a/content/html/content/test/test_bug388794.html b/dom/html/test/test_bug388794.html
similarity index 100%
rename from content/html/content/test/test_bug388794.html
rename to dom/html/test/test_bug388794.html
diff --git a/content/html/content/test/test_bug389797.html b/dom/html/test/test_bug389797.html
similarity index 100%
rename from content/html/content/test/test_bug389797.html
rename to dom/html/test/test_bug389797.html
diff --git a/content/html/content/test/test_bug390975.html b/dom/html/test/test_bug390975.html
similarity index 100%
rename from content/html/content/test/test_bug390975.html
rename to dom/html/test/test_bug390975.html
diff --git a/content/html/document/test/test_bug391777.html b/dom/html/test/test_bug391777.html
similarity index 100%
rename from content/html/document/test/test_bug391777.html
rename to dom/html/test/test_bug391777.html
diff --git a/content/html/content/test/test_bug391994.html b/dom/html/test/test_bug391994.html
similarity index 100%
rename from content/html/content/test/test_bug391994.html
rename to dom/html/test/test_bug391994.html
diff --git a/content/html/content/test/test_bug392567.html b/dom/html/test/test_bug392567.html
similarity index 96%
rename from content/html/content/test/test_bug392567.html
rename to dom/html/test/test_bug392567.html
index 0fcc0137178..84ed5d741e0 100644
--- a/content/html/content/test/test_bug392567.html
+++ b/dom/html/test/test_bug392567.html
@@ -29,7 +29,7 @@ function runTests()
     return;
   }
 
-  var dataUrl = "http://mochi.test:8888/tests/content/html/content/test/bug392567.jar";
+  var dataUrl = "http://mochi.test:8888/tests/dom/html/test/bug392567.jar";
   var jarUrl = "jar:" + dataUrl + "!/index.html";
   var httpUrl = location.href.replace(/\.html.*/, "_404");
   var previousDir = location.href.replace(/test\/[^\/]*$/, "");
diff --git a/content/html/content/test/test_bug394700.html b/dom/html/test/test_bug394700.html
similarity index 100%
rename from content/html/content/test/test_bug394700.html
rename to dom/html/test/test_bug394700.html
diff --git a/content/html/content/test/test_bug395107.html b/dom/html/test/test_bug395107.html
similarity index 100%
rename from content/html/content/test/test_bug395107.html
rename to dom/html/test/test_bug395107.html
diff --git a/content/html/content/test/test_bug401160.xhtml b/dom/html/test/test_bug401160.xhtml
similarity index 100%
rename from content/html/content/test/test_bug401160.xhtml
rename to dom/html/test/test_bug401160.xhtml
diff --git a/content/html/document/test/test_bug402680.html b/dom/html/test/test_bug402680.html
similarity index 100%
rename from content/html/document/test/test_bug402680.html
rename to dom/html/test/test_bug402680.html
diff --git a/content/html/document/test/test_bug403868.html b/dom/html/test/test_bug403868.html
similarity index 100%
rename from content/html/document/test/test_bug403868.html
rename to dom/html/test/test_bug403868.html
diff --git a/content/html/document/test/test_bug403868.xhtml b/dom/html/test/test_bug403868.xhtml
similarity index 100%
rename from content/html/document/test/test_bug403868.xhtml
rename to dom/html/test/test_bug403868.xhtml
diff --git a/content/html/content/test/test_bug405242.html b/dom/html/test/test_bug405242.html
similarity index 100%
rename from content/html/content/test/test_bug405242.html
rename to dom/html/test/test_bug405242.html
diff --git a/content/html/content/test/test_bug406596.html b/dom/html/test/test_bug406596.html
similarity index 100%
rename from content/html/content/test/test_bug406596.html
rename to dom/html/test/test_bug406596.html
diff --git a/content/html/content/test/test_bug417760.html b/dom/html/test/test_bug417760.html
similarity index 100%
rename from content/html/content/test/test_bug417760.html
rename to dom/html/test/test_bug417760.html
diff --git a/content/html/content/test/test_bug421640.html b/dom/html/test/test_bug421640.html
similarity index 100%
rename from content/html/content/test/test_bug421640.html
rename to dom/html/test/test_bug421640.html
diff --git a/content/html/content/test/test_bug424698.html b/dom/html/test/test_bug424698.html
similarity index 100%
rename from content/html/content/test/test_bug424698.html
rename to dom/html/test/test_bug424698.html
diff --git a/content/html/content/test/test_bug428135.xhtml b/dom/html/test/test_bug428135.xhtml
similarity index 100%
rename from content/html/content/test/test_bug428135.xhtml
rename to dom/html/test/test_bug428135.xhtml
diff --git a/content/html/content/test/test_bug430351.html b/dom/html/test/test_bug430351.html
similarity index 100%
rename from content/html/content/test/test_bug430351.html
rename to dom/html/test/test_bug430351.html
diff --git a/content/html/content/test/test_bug430392.html b/dom/html/test/test_bug430392.html
similarity index 100%
rename from content/html/content/test/test_bug430392.html
rename to dom/html/test/test_bug430392.html
diff --git a/content/html/document/test/test_bug435128.html b/dom/html/test/test_bug435128.html
similarity index 100%
rename from content/html/document/test/test_bug435128.html
rename to dom/html/test/test_bug435128.html
diff --git a/content/html/content/test/test_bug441930.html b/dom/html/test/test_bug441930.html
similarity index 100%
rename from content/html/content/test/test_bug441930.html
rename to dom/html/test/test_bug441930.html
diff --git a/content/html/content/test/test_bug442801.html b/dom/html/test/test_bug442801.html
similarity index 100%
rename from content/html/content/test/test_bug442801.html
rename to dom/html/test/test_bug442801.html
diff --git a/content/html/document/test/test_bug445004.html b/dom/html/test/test_bug445004.html
similarity index 82%
rename from content/html/document/test/test_bug445004.html
rename to dom/html/test/test_bug445004.html
index 159fe6a4211..ec98f56c892 100644
--- a/content/html/document/test/test_bug445004.html
+++ b/dom/html/test/test_bug445004.html
@@ -59,7 +59,7 @@ function checkFrame(num) {
   name = outer.name;
 
   is(outer.document.baseURI,
-     "http://example.org/tests/content/html/document/test/bug445004-outer.html",
+     "http://example.org/tests/dom/html/test/bug445004-outer.html",
      "Unexpected base URI for " + name);
 
   var iswrite = name.match(/write/);
@@ -67,11 +67,11 @@ function checkFrame(num) {
   var inner = outer.frames[0];
   if (iswrite) {
     is(inner.document.baseURI,
-       "http://example.org/tests/content/html/document/test/bug445004-outer.html",
+       "http://example.org/tests/dom/html/test/bug445004-outer.html",
        "Unexpected inner base URI for " + name);
   } else {
     is(inner.document.baseURI,
-       "http://test1.example.org/tests/content/html/document/test/bug445004-inner.html",
+       "http://test1.example.org/tests/dom/html/test/bug445004-inner.html",
        "Unexpected inner base URI for " + name);
   }
 
@@ -119,19 +119,19 @@ function doTest() {
 </pre>
 <p id="display">
   <iframe
-     src="http://example.org/tests/content/html/document/test/bug445004-outer-rel.html"
+     src="http://example.org/tests/dom/html/test/bug445004-outer-rel.html"
      name="bug445004-outer-rel.html"></iframe>
   <iframe
-     src="http://test1.example.org/tests/content/html/document/test/bug445004-outer-rel.html"
+     src="http://test1.example.org/tests/dom/html/test/bug445004-outer-rel.html"
      name="bug445004-outer-rel.html offsite"></iframe>
   <iframe
-     src="http://example.org/tests/content/html/document/test/bug445004-outer-abs.html"
+     src="http://example.org/tests/dom/html/test/bug445004-outer-abs.html"
      name="bug445004-outer-abs.html"></iframe>
   <iframe
-     src="http://test1.example.org/tests/content/html/document/test/bug445004-outer-abs.html"
+     src="http://test1.example.org/tests/dom/html/test/bug445004-outer-abs.html"
      name="bug445004-outer-abs.html offsite"></iframe>
   <iframe
-     src="http://example.org/tests/content/html/document/test/bug445004-outer-write.html"
+     src="http://example.org/tests/dom/html/test/bug445004-outer-write.html"
      name="bug445004-outer-write.html"></iframe>
 </p>
 </body>
diff --git a/content/html/document/test/test_bug446483.html b/dom/html/test/test_bug446483.html
similarity index 100%
rename from content/html/document/test/test_bug446483.html
rename to dom/html/test/test_bug446483.html
diff --git a/content/html/content/test/test_bug448166.html b/dom/html/test/test_bug448166.html
similarity index 100%
rename from content/html/content/test/test_bug448166.html
rename to dom/html/test/test_bug448166.html
diff --git a/content/html/document/test/test_bug448564.html b/dom/html/test/test_bug448564.html
similarity index 100%
rename from content/html/document/test/test_bug448564.html
rename to dom/html/test/test_bug448564.html
diff --git a/content/html/content/test/test_bug456229.html b/dom/html/test/test_bug456229.html
similarity index 100%
rename from content/html/content/test/test_bug456229.html
rename to dom/html/test/test_bug456229.html
diff --git a/content/html/content/test/test_bug458037.xhtml b/dom/html/test/test_bug458037.xhtml
similarity index 100%
rename from content/html/content/test/test_bug458037.xhtml
rename to dom/html/test/test_bug458037.xhtml
diff --git a/content/html/content/test/test_bug460568.html b/dom/html/test/test_bug460568.html
similarity index 100%
rename from content/html/content/test/test_bug460568.html
rename to dom/html/test/test_bug460568.html
diff --git a/content/html/document/test/test_bug463104.html b/dom/html/test/test_bug463104.html
similarity index 100%
rename from content/html/document/test/test_bug463104.html
rename to dom/html/test/test_bug463104.html
diff --git a/content/html/document/test/test_bug478251.html b/dom/html/test/test_bug478251.html
similarity index 100%
rename from content/html/document/test/test_bug478251.html
rename to dom/html/test/test_bug478251.html
diff --git a/content/html/content/test/test_bug481335.xhtml b/dom/html/test/test_bug481335.xhtml
similarity index 100%
rename from content/html/content/test/test_bug481335.xhtml
rename to dom/html/test/test_bug481335.xhtml
diff --git a/content/html/document/test/test_bug481440.html b/dom/html/test/test_bug481440.html
similarity index 100%
rename from content/html/document/test/test_bug481440.html
rename to dom/html/test/test_bug481440.html
diff --git a/content/html/document/test/test_bug481647.html b/dom/html/test/test_bug481647.html
similarity index 100%
rename from content/html/document/test/test_bug481647.html
rename to dom/html/test/test_bug481647.html
diff --git a/content/html/document/test/test_bug482659.html b/dom/html/test/test_bug482659.html
similarity index 100%
rename from content/html/document/test/test_bug482659.html
rename to dom/html/test/test_bug482659.html
diff --git a/content/html/document/test/test_bug486741.html b/dom/html/test/test_bug486741.html
similarity index 100%
rename from content/html/document/test/test_bug486741.html
rename to dom/html/test/test_bug486741.html
diff --git a/content/html/document/test/test_bug489532.html b/dom/html/test/test_bug489532.html
similarity index 100%
rename from content/html/document/test/test_bug489532.html
rename to dom/html/test/test_bug489532.html
diff --git a/content/html/document/test/test_bug497242.xhtml b/dom/html/test/test_bug497242.xhtml
similarity index 100%
rename from content/html/document/test/test_bug497242.xhtml
rename to dom/html/test/test_bug497242.xhtml
diff --git a/content/html/document/test/test_bug499092.html b/dom/html/test/test_bug499092.html
similarity index 100%
rename from content/html/document/test/test_bug499092.html
rename to dom/html/test/test_bug499092.html
diff --git a/content/html/content/test/test_bug500885.html b/dom/html/test/test_bug500885.html
similarity index 100%
rename from content/html/content/test/test_bug500885.html
rename to dom/html/test/test_bug500885.html
diff --git a/content/html/document/test/test_bug512367.html b/dom/html/test/test_bug512367.html
similarity index 100%
rename from content/html/document/test/test_bug512367.html
rename to dom/html/test/test_bug512367.html
diff --git a/content/html/content/test/test_bug514856.html b/dom/html/test/test_bug514856.html
similarity index 100%
rename from content/html/content/test/test_bug514856.html
rename to dom/html/test/test_bug514856.html
diff --git a/content/html/content/test/test_bug518122.html b/dom/html/test/test_bug518122.html
similarity index 100%
rename from content/html/content/test/test_bug518122.html
rename to dom/html/test/test_bug518122.html
diff --git a/content/html/content/test/test_bug519987.html b/dom/html/test/test_bug519987.html
similarity index 100%
rename from content/html/content/test/test_bug519987.html
rename to dom/html/test/test_bug519987.html
diff --git a/content/html/content/test/test_bug523771.html b/dom/html/test/test_bug523771.html
similarity index 100%
rename from content/html/content/test/test_bug523771.html
rename to dom/html/test/test_bug523771.html
diff --git a/content/html/content/test/test_bug529819.html b/dom/html/test/test_bug529819.html
similarity index 100%
rename from content/html/content/test/test_bug529819.html
rename to dom/html/test/test_bug529819.html
diff --git a/content/html/content/test/test_bug529859.html b/dom/html/test/test_bug529859.html
similarity index 100%
rename from content/html/content/test/test_bug529859.html
rename to dom/html/test/test_bug529859.html
diff --git a/content/html/content/test/test_bug535043.html b/dom/html/test/test_bug535043.html
similarity index 100%
rename from content/html/content/test/test_bug535043.html
rename to dom/html/test/test_bug535043.html
diff --git a/content/html/content/test/test_bug536891.html b/dom/html/test/test_bug536891.html
similarity index 100%
rename from content/html/content/test/test_bug536891.html
rename to dom/html/test/test_bug536891.html
diff --git a/content/html/content/test/test_bug536895.html b/dom/html/test/test_bug536895.html
similarity index 100%
rename from content/html/content/test/test_bug536895.html
rename to dom/html/test/test_bug536895.html
diff --git a/content/html/content/test/test_bug546995.html b/dom/html/test/test_bug546995.html
similarity index 100%
rename from content/html/content/test/test_bug546995.html
rename to dom/html/test/test_bug546995.html
diff --git a/content/html/content/test/test_bug547850.html b/dom/html/test/test_bug547850.html
similarity index 100%
rename from content/html/content/test/test_bug547850.html
rename to dom/html/test/test_bug547850.html
diff --git a/content/html/content/test/test_bug551846.html b/dom/html/test/test_bug551846.html
similarity index 100%
rename from content/html/content/test/test_bug551846.html
rename to dom/html/test/test_bug551846.html
diff --git a/content/html/content/test/test_bug555567.html b/dom/html/test/test_bug555567.html
similarity index 100%
rename from content/html/content/test/test_bug555567.html
rename to dom/html/test/test_bug555567.html
diff --git a/content/html/content/test/test_bug556645.html b/dom/html/test/test_bug556645.html
similarity index 100%
rename from content/html/content/test/test_bug556645.html
rename to dom/html/test/test_bug556645.html
diff --git a/content/html/content/test/test_bug557087-1.html b/dom/html/test/test_bug557087-1.html
similarity index 100%
rename from content/html/content/test/test_bug557087-1.html
rename to dom/html/test/test_bug557087-1.html
diff --git a/content/html/content/test/test_bug557087-2.html b/dom/html/test/test_bug557087-2.html
similarity index 100%
rename from content/html/content/test/test_bug557087-2.html
rename to dom/html/test/test_bug557087-2.html
diff --git a/content/html/content/test/test_bug557087-3.html b/dom/html/test/test_bug557087-3.html
similarity index 100%
rename from content/html/content/test/test_bug557087-3.html
rename to dom/html/test/test_bug557087-3.html
diff --git a/content/html/content/test/test_bug557087-4.html b/dom/html/test/test_bug557087-4.html
similarity index 100%
rename from content/html/content/test/test_bug557087-4.html
rename to dom/html/test/test_bug557087-4.html
diff --git a/content/html/content/test/test_bug557087-5.html b/dom/html/test/test_bug557087-5.html
similarity index 100%
rename from content/html/content/test/test_bug557087-5.html
rename to dom/html/test/test_bug557087-5.html
diff --git a/content/html/content/test/test_bug557087-6.html b/dom/html/test/test_bug557087-6.html
similarity index 100%
rename from content/html/content/test/test_bug557087-6.html
rename to dom/html/test/test_bug557087-6.html
diff --git a/content/html/content/test/test_bug557620.html b/dom/html/test/test_bug557620.html
similarity index 100%
rename from content/html/content/test/test_bug557620.html
rename to dom/html/test/test_bug557620.html
diff --git a/content/html/content/test/test_bug558788-1.html b/dom/html/test/test_bug558788-1.html
similarity index 100%
rename from content/html/content/test/test_bug558788-1.html
rename to dom/html/test/test_bug558788-1.html
diff --git a/content/html/content/test/test_bug558788-2.html b/dom/html/test/test_bug558788-2.html
similarity index 100%
rename from content/html/content/test/test_bug558788-2.html
rename to dom/html/test/test_bug558788-2.html
diff --git a/content/html/content/test/test_bug560112.html b/dom/html/test/test_bug560112.html
similarity index 100%
rename from content/html/content/test/test_bug560112.html
rename to dom/html/test/test_bug560112.html
diff --git a/content/html/content/test/test_bug561634.html b/dom/html/test/test_bug561634.html
similarity index 100%
rename from content/html/content/test/test_bug561634.html
rename to dom/html/test/test_bug561634.html
diff --git a/content/html/content/test/test_bug561636.html b/dom/html/test/test_bug561636.html
similarity index 100%
rename from content/html/content/test/test_bug561636.html
rename to dom/html/test/test_bug561636.html
diff --git a/content/html/content/test/test_bug561640.html b/dom/html/test/test_bug561640.html
similarity index 100%
rename from content/html/content/test/test_bug561640.html
rename to dom/html/test/test_bug561640.html
diff --git a/content/html/content/test/test_bug564001.html b/dom/html/test/test_bug564001.html
similarity index 100%
rename from content/html/content/test/test_bug564001.html
rename to dom/html/test/test_bug564001.html
diff --git a/content/html/content/test/test_bug566046.html b/dom/html/test/test_bug566046.html
similarity index 100%
rename from content/html/content/test/test_bug566046.html
rename to dom/html/test/test_bug566046.html
diff --git a/content/html/content/test/test_bug567938-1.html b/dom/html/test/test_bug567938-1.html
similarity index 95%
rename from content/html/content/test/test_bug567938-1.html
rename to dom/html/test/test_bug567938-1.html
index 786207be4e7..b1c49bfb49c 100644
--- a/content/html/content/test/test_bug567938-1.html
+++ b/dom/html/test/test_bug567938-1.html
@@ -49,7 +49,7 @@ function runTests()
 {
   document.getElementById('iframe').addEventListener('load', function(aEvent) {
     is(frames['submit_frame'].location.href,
-       "http://mochi.test:8888/tests/content/html/content/test/" + gTestData[gCurrentTest],
+       "http://mochi.test:8888/tests/dom/html/test/" + gTestData[gCurrentTest],
        "The form should have been submitted");
     gCurrentTest++;
     if (gCurrentTest < gTestData.length) {
diff --git a/content/html/content/test/test_bug567938-2.html b/dom/html/test/test_bug567938-2.html
similarity index 95%
rename from content/html/content/test/test_bug567938-2.html
rename to dom/html/test/test_bug567938-2.html
index 77e80cbfaad..38d4881eddb 100644
--- a/content/html/content/test/test_bug567938-2.html
+++ b/dom/html/test/test_bug567938-2.html
@@ -50,7 +50,7 @@ function runTests()
 {
   document.getElementById('iframe').addEventListener('load', function(aEvent) {
     is(frames['submit_frame'].location.href,
-       "http://mochi.test:8888/tests/content/html/content/test/" + gTestData[gCurrentTest],
+       "http://mochi.test:8888/tests/dom/html/test/" + gTestData[gCurrentTest],
        "The form should have been submitted");
     gCurrentTest++;
     if (gCurrentTest < gTestData.length) {
diff --git a/content/html/content/test/test_bug567938-3.html b/dom/html/test/test_bug567938-3.html
similarity index 95%
rename from content/html/content/test/test_bug567938-3.html
rename to dom/html/test/test_bug567938-3.html
index 94cc5c05991..ab78fb98481 100644
--- a/content/html/content/test/test_bug567938-3.html
+++ b/dom/html/test/test_bug567938-3.html
@@ -50,7 +50,7 @@ function runTests()
 {
   document.getElementById('iframe').addEventListener('load', function(aEvent) {
     is(frames['submit_frame'].location.href,
-       "http://mochi.test:8888/tests/content/html/content/test/" + gTestData[gCurrentTest],
+       "http://mochi.test:8888/tests/dom/html/test/" + gTestData[gCurrentTest],
        "The form should have been submitted");
     gCurrentTest++;
     if (gCurrentTest < gTestData.length) {
diff --git a/content/html/content/test/test_bug567938-4.html b/dom/html/test/test_bug567938-4.html
similarity index 100%
rename from content/html/content/test/test_bug567938-4.html
rename to dom/html/test/test_bug567938-4.html
diff --git a/content/html/content/test/test_bug569955.html b/dom/html/test/test_bug569955.html
similarity index 100%
rename from content/html/content/test/test_bug569955.html
rename to dom/html/test/test_bug569955.html
diff --git a/content/html/content/test/test_bug573969.html b/dom/html/test/test_bug573969.html
similarity index 100%
rename from content/html/content/test/test_bug573969.html
rename to dom/html/test/test_bug573969.html
diff --git a/content/html/document/test/test_bug57600.html b/dom/html/test/test_bug57600.html
similarity index 100%
rename from content/html/document/test/test_bug57600.html
rename to dom/html/test/test_bug57600.html
diff --git a/content/html/content/test/test_bug579079.html b/dom/html/test/test_bug579079.html
similarity index 100%
rename from content/html/content/test/test_bug579079.html
rename to dom/html/test/test_bug579079.html
diff --git a/content/html/content/test/test_bug582412-1.html b/dom/html/test/test_bug582412-1.html
similarity index 100%
rename from content/html/content/test/test_bug582412-1.html
rename to dom/html/test/test_bug582412-1.html
diff --git a/content/html/content/test/test_bug582412-2.html b/dom/html/test/test_bug582412-2.html
similarity index 100%
rename from content/html/content/test/test_bug582412-2.html
rename to dom/html/test/test_bug582412-2.html
diff --git a/content/html/content/test/test_bug583514.html b/dom/html/test/test_bug583514.html
similarity index 100%
rename from content/html/content/test/test_bug583514.html
rename to dom/html/test/test_bug583514.html
diff --git a/content/html/content/test/test_bug583533.html b/dom/html/test/test_bug583533.html
similarity index 100%
rename from content/html/content/test/test_bug583533.html
rename to dom/html/test/test_bug583533.html
diff --git a/content/html/content/test/test_bug586763.html b/dom/html/test/test_bug586763.html
similarity index 100%
rename from content/html/content/test/test_bug586763.html
rename to dom/html/test/test_bug586763.html
diff --git a/content/html/content/test/test_bug586786.html b/dom/html/test/test_bug586786.html
similarity index 100%
rename from content/html/content/test/test_bug586786.html
rename to dom/html/test/test_bug586786.html
diff --git a/content/html/content/test/test_bug587469.html b/dom/html/test/test_bug587469.html
similarity index 100%
rename from content/html/content/test/test_bug587469.html
rename to dom/html/test/test_bug587469.html
diff --git a/content/html/content/test/test_bug589.html b/dom/html/test/test_bug589.html
similarity index 100%
rename from content/html/content/test/test_bug589.html
rename to dom/html/test/test_bug589.html
diff --git a/content/html/content/test/test_bug590353-1.html b/dom/html/test/test_bug590353-1.html
similarity index 100%
rename from content/html/content/test/test_bug590353-1.html
rename to dom/html/test/test_bug590353-1.html
diff --git a/content/html/content/test/test_bug590353-2.html b/dom/html/test/test_bug590353-2.html
similarity index 100%
rename from content/html/content/test/test_bug590353-2.html
rename to dom/html/test/test_bug590353-2.html
diff --git a/content/html/content/test/test_bug590363.html b/dom/html/test/test_bug590363.html
similarity index 100%
rename from content/html/content/test/test_bug590363.html
rename to dom/html/test/test_bug590363.html
diff --git a/content/html/content/test/test_bug592802.html b/dom/html/test/test_bug592802.html
similarity index 100%
rename from content/html/content/test/test_bug592802.html
rename to dom/html/test/test_bug592802.html
diff --git a/content/html/content/test/test_bug593689.html b/dom/html/test/test_bug593689.html
similarity index 100%
rename from content/html/content/test/test_bug593689.html
rename to dom/html/test/test_bug593689.html
diff --git a/content/html/content/test/test_bug595429.html b/dom/html/test/test_bug595429.html
similarity index 100%
rename from content/html/content/test/test_bug595429.html
rename to dom/html/test/test_bug595429.html
diff --git a/content/html/content/test/test_bug595447.html b/dom/html/test/test_bug595447.html
similarity index 100%
rename from content/html/content/test/test_bug595447.html
rename to dom/html/test/test_bug595447.html
diff --git a/content/html/content/test/test_bug595449.html b/dom/html/test/test_bug595449.html
similarity index 100%
rename from content/html/content/test/test_bug595449.html
rename to dom/html/test/test_bug595449.html
diff --git a/content/html/content/test/test_bug596350.html b/dom/html/test/test_bug596350.html
similarity index 100%
rename from content/html/content/test/test_bug596350.html
rename to dom/html/test/test_bug596350.html
diff --git a/content/html/content/test/test_bug596511.html b/dom/html/test/test_bug596511.html
similarity index 100%
rename from content/html/content/test/test_bug596511.html
rename to dom/html/test/test_bug596511.html
diff --git a/content/html/content/test/test_bug598643.html b/dom/html/test/test_bug598643.html
similarity index 100%
rename from content/html/content/test/test_bug598643.html
rename to dom/html/test/test_bug598643.html
diff --git a/content/html/content/test/test_bug598833-1.html b/dom/html/test/test_bug598833-1.html
similarity index 100%
rename from content/html/content/test/test_bug598833-1.html
rename to dom/html/test/test_bug598833-1.html
diff --git a/content/html/content/test/test_bug600155.html b/dom/html/test/test_bug600155.html
similarity index 100%
rename from content/html/content/test/test_bug600155.html
rename to dom/html/test/test_bug600155.html
diff --git a/content/html/content/test/test_bug601030.html b/dom/html/test/test_bug601030.html
similarity index 100%
rename from content/html/content/test/test_bug601030.html
rename to dom/html/test/test_bug601030.html
diff --git a/content/html/content/test/test_bug605124-1.html b/dom/html/test/test_bug605124-1.html
similarity index 100%
rename from content/html/content/test/test_bug605124-1.html
rename to dom/html/test/test_bug605124-1.html
diff --git a/content/html/content/test/test_bug605124-2.html b/dom/html/test/test_bug605124-2.html
similarity index 100%
rename from content/html/content/test/test_bug605124-2.html
rename to dom/html/test/test_bug605124-2.html
diff --git a/content/html/content/test/test_bug605125-1.html b/dom/html/test/test_bug605125-1.html
similarity index 100%
rename from content/html/content/test/test_bug605125-1.html
rename to dom/html/test/test_bug605125-1.html
diff --git a/content/html/content/test/test_bug605125-2.html b/dom/html/test/test_bug605125-2.html
similarity index 100%
rename from content/html/content/test/test_bug605125-2.html
rename to dom/html/test/test_bug605125-2.html
diff --git a/content/html/content/test/test_bug606817.html b/dom/html/test/test_bug606817.html
similarity index 100%
rename from content/html/content/test/test_bug606817.html
rename to dom/html/test/test_bug606817.html
diff --git a/content/html/content/test/test_bug607145.html b/dom/html/test/test_bug607145.html
similarity index 94%
rename from content/html/content/test/test_bug607145.html
rename to dom/html/test/test_bug607145.html
index c72c17046be..f32fff18fd7 100644
--- a/content/html/content/test/test_bug607145.html
+++ b/dom/html/test/test_bug607145.html
@@ -21,9 +21,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=607145
  * It's how .action is reflected in Gecko (might change later).
  *
  * If this changes, add reflectURL for "formAction" in
- * content/html/content/test/forms/test_input_attributes_reflection.html and
+ * dom/html/test/forms/test_input_attributes_reflection.html and
  * "action" in
- * content/html/content/test/forms/test_form_attributes_reflection.html
+ * dom/html/test/forms/test_form_attributes_reflection.html
  */
 function reflectURL(aElement, aAttr)
 {
diff --git a/content/html/content/test/test_bug610212.html b/dom/html/test/test_bug610212.html
similarity index 100%
rename from content/html/content/test/test_bug610212.html
rename to dom/html/test/test_bug610212.html
diff --git a/content/html/content/test/test_bug610687.html b/dom/html/test/test_bug610687.html
similarity index 100%
rename from content/html/content/test/test_bug610687.html
rename to dom/html/test/test_bug610687.html
diff --git a/content/html/content/test/test_bug611189.html b/dom/html/test/test_bug611189.html
similarity index 100%
rename from content/html/content/test/test_bug611189.html
rename to dom/html/test/test_bug611189.html
diff --git a/content/html/content/test/test_bug612730.html b/dom/html/test/test_bug612730.html
similarity index 100%
rename from content/html/content/test/test_bug612730.html
rename to dom/html/test/test_bug612730.html
diff --git a/content/html/content/test/test_bug613113.html b/dom/html/test/test_bug613113.html
similarity index 100%
rename from content/html/content/test/test_bug613113.html
rename to dom/html/test/test_bug613113.html
diff --git a/content/html/content/test/test_bug613722.html b/dom/html/test/test_bug613722.html
similarity index 100%
rename from content/html/content/test/test_bug613722.html
rename to dom/html/test/test_bug613722.html
diff --git a/content/html/content/test/test_bug613979.html b/dom/html/test/test_bug613979.html
similarity index 100%
rename from content/html/content/test/test_bug613979.html
rename to dom/html/test/test_bug613979.html
diff --git a/content/html/content/test/test_bug615595.html b/dom/html/test/test_bug615595.html
similarity index 100%
rename from content/html/content/test/test_bug615595.html
rename to dom/html/test/test_bug615595.html
diff --git a/content/html/content/test/test_bug615833.html b/dom/html/test/test_bug615833.html
similarity index 100%
rename from content/html/content/test/test_bug615833.html
rename to dom/html/test/test_bug615833.html
diff --git a/content/html/content/test/test_bug617528.html b/dom/html/test/test_bug617528.html
similarity index 100%
rename from content/html/content/test/test_bug617528.html
rename to dom/html/test/test_bug617528.html
diff --git a/content/html/content/test/test_bug618948.html b/dom/html/test/test_bug618948.html
similarity index 100%
rename from content/html/content/test/test_bug618948.html
rename to dom/html/test/test_bug618948.html
diff --git a/content/html/content/test/test_bug619278.html b/dom/html/test/test_bug619278.html
similarity index 100%
rename from content/html/content/test/test_bug619278.html
rename to dom/html/test/test_bug619278.html
diff --git a/content/html/content/test/test_bug622558.html b/dom/html/test/test_bug622558.html
similarity index 100%
rename from content/html/content/test/test_bug622558.html
rename to dom/html/test/test_bug622558.html
diff --git a/content/html/content/test/test_bug622597.html b/dom/html/test/test_bug622597.html
similarity index 100%
rename from content/html/content/test/test_bug622597.html
rename to dom/html/test/test_bug622597.html
diff --git a/content/html/content/test/test_bug623291.html b/dom/html/test/test_bug623291.html
similarity index 100%
rename from content/html/content/test/test_bug623291.html
rename to dom/html/test/test_bug623291.html
diff --git a/content/html/content/test/test_bug6296.html b/dom/html/test/test_bug6296.html
similarity index 100%
rename from content/html/content/test/test_bug6296.html
rename to dom/html/test/test_bug6296.html
diff --git a/content/html/content/test/test_bug629801.html b/dom/html/test/test_bug629801.html
similarity index 100%
rename from content/html/content/test/test_bug629801.html
rename to dom/html/test/test_bug629801.html
diff --git a/content/html/content/test/test_bug633058.html b/dom/html/test/test_bug633058.html
similarity index 100%
rename from content/html/content/test/test_bug633058.html
rename to dom/html/test/test_bug633058.html
diff --git a/content/html/content/test/test_bug636336.html b/dom/html/test/test_bug636336.html
similarity index 100%
rename from content/html/content/test/test_bug636336.html
rename to dom/html/test/test_bug636336.html
diff --git a/content/html/content/test/test_bug641219.html b/dom/html/test/test_bug641219.html
similarity index 100%
rename from content/html/content/test/test_bug641219.html
rename to dom/html/test/test_bug641219.html
diff --git a/content/html/content/test/test_bug643051.html b/dom/html/test/test_bug643051.html
similarity index 100%
rename from content/html/content/test/test_bug643051.html
rename to dom/html/test/test_bug643051.html
diff --git a/content/html/content/test/test_bug646157.html b/dom/html/test/test_bug646157.html
similarity index 100%
rename from content/html/content/test/test_bug646157.html
rename to dom/html/test/test_bug646157.html
diff --git a/content/html/content/test/test_bug649134.html b/dom/html/test/test_bug649134.html
similarity index 100%
rename from content/html/content/test/test_bug649134.html
rename to dom/html/test/test_bug649134.html
diff --git a/content/html/content/test/test_bug651956.html b/dom/html/test/test_bug651956.html
similarity index 100%
rename from content/html/content/test/test_bug651956.html
rename to dom/html/test/test_bug651956.html
diff --git a/content/html/content/test/test_bug658746.html b/dom/html/test/test_bug658746.html
similarity index 100%
rename from content/html/content/test/test_bug658746.html
rename to dom/html/test/test_bug658746.html
diff --git a/content/html/content/test/test_bug659596.html b/dom/html/test/test_bug659596.html
similarity index 100%
rename from content/html/content/test/test_bug659596.html
rename to dom/html/test/test_bug659596.html
diff --git a/content/html/content/test/test_bug659743.xml b/dom/html/test/test_bug659743.xml
similarity index 100%
rename from content/html/content/test/test_bug659743.xml
rename to dom/html/test/test_bug659743.xml
diff --git a/content/html/content/test/test_bug660663.html b/dom/html/test/test_bug660663.html
similarity index 100%
rename from content/html/content/test/test_bug660663.html
rename to dom/html/test/test_bug660663.html
diff --git a/content/html/content/test/test_bug660959-1.html b/dom/html/test/test_bug660959-1.html
similarity index 100%
rename from content/html/content/test/test_bug660959-1.html
rename to dom/html/test/test_bug660959-1.html
diff --git a/content/html/content/test/test_bug660959-2.html b/dom/html/test/test_bug660959-2.html
similarity index 100%
rename from content/html/content/test/test_bug660959-2.html
rename to dom/html/test/test_bug660959-2.html
diff --git a/content/html/content/test/test_bug660959-3.html b/dom/html/test/test_bug660959-3.html
similarity index 100%
rename from content/html/content/test/test_bug660959-3.html
rename to dom/html/test/test_bug660959-3.html
diff --git a/content/html/content/test/test_bug666200.html b/dom/html/test/test_bug666200.html
similarity index 100%
rename from content/html/content/test/test_bug666200.html
rename to dom/html/test/test_bug666200.html
diff --git a/content/html/content/test/test_bug666666.html b/dom/html/test/test_bug666666.html
similarity index 100%
rename from content/html/content/test/test_bug666666.html
rename to dom/html/test/test_bug666666.html
diff --git a/content/html/content/test/test_bug669012.html b/dom/html/test/test_bug669012.html
similarity index 100%
rename from content/html/content/test/test_bug669012.html
rename to dom/html/test/test_bug669012.html
diff --git a/content/html/content/test/test_bug674558.html b/dom/html/test/test_bug674558.html
similarity index 100%
rename from content/html/content/test/test_bug674558.html
rename to dom/html/test/test_bug674558.html
diff --git a/content/html/content/test/test_bug674927.html b/dom/html/test/test_bug674927.html
similarity index 100%
rename from content/html/content/test/test_bug674927.html
rename to dom/html/test/test_bug674927.html
diff --git a/content/html/content/test/test_bug677463.html b/dom/html/test/test_bug677463.html
similarity index 100%
rename from content/html/content/test/test_bug677463.html
rename to dom/html/test/test_bug677463.html
diff --git a/content/html/document/test/test_bug677495-1.html b/dom/html/test/test_bug677495-1.html
similarity index 100%
rename from content/html/document/test/test_bug677495-1.html
rename to dom/html/test/test_bug677495-1.html
diff --git a/content/html/document/test/test_bug677495.html b/dom/html/test/test_bug677495.html
similarity index 100%
rename from content/html/document/test/test_bug677495.html
rename to dom/html/test/test_bug677495.html
diff --git a/content/html/content/test/test_bug677658.html b/dom/html/test/test_bug677658.html
similarity index 100%
rename from content/html/content/test/test_bug677658.html
rename to dom/html/test/test_bug677658.html
diff --git a/content/html/content/test/test_bug682886.html b/dom/html/test/test_bug682886.html
similarity index 100%
rename from content/html/content/test/test_bug682886.html
rename to dom/html/test/test_bug682886.html
diff --git a/content/html/content/test/test_bug691.html b/dom/html/test/test_bug691.html
similarity index 100%
rename from content/html/content/test/test_bug691.html
rename to dom/html/test/test_bug691.html
diff --git a/content/html/content/test/test_bug694.html b/dom/html/test/test_bug694.html
similarity index 100%
rename from content/html/content/test/test_bug694.html
rename to dom/html/test/test_bug694.html
diff --git a/content/html/content/test/test_bug694503.html b/dom/html/test/test_bug694503.html
similarity index 100%
rename from content/html/content/test/test_bug694503.html
rename to dom/html/test/test_bug694503.html
diff --git a/content/html/content/test/test_bug696.html b/dom/html/test/test_bug696.html
similarity index 100%
rename from content/html/content/test/test_bug696.html
rename to dom/html/test/test_bug696.html
diff --git a/content/html/content/test/test_bug717819.html b/dom/html/test/test_bug717819.html
similarity index 100%
rename from content/html/content/test/test_bug717819.html
rename to dom/html/test/test_bug717819.html
diff --git a/content/html/document/test/test_bug741266.html b/dom/html/test/test_bug741266.html
similarity index 100%
rename from content/html/document/test/test_bug741266.html
rename to dom/html/test/test_bug741266.html
diff --git a/content/html/content/test/test_bug742030.html b/dom/html/test/test_bug742030.html
similarity index 100%
rename from content/html/content/test/test_bug742030.html
rename to dom/html/test/test_bug742030.html
diff --git a/content/html/content/test/test_bug742549.html b/dom/html/test/test_bug742549.html
similarity index 100%
rename from content/html/content/test/test_bug742549.html
rename to dom/html/test/test_bug742549.html
diff --git a/content/html/content/test/test_bug745685.html b/dom/html/test/test_bug745685.html
similarity index 100%
rename from content/html/content/test/test_bug745685.html
rename to dom/html/test/test_bug745685.html
diff --git a/content/html/content/test/test_bug763626.html b/dom/html/test/test_bug763626.html
similarity index 100%
rename from content/html/content/test/test_bug763626.html
rename to dom/html/test/test_bug763626.html
diff --git a/content/html/document/test/test_bug765780.html b/dom/html/test/test_bug765780.html
similarity index 100%
rename from content/html/document/test/test_bug765780.html
rename to dom/html/test/test_bug765780.html
diff --git a/content/html/content/test/test_bug780993.html b/dom/html/test/test_bug780993.html
similarity index 100%
rename from content/html/content/test/test_bug780993.html
rename to dom/html/test/test_bug780993.html
diff --git a/content/html/content/test/test_bug787134.html b/dom/html/test/test_bug787134.html
similarity index 100%
rename from content/html/content/test/test_bug787134.html
rename to dom/html/test/test_bug787134.html
diff --git a/content/html/content/test/test_bug797113.html b/dom/html/test/test_bug797113.html
similarity index 100%
rename from content/html/content/test/test_bug797113.html
rename to dom/html/test/test_bug797113.html
diff --git a/content/html/content/test/test_bug803677.html b/dom/html/test/test_bug803677.html
similarity index 100%
rename from content/html/content/test/test_bug803677.html
rename to dom/html/test/test_bug803677.html
diff --git a/content/html/content/test/test_bug821307.html b/dom/html/test/test_bug821307.html
similarity index 100%
rename from content/html/content/test/test_bug821307.html
rename to dom/html/test/test_bug821307.html
diff --git a/content/html/content/test/test_bug827126.html b/dom/html/test/test_bug827126.html
similarity index 100%
rename from content/html/content/test/test_bug827126.html
rename to dom/html/test/test_bug827126.html
diff --git a/content/html/content/test/test_bug827426.html b/dom/html/test/test_bug827426.html
similarity index 100%
rename from content/html/content/test/test_bug827426.html
rename to dom/html/test/test_bug827426.html
diff --git a/content/html/content/test/test_bug838582.html b/dom/html/test/test_bug838582.html
similarity index 100%
rename from content/html/content/test/test_bug838582.html
rename to dom/html/test/test_bug838582.html
diff --git a/content/html/content/test/test_bug839371.html b/dom/html/test/test_bug839371.html
similarity index 100%
rename from content/html/content/test/test_bug839371.html
rename to dom/html/test/test_bug839371.html
diff --git a/content/html/content/test/test_bug839913.html b/dom/html/test/test_bug839913.html
similarity index 100%
rename from content/html/content/test/test_bug839913.html
rename to dom/html/test/test_bug839913.html
diff --git a/content/html/content/test/test_bug840877.html b/dom/html/test/test_bug840877.html
similarity index 100%
rename from content/html/content/test/test_bug840877.html
rename to dom/html/test/test_bug840877.html
diff --git a/content/html/content/test/test_bug841466.html b/dom/html/test/test_bug841466.html
similarity index 100%
rename from content/html/content/test/test_bug841466.html
rename to dom/html/test/test_bug841466.html
diff --git a/content/html/content/test/test_bug845057.html b/dom/html/test/test_bug845057.html
similarity index 100%
rename from content/html/content/test/test_bug845057.html
rename to dom/html/test/test_bug845057.html
diff --git a/content/html/content/test/test_bug869040.html b/dom/html/test/test_bug869040.html
similarity index 100%
rename from content/html/content/test/test_bug869040.html
rename to dom/html/test/test_bug869040.html
diff --git a/content/html/content/test/test_bug870787.html b/dom/html/test/test_bug870787.html
similarity index 100%
rename from content/html/content/test/test_bug870787.html
rename to dom/html/test/test_bug870787.html
diff --git a/content/html/document/test/test_bug871161.html b/dom/html/test/test_bug871161.html
similarity index 100%
rename from content/html/document/test/test_bug871161.html
rename to dom/html/test/test_bug871161.html
diff --git a/content/html/content/test/test_bug874758.html b/dom/html/test/test_bug874758.html
similarity index 100%
rename from content/html/content/test/test_bug874758.html
rename to dom/html/test/test_bug874758.html
diff --git a/content/html/content/test/test_bug879319.html b/dom/html/test/test_bug879319.html
similarity index 100%
rename from content/html/content/test/test_bug879319.html
rename to dom/html/test/test_bug879319.html
diff --git a/content/html/content/test/test_bug885024.html b/dom/html/test/test_bug885024.html
similarity index 100%
rename from content/html/content/test/test_bug885024.html
rename to dom/html/test/test_bug885024.html
diff --git a/content/html/content/test/test_bug893537.html b/dom/html/test/test_bug893537.html
similarity index 100%
rename from content/html/content/test/test_bug893537.html
rename to dom/html/test/test_bug893537.html
diff --git a/content/html/content/test/test_bug95530.html b/dom/html/test/test_bug95530.html
similarity index 100%
rename from content/html/content/test/test_bug95530.html
rename to dom/html/test/test_bug95530.html
diff --git a/content/html/content/test/test_bug969346.html b/dom/html/test/test_bug969346.html
similarity index 100%
rename from content/html/content/test/test_bug969346.html
rename to dom/html/test/test_bug969346.html
diff --git a/content/html/content/test/test_bug982039.html b/dom/html/test/test_bug982039.html
similarity index 100%
rename from content/html/content/test/test_bug982039.html
rename to dom/html/test/test_bug982039.html
diff --git a/content/html/content/test/test_change_crossorigin.html b/dom/html/test/test_change_crossorigin.html
similarity index 92%
rename from content/html/content/test/test_change_crossorigin.html
rename to dom/html/test/test_change_crossorigin.html
index b85f18e3088..01f31bc09eb 100644
--- a/content/html/content/test/test_change_crossorigin.html
+++ b/dom/html/test/test_change_crossorigin.html
@@ -17,7 +17,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=696451
   var img = new Image,
       canvas = document.createElement("canvas"),
       ctx = canvas.getContext("2d"),
-      src = "http://example.com/tests/content/html/content/test/image-allow-credentials.png",
+      src = "http://example.com/tests/dom/html/test/image-allow-credentials.png",
       imgDone = false,
       imgNotAllowedToLoadDone = false;
 
@@ -52,7 +52,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=696451
 
   var imgNotAllowedToLoad = new Image;
 
-  imgNotAllowedToLoad.src = "http://example.com/tests/content/html/content/test/image.png";
+  imgNotAllowedToLoad.src = "http://example.com/tests/dom/html/test/image.png";
 
   imgNotAllowedToLoad.crossOrigin = "Anonymous";
 
diff --git a/content/html/content/test/test_checked.html b/dom/html/test/test_checked.html
similarity index 100%
rename from content/html/content/test/test_checked.html
rename to dom/html/test/test_checked.html
diff --git a/content/html/content/test/test_dir_attributes_reflection.html b/dom/html/test/test_dir_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_dir_attributes_reflection.html
rename to dom/html/test/test_dir_attributes_reflection.html
diff --git a/content/html/content/test/test_dl_attributes_reflection.html b/dom/html/test/test_dl_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_dl_attributes_reflection.html
rename to dom/html/test/test_dl_attributes_reflection.html
diff --git a/content/html/document/test/test_document-element-inserted.html b/dom/html/test/test_document-element-inserted.html
similarity index 100%
rename from content/html/document/test/test_document-element-inserted.html
rename to dom/html/test/test_document-element-inserted.html
diff --git a/content/html/document/test/test_document.watch.html b/dom/html/test/test_document.watch.html
similarity index 100%
rename from content/html/document/test/test_document.watch.html
rename to dom/html/test/test_document.watch.html
diff --git a/content/html/document/test/test_documentAll.html b/dom/html/test/test_documentAll.html
similarity index 100%
rename from content/html/document/test/test_documentAll.html
rename to dom/html/test/test_documentAll.html
diff --git a/content/html/content/test/test_element_prototype.html b/dom/html/test/test_element_prototype.html
similarity index 100%
rename from content/html/content/test/test_element_prototype.html
rename to dom/html/test/test_element_prototype.html
diff --git a/content/html/content/test/test_embed_attributes_reflection.html b/dom/html/test/test_embed_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_embed_attributes_reflection.html
rename to dom/html/test/test_embed_attributes_reflection.html
diff --git a/content/html/document/test/test_form-parsing.html b/dom/html/test/test_form-parsing.html
similarity index 100%
rename from content/html/document/test/test_form-parsing.html
rename to dom/html/test/test_form-parsing.html
diff --git a/content/html/content/test/test_formData.html b/dom/html/test/test_formData.html
similarity index 100%
rename from content/html/content/test/test_formData.html
rename to dom/html/test/test_formData.html
diff --git a/content/html/content/test/test_formSubmission.html b/dom/html/test/test_formSubmission.html
similarity index 100%
rename from content/html/content/test/test_formSubmission.html
rename to dom/html/test/test_formSubmission.html
diff --git a/content/html/content/test/test_formSubmission2.html b/dom/html/test/test_formSubmission2.html
similarity index 100%
rename from content/html/content/test/test_formSubmission2.html
rename to dom/html/test/test_formSubmission2.html
diff --git a/content/html/content/test/test_formelements.html b/dom/html/test/test_formelements.html
similarity index 100%
rename from content/html/content/test/test_formelements.html
rename to dom/html/test/test_formelements.html
diff --git a/content/html/content/test/test_fragment_form_pointer.html b/dom/html/test/test_fragment_form_pointer.html
similarity index 100%
rename from content/html/content/test/test_fragment_form_pointer.html
rename to dom/html/test/test_fragment_form_pointer.html
diff --git a/content/html/content/test/test_fullscreen-api.html b/dom/html/test/test_fullscreen-api.html
similarity index 100%
rename from content/html/content/test/test_fullscreen-api.html
rename to dom/html/test/test_fullscreen-api.html
diff --git a/content/html/content/test/test_hidden.html b/dom/html/test/test_hidden.html
similarity index 100%
rename from content/html/content/test/test_hidden.html
rename to dom/html/test/test_hidden.html
diff --git a/content/html/content/test/test_html_attributes_reflection.html b/dom/html/test/test_html_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_html_attributes_reflection.html
rename to dom/html/test/test_html_attributes_reflection.html
diff --git a/content/html/content/test/test_htmlcollection.html b/dom/html/test/test_htmlcollection.html
similarity index 100%
rename from content/html/content/test/test_htmlcollection.html
rename to dom/html/test/test_htmlcollection.html
diff --git a/content/html/content/test/test_iframe_sandbox_general.html b/dom/html/test/test_iframe_sandbox_general.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_general.html
rename to dom/html/test/test_iframe_sandbox_general.html
diff --git a/content/html/content/test/test_iframe_sandbox_inheritance.html b/dom/html/test/test_iframe_sandbox_inheritance.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_inheritance.html
rename to dom/html/test/test_iframe_sandbox_inheritance.html
diff --git a/content/html/content/test/test_iframe_sandbox_modal.html b/dom/html/test/test_iframe_sandbox_modal.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_modal.html
rename to dom/html/test/test_iframe_sandbox_modal.html
diff --git a/content/html/content/test/test_iframe_sandbox_navigation.html b/dom/html/test/test_iframe_sandbox_navigation.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_navigation.html
rename to dom/html/test/test_iframe_sandbox_navigation.html
diff --git a/content/html/content/test/test_iframe_sandbox_navigation2.html b/dom/html/test/test_iframe_sandbox_navigation2.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_navigation2.html
rename to dom/html/test/test_iframe_sandbox_navigation2.html
diff --git a/content/html/content/test/test_iframe_sandbox_plugins.html b/dom/html/test/test_iframe_sandbox_plugins.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_plugins.html
rename to dom/html/test/test_iframe_sandbox_plugins.html
diff --git a/content/html/content/test/test_iframe_sandbox_popups.html b/dom/html/test/test_iframe_sandbox_popups.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_popups.html
rename to dom/html/test/test_iframe_sandbox_popups.html
diff --git a/content/html/content/test/test_iframe_sandbox_popups_inheritance.html b/dom/html/test/test_iframe_sandbox_popups_inheritance.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_popups_inheritance.html
rename to dom/html/test/test_iframe_sandbox_popups_inheritance.html
diff --git a/content/html/content/test/test_iframe_sandbox_redirect.html b/dom/html/test/test_iframe_sandbox_redirect.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_redirect.html
rename to dom/html/test/test_iframe_sandbox_redirect.html
diff --git a/content/html/content/test/test_iframe_sandbox_same_origin.html b/dom/html/test/test_iframe_sandbox_same_origin.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_same_origin.html
rename to dom/html/test/test_iframe_sandbox_same_origin.html
diff --git a/content/html/content/test/test_iframe_sandbox_workers.html b/dom/html/test/test_iframe_sandbox_workers.html
similarity index 100%
rename from content/html/content/test/test_iframe_sandbox_workers.html
rename to dom/html/test/test_iframe_sandbox_workers.html
diff --git a/content/html/content/test/test_ignoreuserfocus.html b/dom/html/test/test_ignoreuserfocus.html
similarity index 100%
rename from content/html/content/test/test_ignoreuserfocus.html
rename to dom/html/test/test_ignoreuserfocus.html
diff --git a/content/html/content/test/test_imageSrcSet.html b/dom/html/test/test_imageSrcSet.html
similarity index 100%
rename from content/html/content/test/test_imageSrcSet.html
rename to dom/html/test/test_imageSrcSet.html
diff --git a/content/html/content/test/test_img_attributes_reflection.html b/dom/html/test/test_img_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_img_attributes_reflection.html
rename to dom/html/test/test_img_attributes_reflection.html
diff --git a/content/html/content/test/test_imports_basics.html b/dom/html/test/test_imports_basics.html
similarity index 100%
rename from content/html/content/test/test_imports_basics.html
rename to dom/html/test/test_imports_basics.html
diff --git a/content/html/content/test/test_imports_nested.html b/dom/html/test/test_imports_nested.html
similarity index 100%
rename from content/html/content/test/test_imports_nested.html
rename to dom/html/test/test_imports_nested.html
diff --git a/content/html/content/test/test_imports_nested_2.html b/dom/html/test/test_imports_nested_2.html
similarity index 100%
rename from content/html/content/test/test_imports_nested_2.html
rename to dom/html/test/test_imports_nested_2.html
diff --git a/content/html/content/test/test_imports_nonhttp.html b/dom/html/test/test_imports_nonhttp.html
similarity index 100%
rename from content/html/content/test/test_imports_nonhttp.html
rename to dom/html/test/test_imports_nonhttp.html
diff --git a/content/html/content/test/test_imports_redirect.html b/dom/html/test/test_imports_redirect.html
similarity index 86%
rename from content/html/content/test/test_imports_redirect.html
rename to dom/html/test/test_imports_redirect.html
index 610f24a4e96..d780476cfcc 100644
--- a/content/html/content/test/test_imports_redirect.html
+++ b/dom/html/test/test_imports_redirect.html
@@ -25,7 +25,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1016875
     }
   </script>
 
-  <link rel="import" href="http://mochi.test:8888/tests/content/html/content/test/file_imports_redirect.html" id="import" onload="loaded()" onerror="failed()"></link>
+  <link rel="import" href="http://mochi.test:8888/tests/dom/html/test/file_imports_redirect.html" id="import" onload="loaded()" onerror="failed()"></link>
 
   <script type="text/javascript">
     ok(loadEventFired, "Load event was fired");
diff --git a/content/html/content/test/test_input_files_not_nsIFile.html b/dom/html/test/test_input_files_not_nsIFile.html
similarity index 100%
rename from content/html/content/test/test_input_files_not_nsIFile.html
rename to dom/html/test/test_input_files_not_nsIFile.html
diff --git a/content/html/content/test/test_li_attributes_reflection.html b/dom/html/test/test_li_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_li_attributes_reflection.html
rename to dom/html/test/test_li_attributes_reflection.html
diff --git a/content/html/content/test/test_link_attributes_reflection.html b/dom/html/test/test_link_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_link_attributes_reflection.html
rename to dom/html/test/test_link_attributes_reflection.html
diff --git a/content/html/content/test/test_link_sizes.html b/dom/html/test/test_link_sizes.html
similarity index 100%
rename from content/html/content/test/test_link_sizes.html
rename to dom/html/test/test_link_sizes.html
diff --git a/content/html/content/test/test_map_attributes_reflection.html b/dom/html/test/test_map_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_map_attributes_reflection.html
rename to dom/html/test/test_map_attributes_reflection.html
diff --git a/content/html/content/test/test_meta_attributes_reflection.html b/dom/html/test/test_meta_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_meta_attributes_reflection.html
rename to dom/html/test/test_meta_attributes_reflection.html
diff --git a/content/html/content/test/test_mod_attributes_reflection.html b/dom/html/test/test_mod_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_mod_attributes_reflection.html
rename to dom/html/test/test_mod_attributes_reflection.html
diff --git a/content/html/content/test/test_mozaudiochannel.html b/dom/html/test/test_mozaudiochannel.html
similarity index 100%
rename from content/html/content/test/test_mozaudiochannel.html
rename to dom/html/test/test_mozaudiochannel.html
diff --git a/content/html/content/test/test_named_options.html b/dom/html/test/test_named_options.html
similarity index 100%
rename from content/html/content/test/test_named_options.html
rename to dom/html/test/test_named_options.html
diff --git a/content/html/content/test/test_nested_invalid_fieldsets.html b/dom/html/test/test_nested_invalid_fieldsets.html
similarity index 100%
rename from content/html/content/test/test_nested_invalid_fieldsets.html
rename to dom/html/test/test_nested_invalid_fieldsets.html
diff --git a/content/html/document/test/test_non-ascii-cookie.html b/dom/html/test/test_non-ascii-cookie.html
similarity index 100%
rename from content/html/document/test/test_non-ascii-cookie.html
rename to dom/html/test/test_non-ascii-cookie.html
diff --git a/content/html/document/test/test_non-ascii-cookie.html^headers^ b/dom/html/test/test_non-ascii-cookie.html^headers^
similarity index 100%
rename from content/html/document/test/test_non-ascii-cookie.html^headers^
rename to dom/html/test/test_non-ascii-cookie.html^headers^
diff --git a/content/html/content/test/test_object_attributes_reflection.html b/dom/html/test/test_object_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_object_attributes_reflection.html
rename to dom/html/test/test_object_attributes_reflection.html
diff --git a/content/html/content/test/test_object_plugin_nav.html b/dom/html/test/test_object_plugin_nav.html
similarity index 100%
rename from content/html/content/test/test_object_plugin_nav.html
rename to dom/html/test/test_object_plugin_nav.html
diff --git a/content/html/content/test/test_ol_attributes_reflection.html b/dom/html/test/test_ol_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_ol_attributes_reflection.html
rename to dom/html/test/test_ol_attributes_reflection.html
diff --git a/content/html/content/test/test_option_defaultSelected.html b/dom/html/test/test_option_defaultSelected.html
similarity index 100%
rename from content/html/content/test/test_option_defaultSelected.html
rename to dom/html/test/test_option_defaultSelected.html
diff --git a/content/html/content/test/test_option_selected_state.html b/dom/html/test/test_option_selected_state.html
similarity index 100%
rename from content/html/content/test/test_option_selected_state.html
rename to dom/html/test/test_option_selected_state.html
diff --git a/content/html/content/test/test_param_attributes_reflection.html b/dom/html/test/test_param_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_param_attributes_reflection.html
rename to dom/html/test/test_param_attributes_reflection.html
diff --git a/content/html/content/test/test_plugin.tst b/dom/html/test/test_plugin.tst
similarity index 100%
rename from content/html/content/test/test_plugin.tst
rename to dom/html/test/test_plugin.tst
diff --git a/content/html/content/test/test_q_attributes_reflection.html b/dom/html/test/test_q_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_q_attributes_reflection.html
rename to dom/html/test/test_q_attributes_reflection.html
diff --git a/content/html/content/test/test_restore_from_parser_fragment.html b/dom/html/test/test_restore_from_parser_fragment.html
similarity index 100%
rename from content/html/content/test/test_restore_from_parser_fragment.html
rename to dom/html/test/test_restore_from_parser_fragment.html
diff --git a/content/html/content/test/test_rowscollection.html b/dom/html/test/test_rowscollection.html
similarity index 100%
rename from content/html/content/test/test_rowscollection.html
rename to dom/html/test/test_rowscollection.html
diff --git a/content/html/content/test/test_srcdoc-2.html b/dom/html/test/test_srcdoc-2.html
similarity index 100%
rename from content/html/content/test/test_srcdoc-2.html
rename to dom/html/test/test_srcdoc-2.html
diff --git a/content/html/content/test/test_srcdoc.html b/dom/html/test/test_srcdoc.html
similarity index 100%
rename from content/html/content/test/test_srcdoc.html
rename to dom/html/test/test_srcdoc.html
diff --git a/content/html/content/test/test_style_attributes_reflection.html b/dom/html/test/test_style_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_style_attributes_reflection.html
rename to dom/html/test/test_style_attributes_reflection.html
diff --git a/content/html/content/test/test_track.html b/dom/html/test/test_track.html
similarity index 94%
rename from content/html/content/test/test_track.html
rename to dom/html/test/test_track.html
index 50e21e15094..a3110efc368 100644
--- a/content/html/content/test/test_track.html
+++ b/dom/html/test/test_track.html
@@ -8,7 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=833386
   <title>Test for Bug 833386 - HTMLTrackElement</title>
   <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/content/html/content/test/reflect.js"></script>
+  <script type="text/javascript" src="/tests/dom/html/test/reflect.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
 <body>
diff --git a/content/html/content/test/test_track_disabled.html b/dom/html/test/test_track_disabled.html
similarity index 100%
rename from content/html/content/test/test_track_disabled.html
rename to dom/html/test/test_track_disabled.html
diff --git a/content/html/content/test/test_ul_attributes_reflection.html b/dom/html/test/test_ul_attributes_reflection.html
similarity index 100%
rename from content/html/content/test/test_ul_attributes_reflection.html
rename to dom/html/test/test_ul_attributes_reflection.html
diff --git a/content/html/content/test/test_undoManager.html b/dom/html/test/test_undoManager.html
similarity index 100%
rename from content/html/content/test/test_undoManager.html
rename to dom/html/test/test_undoManager.html
diff --git a/content/html/content/test/test_video_wakelock.html b/dom/html/test/test_video_wakelock.html
similarity index 100%
rename from content/html/content/test/test_video_wakelock.html
rename to dom/html/test/test_video_wakelock.html
diff --git a/content/html/document/test/test_viewport.html b/dom/html/test/test_viewport.html
similarity index 100%
rename from content/html/document/test/test_viewport.html
rename to dom/html/test/test_viewport.html
diff --git a/content/html/content/test/wakelock.ogg b/dom/html/test/wakelock.ogg
similarity index 100%
rename from content/html/content/test/wakelock.ogg
rename to dom/html/test/wakelock.ogg
diff --git a/content/html/content/test/wakelock.ogv b/dom/html/test/wakelock.ogv
similarity index 100%
rename from content/html/content/test/wakelock.ogv
rename to dom/html/test/wakelock.ogv
diff --git a/dom/media/android/moz.build b/dom/media/android/moz.build
index 5e305f905ff..2aa15d9c33f 100644
--- a/dom/media/android/moz.build
+++ b/dom/media/android/moz.build
@@ -21,7 +21,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
-    ]
+    '/dom/html',
+]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/media/gstreamer/moz.build b/dom/media/gstreamer/moz.build
index b6a1bfaa876..376151c6053 100644
--- a/dom/media/gstreamer/moz.build
+++ b/dom/media/gstreamer/moz.build
@@ -33,7 +33,7 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
+    '/dom/html',
 ]
 
 CFLAGS += CONFIG['GSTREAMER_CFLAGS']
diff --git a/dom/media/omx/moz.build b/dom/media/omx/moz.build
index af96c81dbc1..68ec812722d 100644
--- a/dom/media/omx/moz.build
+++ b/dom/media/omx/moz.build
@@ -82,7 +82,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
+    '/dom/html',
     '/ipc/chromium/src',
     'mediaresourcemanager',
 ]
diff --git a/dom/media/raw/moz.build b/dom/media/raw/moz.build
index 8b48f2ca658..f8b105ddd8a 100644
--- a/dom/media/raw/moz.build
+++ b/dom/media/raw/moz.build
@@ -19,7 +19,7 @@ FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
+    '/dom/html',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/media/test/test_defaultMuted.html b/dom/media/test/test_defaultMuted.html
index 5dd30e302e9..de6d642e552 100644
--- a/dom/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="../../../content/html/content/test/reflect.js"></script>
+  <script type="text/javascript" src="../../../dom/html/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/dom/media/test/test_source_media.html b/dom/media/test/test_source_media.html
index add5452e0cb..0889ef050be 100644
--- a/dom/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="../../../content/html/content/test/reflect.js"></script>
+<script type="text/javascript" src="../../../dom/html/test/reflect.js"></script>
 </head>
 <body>
 <pre id="test">
diff --git a/dom/moz.build b/dom/moz.build
index 12110aca2aa..03a62a84738 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -60,6 +60,7 @@ DIRS += [
     'filesystem',
     'fmradio',
     'geolocation',
+    'html',
     'json',
     'jsurl',
     'asmjscache',
diff --git a/dom/svg/moz.build b/dom/svg/moz.build
index b3f6eaa419a..47e67cd8917 100644
--- a/dom/svg/moz.build
+++ b/dom/svg/moz.build
@@ -258,9 +258,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
-    '/content/html/document/src',
     '/dom',
+    '/dom/html',
     '/dom/smil',
     '/dom/svg',
     '/dom/xbl',
diff --git a/dom/tests/mochitest/pointerlock/test_pointerlock-api.html b/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
index 2ca749aab47..f0684308117 100644
--- a/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
+++ b/dom/tests/mochitest/pointerlock/test_pointerlock-api.html
@@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
          * which doesn't work when run in the mochitests' iframe, since the
          * mochitests' iframe doesn't have an allowfullscreen attribute.  To get
          * around this, all tests are run in a child window, which can go fullscreen.
-         * This method is borrowed from content/html/content/test/test_fullscreen-api.html.
+         * This method is borrowed from dom/html/test/test_fullscreen-api.html.
          **/
 
         SimpleTest.waitForExplicitFinish();
@@ -66,7 +66,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=633602
         var gTestIndex = 0;
 
         // TODO: if ever we remove these checks for XP and Lion, we should do the same
-        // in content/html/content/test/test_fullscreen-api.html, which uses the same pattern.
+        // in dom/html/test/test_fullscreen-api.html, which uses the same pattern.
         const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
         const isOSXLion = navigator.userAgent.indexOf("Mac OS X 10.7") != -1;
         const isOSXMtnLion = navigator.userAgent.indexOf("Mac OS X 10.8") != -1;
diff --git a/dom/webidl/ImageDocument.webidl b/dom/webidl/ImageDocument.webidl
index 274381afcf4..2606636f1c0 100644
--- a/dom/webidl/ImageDocument.webidl
+++ b/dom/webidl/ImageDocument.webidl
@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is:
- * content/html/document/public/nsIImageDocument.idl
+ * dom/html/public/nsIImageDocument.idl
  */
 
 interface imgIRequest;
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
index 209956432ce..8948712e193 100644
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -42,8 +42,8 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/document/src',
     '/dom/base',
+    '/dom/html',
     '/dom/xml',
     '/dom/xul',
     '/layout/style',
diff --git a/dom/xml/moz.build b/dom/xml/moz.build
index edb7eabd691..cdd76de453a 100644
--- a/dom/xml/moz.build
+++ b/dom/xml/moz.build
@@ -40,8 +40,8 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/caps',
     '/content/base/src',
-    '/content/html/document/src',
     '/dom/base',
+    '/dom/html',
     '/dom/xul',
     '/layout/style',
 ]
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index 35aa5169e02..324821de0ea 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -48,9 +48,9 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/html',
     '/dom/xbl',
     '/dom/xml',
     '/dom/xul/templates',
diff --git a/embedding/components/webbrowserpersist/moz.build b/embedding/components/webbrowserpersist/moz.build
index b787ddc063f..fc09abed995 100644
--- a/embedding/components/webbrowserpersist/moz.build
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -20,5 +20,5 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/html/content/src',
+    '/dom/html',
 ]
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index cb8dd16fd97..b21ea595af6 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -64,9 +64,8 @@ LOCAL_INCLUDES += [
     '/caps',
     '/content/base/public',
     '/content/base/src',
-    '/content/html/content/src',
-    '/content/html/document/src',
     '/dom/base',
+    '/dom/html',
     '/dom/svg',
     '/dom/workers',
     '/js/ipc',
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 176b6f0686b..29fdd9fec3b 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -116,7 +116,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/html/content/src',
     '../forms',
     '../generic',
     '../mathml',
@@ -128,6 +127,7 @@ LOCAL_INCLUDES += [
     '../xul/tree/',
     '/docshell/base',
     '/dom/base',
+    '/dom/html',
     '/dom/svg',
     '/dom/xbl',
     '/view',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 8da484c9988..8109693135a 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -38,8 +38,6 @@ LOCAL_INCLUDES += [
     '../xul',
     '/caps',
     '/content/base/src',
-    '/content/html/content/src',
-    '/content/html/document/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
@@ -47,6 +45,7 @@ LOCAL_INCLUDES += [
     '/dom/canvas',
     '/dom/filesystem',
     '/dom/geolocation',
+    '/dom/html',
     '/dom/json',
     '/dom/jsurl',
     '/dom/media',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 1ede6da6471..9e6a40d4876 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -45,12 +45,12 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/html/content/src',
     '../../editor/libeditor',
     '../../editor/txmgr',
     '../base',
     '../generic',
     '../xul',
+    '/dom/html',
 ]
 
 if CONFIG['ENABLE_INTL_API']:
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index b6da4921dc3..957e6b2e126 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -121,7 +121,6 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/html/content/src',
     '../../dom/base',
     '../../dom/plugins/base',
     '../base',
@@ -130,6 +129,7 @@ LOCAL_INCLUDES += [
     '../svg',
     '../tables',
     '../xul',
+    '/dom/html',
     '/dom/xul',
 ]
 
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 161edac0286..44c375dbc6e 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -368,8 +368,7 @@ include ../xul/grid/reftests/reftest.list
 include z-index/reftest.list
 
 # reftest(s) to verify content bugfixes
-include ../../content/html/document/reftests/reftests.list
-include ../../content/html/content/reftests/reftest.list
+include ../../dom/html/reftests/reftest.list
 include ../../dom/imptests/reftest.list
 
 # editor/
diff --git a/layout/style/moz.build b/layout/style/moz.build
index e23e7fde473..85ade936f6b 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -156,11 +156,11 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/html/content/src',
     '../base',
     '../generic',
     '../xul',
     '/dom/base',
+    '/dom/html',
     '/dom/xbl',
     '/dom/xul',
 ]
diff --git a/layout/style/test/ParseCSS.cpp b/layout/style/test/ParseCSS.cpp
index ea2870ed645..c74a88c2ec0 100644
--- a/layout/style/test/ParseCSS.cpp
+++ b/layout/style/test/ParseCSS.cpp
@@ -6,7 +6,7 @@
 
 /*
  * This file is meant to be used with |#define CSS_REPORT_PARSE_ERRORS|
- * in mozilla/content/html/style/src/nsCSSScanner.h uncommented, and the
+ * in mozilla/dom/html/style/src/nsCSSScanner.h uncommented, and the
  * |#ifdef DEBUG| block in nsCSSScanner::OutputError (in
  * nsCSSScanner.cpp in the same directory) used (even if not a debug
  * build).
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 37b2ca3b65a..744b1ce39ce 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -33,12 +33,12 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/html/content/src',
     '../../intl/unicharutil/util',
     '../base',
     '../generic',
     '../style',
     '../xul',
+    '/dom/html',
 ]
 
 DEFINES['DEBUG_TABLE_STRATEGY_off'] = True
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index bf5e945aa17..1d0435886a9 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -126,7 +126,6 @@
 @BINPATH@/components/composer.xpt
 @BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_htmldoc.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_webrtc.xpt
 @BINPATH@/components/content_xslt.xpt
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 71349e27dc2..0824530b487 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -6,8 +6,6 @@ include ../../testing/crashtest/sanity/crashtests.list
 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 ../../docshell/base/crashtests/crashtests.list
 
@@ -15,6 +13,7 @@ include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/canvas/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
+include ../../dom/html/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/jsurl/crashtests/crashtests.list
 include ../../dom/mathml/crashtests/crashtests.list
diff --git a/testing/mochitest/android23.json b/testing/mochitest/android23.json
index 90833bc3dda..330ed0c8475 100644
--- a/testing/mochitest/android23.json
+++ b/testing/mochitest/android23.json
@@ -2,7 +2,7 @@
 "runtests": {},
 "excludetests": {
   "robocop": "TIMED_OUT",
-  "content/html/content/test/test_bug659743.xml": "Android 2.3 aws only; bug 1031103",
+  "dom/html/test/test_bug659743.xml": "Android 2.3 aws only; bug 1031103",
   "docshell/test/navigation/test_reserved.html": "too slow on Android 2.3 aws only; bug 1030403",
   "dom/canvas/test/webgl-conformance": "bug 865443 - separate suite -- mochitest-gl",
   "dom/canvas/test/webgl-mochitest/test_no_arr_points.html": "Android 2.3 aws only; bug 1030942",

From b11c47cb70ba0c45a47c6fb3a021b8a5104d6e53 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:25:22 +0300
Subject: [PATCH 23/37] Bug 946065 - Part 12: Move content/base/ to dom/ and
 flatten subdirectories. r=peterv

--HG--
rename : content/base/src/Attr.cpp => dom/base/Attr.cpp
rename : content/base/src/Attr.h => dom/base/Attr.h
rename : content/base/src/AutocompleteFieldList.h => dom/base/AutocompleteFieldList.h
rename : content/base/public/BlobSet.h => dom/base/BlobSet.h
rename : content/base/public/CORSMode.h => dom/base/CORSMode.h
rename : content/base/src/ChildIterator.cpp => dom/base/ChildIterator.cpp
rename : content/base/src/ChildIterator.h => dom/base/ChildIterator.h
rename : content/base/src/Comment.cpp => dom/base/Comment.cpp
rename : content/base/src/Comment.h => dom/base/Comment.h
rename : content/base/src/DOMImplementation.cpp => dom/base/DOMImplementation.cpp
rename : content/base/src/DOMImplementation.h => dom/base/DOMImplementation.h
rename : content/base/src/DOMMatrix.cpp => dom/base/DOMMatrix.cpp
rename : content/base/src/DOMMatrix.h => dom/base/DOMMatrix.h
rename : content/base/src/DOMParser.cpp => dom/base/DOMParser.cpp
rename : content/base/src/DOMParser.h => dom/base/DOMParser.h
rename : content/base/src/DOMPoint.cpp => dom/base/DOMPoint.cpp
rename : content/base/src/DOMPoint.h => dom/base/DOMPoint.h
rename : content/base/src/DOMQuad.cpp => dom/base/DOMQuad.cpp
rename : content/base/src/DOMQuad.h => dom/base/DOMQuad.h
rename : content/base/src/DOMRect.cpp => dom/base/DOMRect.cpp
rename : content/base/src/DOMRect.h => dom/base/DOMRect.h
rename : content/base/src/DOMStringList.cpp => dom/base/DOMStringList.cpp
rename : content/base/src/DOMStringList.h => dom/base/DOMStringList.h
rename : content/base/src/DirectionalityUtils.cpp => dom/base/DirectionalityUtils.cpp
rename : content/base/public/DirectionalityUtils.h => dom/base/DirectionalityUtils.h
rename : content/base/src/DocumentFragment.cpp => dom/base/DocumentFragment.cpp
rename : content/base/src/DocumentFragment.h => dom/base/DocumentFragment.h
rename : content/base/src/DocumentType.cpp => dom/base/DocumentType.cpp
rename : content/base/src/DocumentType.h => dom/base/DocumentType.h
rename : content/base/src/Element.cpp => dom/base/Element.cpp
rename : content/base/public/Element.h => dom/base/Element.h
rename : content/base/public/ElementInlines.h => dom/base/ElementInlines.h
rename : content/base/src/EventSource.cpp => dom/base/EventSource.cpp
rename : content/base/src/EventSource.h => dom/base/EventSource.h
rename : content/base/src/FeedWriterEnabled.h => dom/base/FeedWriterEnabled.h
rename : content/base/src/File.cpp => dom/base/File.cpp
rename : content/base/public/File.h => dom/base/File.h
rename : content/base/src/FileIOObject.cpp => dom/base/FileIOObject.cpp
rename : content/base/src/FileIOObject.h => dom/base/FileIOObject.h
rename : content/base/src/FragmentOrElement.cpp => dom/base/FragmentOrElement.cpp
rename : content/base/public/FragmentOrElement.h => dom/base/FragmentOrElement.h
rename : content/base/public/FromParser.h => dom/base/FromParser.h
rename : content/base/public/HTMLSplitOnSpacesTokenizer.h => dom/base/HTMLSplitOnSpacesTokenizer.h
rename : content/base/src/ImportManager.cpp => dom/base/ImportManager.cpp
rename : content/base/src/ImportManager.h => dom/base/ImportManager.h
rename : content/base/src/Link.cpp => dom/base/Link.cpp
rename : content/base/src/Link.h => dom/base/Link.h
rename : content/base/src/MultipartFileImpl.cpp => dom/base/MultipartFileImpl.cpp
rename : content/base/src/MultipartFileImpl.h => dom/base/MultipartFileImpl.h
rename : content/base/src/NodeIterator.cpp => dom/base/NodeIterator.cpp
rename : content/base/src/NodeIterator.h => dom/base/NodeIterator.h
rename : content/base/src/ResponsiveImageSelector.cpp => dom/base/ResponsiveImageSelector.cpp
rename : content/base/src/ResponsiveImageSelector.h => dom/base/ResponsiveImageSelector.h
rename : content/base/src/ShadowRoot.cpp => dom/base/ShadowRoot.cpp
rename : content/base/src/ShadowRoot.h => dom/base/ShadowRoot.h
rename : content/base/src/StyleSheetList.cpp => dom/base/StyleSheetList.cpp
rename : content/base/src/StyleSheetList.h => dom/base/StyleSheetList.h
rename : content/base/src/Text.cpp => dom/base/Text.cpp
rename : content/base/src/Text.h => dom/base/Text.h
rename : content/base/src/ThirdPartyUtil.cpp => dom/base/ThirdPartyUtil.cpp
rename : content/base/src/ThirdPartyUtil.h => dom/base/ThirdPartyUtil.h
rename : content/base/src/TreeWalker.cpp => dom/base/TreeWalker.cpp
rename : content/base/src/TreeWalker.h => dom/base/TreeWalker.h
rename : content/base/src/WebSocket.cpp => dom/base/WebSocket.cpp
rename : content/base/src/WebSocket.h => dom/base/WebSocket.h
rename : content/base/src/contentAreaDropListener.js => dom/base/contentAreaDropListener.js
rename : content/base/src/contentAreaDropListener.manifest => dom/base/contentAreaDropListener.manifest
rename : content/base/crashtests/1024428-1.html => dom/base/crashtests/1024428-1.html
rename : content/base/crashtests/1026714.html => dom/base/crashtests/1026714.html
rename : content/base/crashtests/1027461-1.html => dom/base/crashtests/1027461-1.html
rename : content/base/crashtests/1027461-inner.xul => dom/base/crashtests/1027461-inner.xul
rename : content/base/crashtests/116848-1.html => dom/base/crashtests/116848-1.html
rename : content/base/crashtests/149320-1.html => dom/base/crashtests/149320-1.html
rename : content/base/crashtests/205225-1.html => dom/base/crashtests/205225-1.html
rename : content/base/crashtests/231475-1.html => dom/base/crashtests/231475-1.html
rename : content/base/crashtests/293388-1.html => dom/base/crashtests/293388-1.html
rename : content/base/crashtests/308120-1.xul => dom/base/crashtests/308120-1.xul
rename : content/base/crashtests/324871-1.html => dom/base/crashtests/324871-1.html
rename : content/base/crashtests/325730-1.html => dom/base/crashtests/325730-1.html
rename : content/base/crashtests/326618-1.html => dom/base/crashtests/326618-1.html
rename : content/base/crashtests/326646-1.html => dom/base/crashtests/326646-1.html
rename : content/base/crashtests/326778-1.xul => dom/base/crashtests/326778-1.xul
rename : content/base/crashtests/326865-1.html => dom/base/crashtests/326865-1.html
rename : content/base/crashtests/327694.html => dom/base/crashtests/327694.html
rename : content/base/crashtests/330925-1.xhtml => dom/base/crashtests/330925-1.xhtml
rename : content/base/crashtests/336381-1.xhtml => dom/base/crashtests/336381-1.xhtml
rename : content/base/crashtests/336715-1.xhtml => dom/base/crashtests/336715-1.xhtml
rename : content/base/crashtests/338391-1.xhtml => dom/base/crashtests/338391-1.xhtml
rename : content/base/crashtests/340733-1.html => dom/base/crashtests/340733-1.html
rename : content/base/crashtests/343730-1.xhtml => dom/base/crashtests/343730-1.xhtml
rename : content/base/crashtests/343850-1.xhtml => dom/base/crashtests/343850-1.xhtml
rename : content/base/crashtests/343889-1.html => dom/base/crashtests/343889-1.html
rename : content/base/crashtests/344434-1.xhtml => dom/base/crashtests/344434-1.xhtml
rename : content/base/crashtests/344882-1.html => dom/base/crashtests/344882-1.html
rename : content/base/crashtests/345837-1.xhtml => dom/base/crashtests/345837-1.xhtml
rename : content/base/crashtests/348049-1.xhtml => dom/base/crashtests/348049-1.xhtml
rename : content/base/crashtests/349355-1.html => dom/base/crashtests/349355-1.html
rename : content/base/crashtests/354645-1.xul => dom/base/crashtests/354645-1.xul
rename : content/base/crashtests/360599-1.html => dom/base/crashtests/360599-1.html
rename : content/base/crashtests/366200-1.xhtml => dom/base/crashtests/366200-1.xhtml
rename : content/base/crashtests/371466-1.xhtml => dom/base/crashtests/371466-1.xhtml
rename : content/base/crashtests/377360-1.xhtml => dom/base/crashtests/377360-1.xhtml
rename : content/base/crashtests/377960-1.html => dom/base/crashtests/377960-1.html
rename : content/base/crashtests/377960-2.html => dom/base/crashtests/377960-2.html
rename : content/base/crashtests/384663-1-inner.xul => dom/base/crashtests/384663-1-inner.xul
rename : content/base/crashtests/384663-1.html => dom/base/crashtests/384663-1.html
rename : content/base/crashtests/386000-1.html => dom/base/crashtests/386000-1.html
rename : content/base/crashtests/386794-1.html => dom/base/crashtests/386794-1.html
rename : content/base/crashtests/387460-1-inner.xhtml => dom/base/crashtests/387460-1-inner.xhtml
rename : content/base/crashtests/387460-1.html => dom/base/crashtests/387460-1.html
rename : content/base/crashtests/395469-1.xhtml => dom/base/crashtests/395469-1.xhtml
rename : content/base/crashtests/395469-2.xhtml => dom/base/crashtests/395469-2.xhtml
rename : content/base/crashtests/398088-1.xul => dom/base/crashtests/398088-1.xul
rename : content/base/crashtests/399712-1.html => dom/base/crashtests/399712-1.html
rename : content/base/crashtests/400763-1.html => dom/base/crashtests/400763-1.html
rename : content/base/crashtests/401993-1.html => dom/base/crashtests/401993-1.html
rename : content/base/crashtests/401993-1.xml => dom/base/crashtests/401993-1.xml
rename : content/base/crashtests/407818.html => dom/base/crashtests/407818.html
rename : content/base/crashtests/410860-1.xml => dom/base/crashtests/410860-1.xml
rename : content/base/crashtests/411882-1.xhtml => dom/base/crashtests/411882-1.xhtml
rename : content/base/crashtests/416734-1.html => dom/base/crashtests/416734-1.html
rename : content/base/crashtests/418928-1.html => dom/base/crashtests/418928-1.html
rename : content/base/crashtests/420620-1.html => dom/base/crashtests/420620-1.html
rename : content/base/crashtests/424276-1.html => dom/base/crashtests/424276-1.html
rename : content/base/crashtests/426987-1.html => dom/base/crashtests/426987-1.html
rename : content/base/crashtests/43040-1.html => dom/base/crashtests/43040-1.html
rename : content/base/crashtests/443538-1.svg => dom/base/crashtests/443538-1.svg
rename : content/base/crashtests/448615-1.html => dom/base/crashtests/448615-1.html
rename : content/base/crashtests/450383-1.html => dom/base/crashtests/450383-1.html
rename : content/base/crashtests/450385-1.html => dom/base/crashtests/450385-1.html
rename : content/base/crashtests/458637-1-inner.xhtml => dom/base/crashtests/458637-1-inner.xhtml
rename : content/base/crashtests/458637-1.html => dom/base/crashtests/458637-1.html
rename : content/base/crashtests/467392.html => dom/base/crashtests/467392.html
rename : content/base/crashtests/472593-1.html => dom/base/crashtests/472593-1.html
rename : content/base/crashtests/474041-1.svg => dom/base/crashtests/474041-1.svg
rename : content/base/crashtests/483818-1.html => dom/base/crashtests/483818-1.html
rename : content/base/crashtests/490760-1.xhtml => dom/base/crashtests/490760-1.xhtml
rename : content/base/crashtests/493281-1.html => dom/base/crashtests/493281-1.html
rename : content/base/crashtests/493281-2.html => dom/base/crashtests/493281-2.html
rename : content/base/crashtests/494810-1.html => dom/base/crashtests/494810-1.html
rename : content/base/crashtests/509536-1.html => dom/base/crashtests/509536-1.html
rename : content/base/crashtests/522516-1.html => dom/base/crashtests/522516-1.html
rename : content/base/crashtests/529670.html => dom/base/crashtests/529670.html
rename : content/base/crashtests/535926-1.html => dom/base/crashtests/535926-1.html
rename : content/base/crashtests/543645.html => dom/base/crashtests/543645.html
rename : content/base/crashtests/551631-1.html => dom/base/crashtests/551631-1.html
rename : content/base/crashtests/552651.html => dom/base/crashtests/552651.html
rename : content/base/crashtests/552651.xml => dom/base/crashtests/552651.xml
rename : content/base/crashtests/554230-1.xhtml => dom/base/crashtests/554230-1.xhtml
rename : content/base/crashtests/558973.html => dom/base/crashtests/558973.html
rename : content/base/crashtests/561981-1-iframe.xhtml => dom/base/crashtests/561981-1-iframe.xhtml
rename : content/base/crashtests/561981-1.html => dom/base/crashtests/561981-1.html
rename : content/base/crashtests/561981-2-iframe.xhtml => dom/base/crashtests/561981-2-iframe.xhtml
rename : content/base/crashtests/561981-2.html => dom/base/crashtests/561981-2.html
rename : content/base/crashtests/564079-1.html => dom/base/crashtests/564079-1.html
rename : content/base/crashtests/564114.html => dom/base/crashtests/564114.html
rename : content/base/crashtests/565125-1.html => dom/base/crashtests/565125-1.html
rename : content/base/crashtests/575462.svg => dom/base/crashtests/575462.svg
rename : content/base/crashtests/582601.html => dom/base/crashtests/582601.html
rename : content/base/crashtests/590395-1.html => dom/base/crashtests/590395-1.html
rename : content/base/crashtests/593302-1.html => dom/base/crashtests/593302-1.html
rename : content/base/crashtests/593302-2.html => dom/base/crashtests/593302-2.html
rename : content/base/crashtests/595606-1.html => dom/base/crashtests/595606-1.html
rename : content/base/crashtests/595606-2.html => dom/base/crashtests/595606-2.html
rename : content/base/crashtests/604262-1.html => dom/base/crashtests/604262-1.html
rename : content/base/crashtests/605672-1.svg => dom/base/crashtests/605672-1.svg
rename : content/base/crashtests/606729-1.html => dom/base/crashtests/606729-1.html
rename : content/base/crashtests/610571-1.html => dom/base/crashtests/610571-1.html
rename : content/base/crashtests/628599-1.html => dom/base/crashtests/628599-1.html
rename : content/base/crashtests/637214-1.svg => dom/base/crashtests/637214-1.svg
rename : content/base/crashtests/637214-2.svg => dom/base/crashtests/637214-2.svg
rename : content/base/crashtests/642022-1.html => dom/base/crashtests/642022-1.html
rename : content/base/crashtests/646184.html => dom/base/crashtests/646184.html
rename : content/base/crashtests/658845-1.svg => dom/base/crashtests/658845-1.svg
rename : content/base/crashtests/667336-1.html => dom/base/crashtests/667336-1.html
rename : content/base/crashtests/679459.html => dom/base/crashtests/679459.html
rename : content/base/crashtests/679689-1.html => dom/base/crashtests/679689-1.html
rename : content/base/crashtests/682463.html => dom/base/crashtests/682463.html
rename : content/base/crashtests/693212.xhtml => dom/base/crashtests/693212.xhtml
rename : content/base/crashtests/698974-1.html => dom/base/crashtests/698974-1.html
rename : content/base/crashtests/700090-1.html => dom/base/crashtests/700090-1.html
rename : content/base/crashtests/700090-2.html => dom/base/crashtests/700090-2.html
rename : content/base/crashtests/700512-worker.js => dom/base/crashtests/700512-worker.js
rename : content/base/crashtests/700512.html => dom/base/crashtests/700512.html
rename : content/base/crashtests/709384.html => dom/base/crashtests/709384.html
rename : content/base/crashtests/709954.html => dom/base/crashtests/709954.html
rename : content/base/crashtests/713417-2.html => dom/base/crashtests/713417-2.html
rename : content/base/crashtests/713417.html => dom/base/crashtests/713417.html
rename : content/base/crashtests/715056.html => dom/base/crashtests/715056.html
rename : content/base/crashtests/741163-1.html => dom/base/crashtests/741163-1.html
rename : content/base/crashtests/752226-1.html => dom/base/crashtests/752226-1.html
rename : content/base/crashtests/752226-2.html => dom/base/crashtests/752226-2.html
rename : content/base/crashtests/766426.html => dom/base/crashtests/766426.html
rename : content/base/crashtests/771639.html => dom/base/crashtests/771639.html
rename : content/base/crashtests/786854.html => dom/base/crashtests/786854.html
rename : content/base/crashtests/815043.html => dom/base/crashtests/815043.html
rename : content/base/crashtests/815276.html => dom/base/crashtests/815276.html
rename : content/base/crashtests/815477.html => dom/base/crashtests/815477.html
rename : content/base/crashtests/815500.html => dom/base/crashtests/815500.html
rename : content/base/crashtests/816253.html => dom/base/crashtests/816253.html
rename : content/base/crashtests/819014.html => dom/base/crashtests/819014.html
rename : content/base/crashtests/822691.html => dom/base/crashtests/822691.html
rename : content/base/crashtests/822723.html => dom/base/crashtests/822723.html
rename : content/base/crashtests/824719.html => dom/base/crashtests/824719.html
rename : content/base/crashtests/827190.html => dom/base/crashtests/827190.html
rename : content/base/crashtests/828054.html => dom/base/crashtests/828054.html
rename : content/base/crashtests/828903-iframe.html => dom/base/crashtests/828903-iframe.html
rename : content/base/crashtests/828903.html => dom/base/crashtests/828903.html
rename : content/base/crashtests/829428.html => dom/base/crashtests/829428.html
rename : content/base/crashtests/830098.html => dom/base/crashtests/830098.html
rename : content/base/crashtests/831287.html => dom/base/crashtests/831287.html
rename : content/base/crashtests/832644.html => dom/base/crashtests/832644.html
rename : content/base/crashtests/836890.html => dom/base/crashtests/836890.html
rename : content/base/crashtests/838489-1.html => dom/base/crashtests/838489-1.html
rename : content/base/crashtests/838489-2.html => dom/base/crashtests/838489-2.html
rename : content/base/crashtests/841205.html => dom/base/crashtests/841205.html
rename : content/base/crashtests/844404.html => dom/base/crashtests/844404.html
rename : content/base/crashtests/845093-1.html => dom/base/crashtests/845093-1.html
rename : content/base/crashtests/845093-2.html => dom/base/crashtests/845093-2.html
rename : content/base/crashtests/847127.html => dom/base/crashtests/847127.html
rename : content/base/crashtests/849601.html => dom/base/crashtests/849601.html
rename : content/base/crashtests/849727.html => dom/base/crashtests/849727.html
rename : content/base/crashtests/849732.html => dom/base/crashtests/849732.html
rename : content/base/crashtests/851353-1.html => dom/base/crashtests/851353-1.html
rename : content/base/crashtests/863950.html => dom/base/crashtests/863950.html
rename : content/base/crashtests/864448.html => dom/base/crashtests/864448.html
rename : content/base/crashtests/930250.html => dom/base/crashtests/930250.html
rename : content/base/crashtests/942979.html => dom/base/crashtests/942979.html
rename : content/base/crashtests/978646.html => dom/base/crashtests/978646.html
rename : content/base/crashtests/xhr_abortinprogress.html => dom/base/crashtests/xhr_abortinprogress.html
rename : content/base/crashtests/xhr_empty_datauri.html => dom/base/crashtests/xhr_empty_datauri.html
rename : content/base/crashtests/xhr_html_nullresponse.html => dom/base/crashtests/xhr_html_nullresponse.html
rename : content/base/src/messageWakeupService.js => dom/base/messageWakeupService.js
rename : content/base/src/messageWakeupService.manifest => dom/base/messageWakeupService.manifest
rename : content/base/src/mozAutoDocUpdate.h => dom/base/mozAutoDocUpdate.h
rename : content/base/public/mozFlushType.h => dom/base/mozFlushType.h
rename : content/base/src/nsAtomListUtils.cpp => dom/base/nsAtomListUtils.cpp
rename : content/base/src/nsAtomListUtils.h => dom/base/nsAtomListUtils.h
rename : content/base/src/nsAttrAndChildArray.cpp => dom/base/nsAttrAndChildArray.cpp
rename : content/base/src/nsAttrAndChildArray.h => dom/base/nsAttrAndChildArray.h
rename : content/base/src/nsAttrName.h => dom/base/nsAttrName.h
rename : content/base/src/nsAttrValue.cpp => dom/base/nsAttrValue.cpp
rename : content/base/src/nsAttrValue.h => dom/base/nsAttrValue.h
rename : content/base/src/nsAttrValueInlines.h => dom/base/nsAttrValueInlines.h
rename : content/base/src/nsAttrValueOrString.cpp => dom/base/nsAttrValueOrString.cpp
rename : content/base/src/nsAttrValueOrString.h => dom/base/nsAttrValueOrString.h
rename : content/base/src/nsCCUncollectableMarker.cpp => dom/base/nsCCUncollectableMarker.cpp
rename : content/base/src/nsCCUncollectableMarker.h => dom/base/nsCCUncollectableMarker.h
rename : content/base/src/nsCSPContext.cpp => dom/base/nsCSPContext.cpp
rename : content/base/src/nsCSPContext.h => dom/base/nsCSPContext.h
rename : content/base/src/nsCSPParser.cpp => dom/base/nsCSPParser.cpp
rename : content/base/src/nsCSPParser.h => dom/base/nsCSPParser.h
rename : content/base/src/nsCSPService.cpp => dom/base/nsCSPService.cpp
rename : content/base/src/nsCSPService.h => dom/base/nsCSPService.h
rename : content/base/src/nsCSPUtils.cpp => dom/base/nsCSPUtils.cpp
rename : content/base/src/nsCSPUtils.h => dom/base/nsCSPUtils.h
rename : content/base/public/nsCaseTreatment.h => dom/base/nsCaseTreatment.h
rename : content/base/src/nsContentAreaDragDrop.cpp => dom/base/nsContentAreaDragDrop.cpp
rename : content/base/src/nsContentAreaDragDrop.h => dom/base/nsContentAreaDragDrop.h
rename : content/base/public/nsContentCID.h => dom/base/nsContentCID.h
rename : content/base/public/nsContentCreatorFunctions.h => dom/base/nsContentCreatorFunctions.h
rename : content/base/src/nsContentIterator.cpp => dom/base/nsContentIterator.cpp
rename : content/base/src/nsContentList.cpp => dom/base/nsContentList.cpp
rename : content/base/src/nsContentList.h => dom/base/nsContentList.h
rename : content/base/src/nsContentListDeclarations.h => dom/base/nsContentListDeclarations.h
rename : content/base/src/nsContentPolicy.cpp => dom/base/nsContentPolicy.cpp
rename : content/base/src/nsContentPolicy.h => dom/base/nsContentPolicy.h
rename : content/base/public/nsContentPolicyUtils.h => dom/base/nsContentPolicyUtils.h
rename : content/base/src/nsContentSink.cpp => dom/base/nsContentSink.cpp
rename : content/base/src/nsContentSink.h => dom/base/nsContentSink.h
rename : content/base/public/nsContentTypeParser.h => dom/base/nsContentTypeParser.h
rename : content/base/src/nsContentUtils.cpp => dom/base/nsContentUtils.cpp
rename : content/base/public/nsContentUtils.h => dom/base/nsContentUtils.h
rename : content/base/src/nsCopySupport.cpp => dom/base/nsCopySupport.cpp
rename : content/base/public/nsCopySupport.h => dom/base/nsCopySupport.h
rename : content/base/src/nsCrossSiteListenerProxy.cpp => dom/base/nsCrossSiteListenerProxy.cpp
rename : content/base/src/nsCrossSiteListenerProxy.h => dom/base/nsCrossSiteListenerProxy.h
rename : content/base/src/nsDOMAttributeMap.cpp => dom/base/nsDOMAttributeMap.cpp
rename : content/base/src/nsDOMAttributeMap.h => dom/base/nsDOMAttributeMap.h
rename : content/base/src/nsDOMCaretPosition.cpp => dom/base/nsDOMCaretPosition.cpp
rename : content/base/src/nsDOMCaretPosition.h => dom/base/nsDOMCaretPosition.h
rename : content/base/src/nsDOMDataChannel.cpp => dom/base/nsDOMDataChannel.cpp
rename : content/base/src/nsDOMDataChannel.h => dom/base/nsDOMDataChannel.h
rename : content/base/src/nsDOMDataChannelDeclarations.h => dom/base/nsDOMDataChannelDeclarations.h
rename : content/base/src/nsDOMFileReader.cpp => dom/base/nsDOMFileReader.cpp
rename : content/base/src/nsDOMFileReader.h => dom/base/nsDOMFileReader.h
rename : content/base/src/nsDOMMutationObserver.cpp => dom/base/nsDOMMutationObserver.cpp
rename : content/base/src/nsDOMMutationObserver.h => dom/base/nsDOMMutationObserver.h
rename : content/base/src/nsDOMSerializer.cpp => dom/base/nsDOMSerializer.cpp
rename : content/base/src/nsDOMSerializer.h => dom/base/nsDOMSerializer.h
rename : content/base/src/nsDOMSettableTokenList.cpp => dom/base/nsDOMSettableTokenList.cpp
rename : content/base/src/nsDOMSettableTokenList.h => dom/base/nsDOMSettableTokenList.h
rename : content/base/src/nsDOMTokenList.cpp => dom/base/nsDOMTokenList.cpp
rename : content/base/src/nsDOMTokenList.h => dom/base/nsDOMTokenList.h
rename : content/base/src/nsDataDocumentContentPolicy.cpp => dom/base/nsDataDocumentContentPolicy.cpp
rename : content/base/src/nsDataDocumentContentPolicy.h => dom/base/nsDataDocumentContentPolicy.h
rename : content/base/public/nsDeprecatedOperationList.h => dom/base/nsDeprecatedOperationList.h
rename : content/base/public/nsDocElementCreatedNotificationRunner.h => dom/base/nsDocElementCreatedNotificationRunner.h
rename : content/base/src/nsDocument.cpp => dom/base/nsDocument.cpp
rename : content/base/src/nsDocument.h => dom/base/nsDocument.h
rename : content/base/src/nsDocumentEncoder.cpp => dom/base/nsDocumentEncoder.cpp
rename : content/base/src/nsElementFrameLoaderOwner.cpp => dom/base/nsElementFrameLoaderOwner.cpp
rename : content/base/src/nsElementFrameLoaderOwner.h => dom/base/nsElementFrameLoaderOwner.h
rename : content/base/src/nsFormData.cpp => dom/base/nsFormData.cpp
rename : content/base/src/nsFormData.h => dom/base/nsFormData.h
rename : content/base/src/nsFrameLoader.cpp => dom/base/nsFrameLoader.cpp
rename : content/base/src/nsFrameLoader.h => dom/base/nsFrameLoader.h
rename : content/base/src/nsFrameMessageManager.cpp => dom/base/nsFrameMessageManager.cpp
rename : content/base/src/nsFrameMessageManager.h => dom/base/nsFrameMessageManager.h
rename : content/base/src/nsGenConImageContent.cpp => dom/base/nsGenConImageContent.cpp
rename : content/base/src/nsGenericDOMDataNode.cpp => dom/base/nsGenericDOMDataNode.cpp
rename : content/base/src/nsGenericDOMDataNode.h => dom/base/nsGenericDOMDataNode.h
rename : content/base/src/nsGkAtomList.h => dom/base/nsGkAtomList.h
rename : content/base/src/nsGkAtoms.cpp => dom/base/nsGkAtoms.cpp
rename : content/base/src/nsGkAtoms.h => dom/base/nsGkAtoms.h
rename : content/base/src/nsHTMLContentSerializer.cpp => dom/base/nsHTMLContentSerializer.cpp
rename : content/base/src/nsHTMLContentSerializer.h => dom/base/nsHTMLContentSerializer.h
rename : content/base/src/nsHostObjectProtocolHandler.cpp => dom/base/nsHostObjectProtocolHandler.cpp
rename : content/base/public/nsHostObjectProtocolHandler.h => dom/base/nsHostObjectProtocolHandler.h
rename : content/base/src/nsHostObjectURI.cpp => dom/base/nsHostObjectURI.cpp
rename : content/base/src/nsHostObjectURI.h => dom/base/nsHostObjectURI.h
rename : content/base/public/nsIAttribute.h => dom/base/nsIAttribute.h
rename : content/base/public/nsIContent.h => dom/base/nsIContent.h
rename : content/base/public/nsIContentInlines.h => dom/base/nsIContentInlines.h
rename : content/base/public/nsIContentIterator.h => dom/base/nsIContentIterator.h
rename : content/base/public/nsIContentPolicy.idl => dom/base/nsIContentPolicy.idl
rename : content/base/public/nsIContentSecurityPolicy.idl => dom/base/nsIContentSecurityPolicy.idl
rename : content/base/public/nsIContentSerializer.h => dom/base/nsIContentSerializer.h
rename : content/base/public/nsIDOMDataChannel.idl => dom/base/nsIDOMDataChannel.idl
rename : content/base/public/nsIDOMFile.idl => dom/base/nsIDOMFile.idl
rename : content/base/public/nsIDOMFileList.idl => dom/base/nsIDOMFileList.idl
rename : content/base/public/nsIDOMFileReader.idl => dom/base/nsIDOMFileReader.idl
rename : content/base/public/nsIDOMFormData.idl => dom/base/nsIDOMFormData.idl
rename : content/base/public/nsIDOMParser.idl => dom/base/nsIDOMParser.idl
rename : content/base/public/nsIDOMSerializer.idl => dom/base/nsIDOMSerializer.idl
rename : content/base/public/nsIDocument.h => dom/base/nsIDocument.h
rename : content/base/public/nsIDocumentEncoder.idl => dom/base/nsIDocumentEncoder.idl
rename : content/base/public/nsIDocumentInlines.h => dom/base/nsIDocumentInlines.h
rename : content/base/public/nsIDocumentObserver.h => dom/base/nsIDocumentObserver.h
rename : content/base/public/nsIDroppedLinkHandler.idl => dom/base/nsIDroppedLinkHandler.idl
rename : content/base/public/nsIFrameLoader.idl => dom/base/nsIFrameLoader.idl
rename : content/base/public/nsIImageLoadingContent.idl => dom/base/nsIImageLoadingContent.idl
rename : content/base/public/nsIMessageManager.idl => dom/base/nsIMessageManager.idl
rename : content/base/public/nsIMutationObserver.h => dom/base/nsIMutationObserver.h
rename : content/base/src/nsINode.cpp => dom/base/nsINode.cpp
rename : content/base/public/nsINode.h => dom/base/nsINode.h
rename : content/base/public/nsINodeList.h => dom/base/nsINodeList.h
rename : content/base/public/nsIObjectLoadingContent.idl => dom/base/nsIObjectLoadingContent.idl
rename : content/base/public/nsIScriptElement.h => dom/base/nsIScriptElement.h
rename : content/base/public/nsIScriptLoaderObserver.idl => dom/base/nsIScriptLoaderObserver.idl
rename : content/base/public/nsISelection.idl => dom/base/nsISelection.idl
rename : content/base/public/nsISelectionController.idl => dom/base/nsISelectionController.idl
rename : content/base/public/nsISelectionDisplay.idl => dom/base/nsISelectionDisplay.idl
rename : content/base/public/nsISelectionListener.idl => dom/base/nsISelectionListener.idl
rename : content/base/public/nsISelectionPrivate.idl => dom/base/nsISelectionPrivate.idl
rename : content/base/public/nsIStyleSheetLinkingElement.h => dom/base/nsIStyleSheetLinkingElement.h
rename : content/base/public/nsIXMLHttpRequest.idl => dom/base/nsIXMLHttpRequest.idl
rename : content/base/src/nsImageLoadingContent.cpp => dom/base/nsImageLoadingContent.cpp
rename : content/base/src/nsImageLoadingContent.h => dom/base/nsImageLoadingContent.h
rename : content/base/src/nsInProcessTabChildGlobal.cpp => dom/base/nsInProcessTabChildGlobal.cpp
rename : content/base/src/nsInProcessTabChildGlobal.h => dom/base/nsInProcessTabChildGlobal.h
rename : content/base/src/nsLineBreaker.cpp => dom/base/nsLineBreaker.cpp
rename : content/base/public/nsLineBreaker.h => dom/base/nsLineBreaker.h
rename : content/base/src/nsMappedAttributeElement.cpp => dom/base/nsMappedAttributeElement.cpp
rename : content/base/src/nsMappedAttributeElement.h => dom/base/nsMappedAttributeElement.h
rename : content/base/src/nsMappedAttributes.cpp => dom/base/nsMappedAttributes.cpp
rename : content/base/src/nsMappedAttributes.h => dom/base/nsMappedAttributes.h
rename : content/base/src/nsMixedContentBlocker.cpp => dom/base/nsMixedContentBlocker.cpp
rename : content/base/src/nsMixedContentBlocker.h => dom/base/nsMixedContentBlocker.h
rename : content/base/src/nsNameSpaceManager.cpp => dom/base/nsNameSpaceManager.cpp
rename : content/base/public/nsNameSpaceManager.h => dom/base/nsNameSpaceManager.h
rename : content/base/src/nsNoDataProtocolContentPolicy.cpp => dom/base/nsNoDataProtocolContentPolicy.cpp
rename : content/base/src/nsNoDataProtocolContentPolicy.h => dom/base/nsNoDataProtocolContentPolicy.h
rename : content/base/src/nsNodeInfoManager.cpp => dom/base/nsNodeInfoManager.cpp
rename : content/base/src/nsNodeInfoManager.h => dom/base/nsNodeInfoManager.h
rename : content/base/src/nsNodeUtils.cpp => dom/base/nsNodeUtils.cpp
rename : content/base/src/nsNodeUtils.h => dom/base/nsNodeUtils.h
rename : content/base/src/nsObjectLoadingContent.cpp => dom/base/nsObjectLoadingContent.cpp
rename : content/base/src/nsObjectLoadingContent.h => dom/base/nsObjectLoadingContent.h
rename : content/base/src/nsPlainTextSerializer.cpp => dom/base/nsPlainTextSerializer.cpp
rename : content/base/src/nsPlainTextSerializer.h => dom/base/nsPlainTextSerializer.h
rename : content/base/src/nsPropertyTable.cpp => dom/base/nsPropertyTable.cpp
rename : content/base/src/nsPropertyTable.h => dom/base/nsPropertyTable.h
rename : content/base/src/nsRange.cpp => dom/base/nsRange.cpp
rename : content/base/src/nsRange.h => dom/base/nsRange.h
rename : content/base/src/nsReferencedElement.cpp => dom/base/nsReferencedElement.cpp
rename : content/base/public/nsReferencedElement.h => dom/base/nsReferencedElement.h
rename : content/base/src/nsSandboxFlags.h => dom/base/nsSandboxFlags.h
rename : content/base/src/nsScriptElement.cpp => dom/base/nsScriptElement.cpp
rename : content/base/src/nsScriptElement.h => dom/base/nsScriptElement.h
rename : content/base/src/nsScriptLoader.cpp => dom/base/nsScriptLoader.cpp
rename : content/base/src/nsScriptLoader.h => dom/base/nsScriptLoader.h
rename : content/base/src/nsStubDocumentObserver.cpp => dom/base/nsStubDocumentObserver.cpp
rename : content/base/src/nsStubDocumentObserver.h => dom/base/nsStubDocumentObserver.h
rename : content/base/src/nsStubMutationObserver.cpp => dom/base/nsStubMutationObserver.cpp
rename : content/base/src/nsStubMutationObserver.h => dom/base/nsStubMutationObserver.h
rename : content/base/src/nsStyleLinkElement.cpp => dom/base/nsStyleLinkElement.cpp
rename : content/base/src/nsStyleLinkElement.h => dom/base/nsStyleLinkElement.h
rename : content/base/src/nsStyledElement.cpp => dom/base/nsStyledElement.cpp
rename : content/base/src/nsStyledElement.h => dom/base/nsStyledElement.h
rename : content/base/src/nsSyncLoadService.cpp => dom/base/nsSyncLoadService.cpp
rename : content/base/src/nsSyncLoadService.h => dom/base/nsSyncLoadService.h
rename : content/base/src/nsTextFragment.cpp => dom/base/nsTextFragment.cpp
rename : content/base/src/nsTextFragment.h => dom/base/nsTextFragment.h
rename : content/base/src/nsTextFragmentImpl.h => dom/base/nsTextFragmentImpl.h
rename : content/base/src/nsTextFragmentSSE2.cpp => dom/base/nsTextFragmentSSE2.cpp
rename : content/base/src/nsTextNode.cpp => dom/base/nsTextNode.cpp
rename : content/base/src/nsTextNode.h => dom/base/nsTextNode.h
rename : content/base/src/nsTraversal.cpp => dom/base/nsTraversal.cpp
rename : content/base/src/nsTraversal.h => dom/base/nsTraversal.h
rename : content/base/src/nsTreeSanitizer.cpp => dom/base/nsTreeSanitizer.cpp
rename : content/base/public/nsTreeSanitizer.h => dom/base/nsTreeSanitizer.h
rename : content/base/src/nsViewportInfo.cpp => dom/base/nsViewportInfo.cpp
rename : content/base/public/nsViewportInfo.h => dom/base/nsViewportInfo.h
rename : content/base/src/nsXHTMLContentSerializer.cpp => dom/base/nsXHTMLContentSerializer.cpp
rename : content/base/src/nsXHTMLContentSerializer.h => dom/base/nsXHTMLContentSerializer.h
rename : content/base/src/nsXMLContentSerializer.cpp => dom/base/nsXMLContentSerializer.cpp
rename : content/base/src/nsXMLContentSerializer.h => dom/base/nsXMLContentSerializer.h
rename : content/base/src/nsXMLHttpRequest.cpp => dom/base/nsXMLHttpRequest.cpp
rename : content/base/src/nsXMLHttpRequest.h => dom/base/nsXMLHttpRequest.h
rename : content/base/src/nsXMLNameSpaceMap.cpp => dom/base/nsXMLNameSpaceMap.cpp
rename : content/base/public/nsXMLNameSpaceMap.h => dom/base/nsXMLNameSpaceMap.h
rename : content/base/test/345339_iframe.html => dom/base/test/345339_iframe.html
rename : content/base/test/Ahem.ttf => dom/base/test/Ahem.ttf
rename : content/base/test/TestCSPParser.cpp => dom/base/test/TestCSPParser.cpp
rename : content/base/test/TestGetURL.cpp => dom/base/test/TestGetURL.cpp
rename : content/base/test/TestNativeXMLHttpRequest.cpp => dom/base/test/TestNativeXMLHttpRequest.cpp
rename : content/base/test/TestPlainTextSerializer.cpp => dom/base/test/TestPlainTextSerializer.cpp
rename : content/base/test/accesscontrol.resource => dom/base/test/accesscontrol.resource
rename : content/base/test/accesscontrol.resource^headers^ => dom/base/test/accesscontrol.resource^headers^
rename : content/base/test/badContentType.eventsource => dom/base/test/badContentType.eventsource
rename : content/base/test/badContentType.eventsource^headers^ => dom/base/test/badContentType.eventsource^headers^
rename : content/base/test/badHTTPResponseCode.eventsource => dom/base/test/badHTTPResponseCode.eventsource
rename : content/base/test/badHTTPResponseCode.eventsource^headers^ => dom/base/test/badHTTPResponseCode.eventsource^headers^
rename : content/base/test/badMessageEvent.eventsource => dom/base/test/badMessageEvent.eventsource
rename : content/base/test/badMessageEvent.eventsource^headers^ => dom/base/test/badMessageEvent.eventsource^headers^
rename : content/base/test/badMessageEvent2.eventsource => dom/base/test/badMessageEvent2.eventsource
rename : content/base/test/badMessageEvent2.eventsource^headers^ => dom/base/test/badMessageEvent2.eventsource^headers^
rename : content/base/test/browser.ini => dom/base/test/browser.ini
rename : content/base/test/browser_bug1058164.js => dom/base/test/browser_bug1058164.js
rename : content/base/test/browser_bug593387.js => dom/base/test/browser_bug593387.js
rename : content/base/test/browser_bug902350.js => dom/base/test/browser_bug902350.js
rename : content/base/test/browser_state_notifications.js => dom/base/test/browser_state_notifications.js
rename : content/base/test/bug282547.sjs => dom/base/test/bug282547.sjs
rename : content/base/test/bug298064-subframe.html => dom/base/test/bug298064-subframe.html
rename : content/base/test/bug313646.txt => dom/base/test/bug313646.txt
rename : content/base/test/bug382113_object.html => dom/base/test/bug382113_object.html
rename : content/base/test/bug419132.html => dom/base/test/bug419132.html
rename : content/base/test/bug426308-redirect.sjs => dom/base/test/bug426308-redirect.sjs
rename : content/base/test/bug435425.sjs => dom/base/test/bug435425.sjs
rename : content/base/test/bug435425_redirect.sjs => dom/base/test/bug435425_redirect.sjs
rename : content/base/test/bug444322.js => dom/base/test/bug444322.js
rename : content/base/test/bug444322.txt => dom/base/test/bug444322.txt
rename : content/base/test/bug444546.sjs => dom/base/test/bug444546.sjs
rename : content/base/test/bug455629-helper.svg => dom/base/test/bug455629-helper.svg
rename : content/base/test/bug457746.sjs => dom/base/test/bug457746.sjs
rename : content/base/test/bug461735-post-redirect.js => dom/base/test/bug461735-post-redirect.js
rename : content/base/test/bug461735-redirect1.sjs => dom/base/test/bug461735-redirect1.sjs
rename : content/base/test/bug461735-redirect2.sjs => dom/base/test/bug461735-redirect2.sjs
rename : content/base/test/bug466080.sjs => dom/base/test/bug466080.sjs
rename : content/base/test/bug466409-empty.css => dom/base/test/bug466409-empty.css
rename : content/base/test/bug466409-page.html => dom/base/test/bug466409-page.html
rename : content/base/test/bug475156.sjs => dom/base/test/bug475156.sjs
rename : content/base/test/bug482935.sjs => dom/base/test/bug482935.sjs
rename : content/base/test/bug540854.sjs => dom/base/test/bug540854.sjs
rename : content/base/test/bug578096LoadChromeScript.js => dom/base/test/bug578096LoadChromeScript.js
rename : content/base/test/bug638112-response.txt => dom/base/test/bug638112-response.txt
rename : content/base/test/bug638112.sjs => dom/base/test/bug638112.sjs
rename : content/base/test/bug682592-subframe-ref.html => dom/base/test/bug682592-subframe-ref.html
rename : content/base/test/bug682592-subframe.html => dom/base/test/bug682592-subframe.html
rename : content/base/test/bug696301-script-1.js => dom/base/test/bug696301-script-1.js
rename : content/base/test/bug696301-script-1.js^headers^ => dom/base/test/bug696301-script-1.js^headers^
rename : content/base/test/bug696301-script-2.js => dom/base/test/bug696301-script-2.js
rename : content/base/test/bug803225_test_mailto.html => dom/base/test/bug803225_test_mailto.html
rename : content/base/test/bug819051.sjs => dom/base/test/bug819051.sjs
rename : content/base/test/chrome/blockNoPlugins.xml => dom/base/test/chrome/blockNoPlugins.xml
rename : content/base/test/chrome/blockPluginHard.xml => dom/base/test/chrome/blockPluginHard.xml
rename : content/base/test/chrome/bug421622-referer.sjs => dom/base/test/chrome/bug421622-referer.sjs
rename : content/base/test/chrome/chrome.ini => dom/base/test/chrome/chrome.ini
rename : content/base/test/chrome/cpows_child.js => dom/base/test/chrome/cpows_child.js
rename : content/base/test/chrome/cpows_parent.xul => dom/base/test/chrome/cpows_parent.xul
rename : content/base/test/chrome/file_bug391728.html => dom/base/test/chrome/file_bug391728.html
rename : content/base/test/chrome/file_bug391728_2.html => dom/base/test/chrome/file_bug391728_2.html
rename : content/base/test/chrome/file_bug549682.xul => dom/base/test/chrome/file_bug549682.xul
rename : content/base/test/chrome/file_bug616841.xul => dom/base/test/chrome/file_bug616841.xul
rename : content/base/test/chrome/file_bug816340.xul => dom/base/test/chrome/file_bug816340.xul
rename : content/base/test/chrome/file_bug990812-1.xul => dom/base/test/chrome/file_bug990812-1.xul
rename : content/base/test/chrome/file_bug990812-2.xul => dom/base/test/chrome/file_bug990812-2.xul
rename : content/base/test/chrome/file_bug990812-3.xul => dom/base/test/chrome/file_bug990812-3.xul
rename : content/base/test/chrome/file_bug990812-4.xul => dom/base/test/chrome/file_bug990812-4.xul
rename : content/base/test/chrome/file_bug990812-5.xul => dom/base/test/chrome/file_bug990812-5.xul
rename : content/base/test/chrome/file_bug990812.xul => dom/base/test/chrome/file_bug990812.xul
rename : content/base/test/chrome/fileconstructor_file.png => dom/base/test/chrome/fileconstructor_file.png
rename : content/base/test/chrome/frame_bug814638.xul => dom/base/test/chrome/frame_bug814638.xul
rename : content/base/test/chrome/host_bug814638.xul => dom/base/test/chrome/host_bug814638.xul
rename : content/base/test/chrome/mochitest.ini => dom/base/test/chrome/mochitest.ini
rename : content/base/test/chrome/nochrome_bug765993.html => dom/base/test/chrome/nochrome_bug765993.html
rename : content/base/test/chrome/nochrome_bug765993.js => dom/base/test/chrome/nochrome_bug765993.js
rename : content/base/test/chrome/nochrome_bug765993.js^headers^ => dom/base/test/chrome/nochrome_bug765993.js^headers^
rename : content/base/test/chrome/test_bug1063837.xul => dom/base/test/chrome/test_bug1063837.xul
rename : content/base/test/chrome/test_bug206691.xul => dom/base/test/chrome/test_bug206691.xul
rename : content/base/test/chrome/test_bug339494.xul => dom/base/test/chrome/test_bug339494.xul
rename : content/base/test/chrome/test_bug357450.xul => dom/base/test/chrome/test_bug357450.xul
rename : content/base/test/chrome/test_bug380418.html => dom/base/test/chrome/test_bug380418.html
rename : content/base/test/chrome/test_bug380418.html^headers^ => dom/base/test/chrome/test_bug380418.html^headers^
rename : content/base/test/chrome/test_bug383430.html => dom/base/test/chrome/test_bug383430.html
rename : content/base/test/chrome/test_bug391728.html => dom/base/test/chrome/test_bug391728.html
rename : content/base/test/chrome/test_bug421622.xul => dom/base/test/chrome/test_bug421622.xul
rename : content/base/test/chrome/test_bug429785.xul => dom/base/test/chrome/test_bug429785.xul
rename : content/base/test/chrome/test_bug430050.xul => dom/base/test/chrome/test_bug430050.xul
rename : content/base/test/chrome/test_bug467123.xul => dom/base/test/chrome/test_bug467123.xul
rename : content/base/test/chrome/test_bug549682.xul => dom/base/test/chrome/test_bug549682.xul
rename : content/base/test/chrome/test_bug571390.xul => dom/base/test/chrome/test_bug571390.xul
rename : content/base/test/chrome/test_bug574596.html => dom/base/test/chrome/test_bug574596.html
rename : content/base/test/chrome/test_bug599295.html => dom/base/test/chrome/test_bug599295.html
rename : content/base/test/chrome/test_bug616841.xul => dom/base/test/chrome/test_bug616841.xul
rename : content/base/test/chrome/test_bug635835.xul => dom/base/test/chrome/test_bug635835.xul
rename : content/base/test/chrome/test_bug650776.html => dom/base/test/chrome/test_bug650776.html
rename : content/base/test/chrome/test_bug650784.html => dom/base/test/chrome/test_bug650784.html
rename : content/base/test/chrome/test_bug682305.html => dom/base/test/chrome/test_bug682305.html
rename : content/base/test/chrome/test_bug683852.xul => dom/base/test/chrome/test_bug683852.xul
rename : content/base/test/chrome/test_bug750096.html => dom/base/test/chrome/test_bug750096.html
rename : content/base/test/chrome/test_bug752226-3.xul => dom/base/test/chrome/test_bug752226-3.xul
rename : content/base/test/chrome/test_bug752226-4.xul => dom/base/test/chrome/test_bug752226-4.xul
rename : content/base/test/chrome/test_bug765993.html => dom/base/test/chrome/test_bug765993.html
rename : content/base/test/chrome/test_bug780199.xul => dom/base/test/chrome/test_bug780199.xul
rename : content/base/test/chrome/test_bug780529.xul => dom/base/test/chrome/test_bug780529.xul
rename : content/base/test/chrome/test_bug800386.xul => dom/base/test/chrome/test_bug800386.xul
rename : content/base/test/chrome/test_bug814638.xul => dom/base/test/chrome/test_bug814638.xul
rename : content/base/test/chrome/test_bug816340.xul => dom/base/test/chrome/test_bug816340.xul
rename : content/base/test/chrome/test_bug914381.html => dom/base/test/chrome/test_bug914381.html
rename : content/base/test/chrome/test_bug990812.xul => dom/base/test/chrome/test_bug990812.xul
rename : content/base/test/chrome/test_cpows.xul => dom/base/test/chrome/test_cpows.xul
rename : content/base/test/chrome/test_document_register.xul => dom/base/test/chrome/test_document_register.xul
rename : content/base/test/chrome/test_domparsing.xul => dom/base/test/chrome/test_domparsing.xul
rename : content/base/test/chrome/test_fileconstructor.xul => dom/base/test/chrome/test_fileconstructor.xul
rename : content/base/test/chrome/test_fileconstructor_tempfile.xul => dom/base/test/chrome/test_fileconstructor_tempfile.xul
rename : content/base/test/chrome/test_title.xul => dom/base/test/chrome/test_title.xul
rename : content/base/test/chrome/title_window.xul => dom/base/test/chrome/title_window.xul
rename : content/base/test/copypaste.js => dom/base/test/copypaste.js
rename : content/base/test/csp/chrome.ini => dom/base/test/csp/chrome.ini
rename : content/base/test/csp/file_CSP.css => dom/base/test/csp/file_CSP.css
rename : content/base/test/csp/file_CSP.sjs => dom/base/test/csp/file_CSP.sjs
rename : content/base/test/csp/file_CSP_bug663567.xsl => dom/base/test/csp/file_CSP_bug663567.xsl
rename : content/base/test/csp/file_CSP_bug663567_allows.xml => dom/base/test/csp/file_CSP_bug663567_allows.xml
rename : content/base/test/csp/file_CSP_bug663567_allows.xml^headers^ => dom/base/test/csp/file_CSP_bug663567_allows.xml^headers^
rename : content/base/test/csp/file_CSP_bug663567_blocks.xml => dom/base/test/csp/file_CSP_bug663567_blocks.xml
rename : content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ => dom/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
rename : content/base/test/csp/file_CSP_bug802872.html => dom/base/test/csp/file_CSP_bug802872.html
rename : content/base/test/csp/file_CSP_bug802872.html^headers^ => dom/base/test/csp/file_CSP_bug802872.html^headers^
rename : content/base/test/csp/file_CSP_bug802872.js => dom/base/test/csp/file_CSP_bug802872.js
rename : content/base/test/csp/file_CSP_bug802872.sjs => dom/base/test/csp/file_CSP_bug802872.sjs
rename : content/base/test/csp/file_CSP_bug885433_allows.html => dom/base/test/csp/file_CSP_bug885433_allows.html
rename : content/base/test/csp/file_CSP_bug885433_allows.html^headers^ => dom/base/test/csp/file_CSP_bug885433_allows.html^headers^
rename : content/base/test/csp/file_CSP_bug885433_blocks.html => dom/base/test/csp/file_CSP_bug885433_blocks.html
rename : content/base/test/csp/file_CSP_bug885433_blocks.html^headers^ => dom/base/test/csp/file_CSP_bug885433_blocks.html^headers^
rename : content/base/test/csp/file_CSP_bug888172.html => dom/base/test/csp/file_CSP_bug888172.html
rename : content/base/test/csp/file_CSP_bug888172.sjs => dom/base/test/csp/file_CSP_bug888172.sjs
rename : content/base/test/csp/file_CSP_bug909029_none.html => dom/base/test/csp/file_CSP_bug909029_none.html
rename : content/base/test/csp/file_CSP_bug909029_none.html^headers^ => dom/base/test/csp/file_CSP_bug909029_none.html^headers^
rename : content/base/test/csp/file_CSP_bug909029_star.html => dom/base/test/csp/file_CSP_bug909029_star.html
rename : content/base/test/csp/file_CSP_bug909029_star.html^headers^ => dom/base/test/csp/file_CSP_bug909029_star.html^headers^
rename : content/base/test/csp/file_CSP_bug910139.sjs => dom/base/test/csp/file_CSP_bug910139.sjs
rename : content/base/test/csp/file_CSP_bug910139.xml => dom/base/test/csp/file_CSP_bug910139.xml
rename : content/base/test/csp/file_CSP_bug910139.xsl => dom/base/test/csp/file_CSP_bug910139.xsl
rename : content/base/test/csp/file_CSP_bug941404.html => dom/base/test/csp/file_CSP_bug941404.html
rename : content/base/test/csp/file_CSP_bug941404_xhr.html => dom/base/test/csp/file_CSP_bug941404_xhr.html
rename : content/base/test/csp/file_CSP_bug941404_xhr.html^headers^ => dom/base/test/csp/file_CSP_bug941404_xhr.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main.html => dom/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/csp/file_CSP_evalscript_main.html^headers^ => dom/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main.js => dom/base/test/csp/file_CSP_evalscript_main.js
rename : content/base/test/csp/file_CSP_evalscript_main_allowed.html => dom/base/test/csp/file_CSP_evalscript_main_allowed.html
rename : content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main_allowed.js => dom/base/test/csp/file_CSP_evalscript_main_allowed.js
rename : content/base/test/csp/file_CSP_frameancestors.sjs => dom/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/csp/file_CSP_frameancestors_main.html => dom/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/csp/file_CSP_frameancestors_main.js => dom/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/csp/file_CSP_inlinescript_main.html => dom/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/csp/file_CSP_inlinescript_main.html^headers^ => dom/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/csp/file_CSP_inlinescript_main_allowed.html => dom/base/test/csp/file_CSP_inlinescript_main_allowed.html
rename : content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main.html => dom/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/csp/file_CSP_inlinestyle_main.html^headers^ => dom/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main_allowed.html => dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html
rename : content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_main.html => dom/base/test/csp/file_CSP_main.html
rename : content/base/test/csp/file_CSP_main.html^headers^ => dom/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/csp/file_CSP_main.js => dom/base/test/csp/file_CSP_main.js
rename : content/base/test/csp/file_base-uri.html => dom/base/test/csp/file_base-uri.html
rename : content/base/test/csp/file_bug836922_npolicies.html => dom/base/test/csp/file_bug836922_npolicies.html
rename : content/base/test/csp/file_bug836922_npolicies.html^headers^ => dom/base/test/csp/file_bug836922_npolicies.html^headers^
rename : content/base/test/csp/file_bug836922_npolicies_ro_violation.sjs => dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
rename : content/base/test/csp/file_bug836922_npolicies_violation.sjs => dom/base/test/csp/file_bug836922_npolicies_violation.sjs
rename : content/base/test/csp/file_bug886164.html => dom/base/test/csp/file_bug886164.html
rename : content/base/test/csp/file_bug886164.html^headers^ => dom/base/test/csp/file_bug886164.html^headers^
rename : content/base/test/csp/file_bug886164_2.html => dom/base/test/csp/file_bug886164_2.html
rename : content/base/test/csp/file_bug886164_2.html^headers^ => dom/base/test/csp/file_bug886164_2.html^headers^
rename : content/base/test/csp/file_bug886164_3.html => dom/base/test/csp/file_bug886164_3.html
rename : content/base/test/csp/file_bug886164_3.html^headers^ => dom/base/test/csp/file_bug886164_3.html^headers^
rename : content/base/test/csp/file_bug886164_4.html => dom/base/test/csp/file_bug886164_4.html
rename : content/base/test/csp/file_bug886164_4.html^headers^ => dom/base/test/csp/file_bug886164_4.html^headers^
rename : content/base/test/csp/file_bug886164_5.html => dom/base/test/csp/file_bug886164_5.html
rename : content/base/test/csp/file_bug886164_5.html^headers^ => dom/base/test/csp/file_bug886164_5.html^headers^
rename : content/base/test/csp/file_bug886164_6.html => dom/base/test/csp/file_bug886164_6.html
rename : content/base/test/csp/file_bug886164_6.html^headers^ => dom/base/test/csp/file_bug886164_6.html^headers^
rename : content/base/test/csp/file_connect-src.html => dom/base/test/csp/file_connect-src.html
rename : content/base/test/csp/file_csp_bug768029.html => dom/base/test/csp/file_csp_bug768029.html
rename : content/base/test/csp/file_csp_bug768029.sjs => dom/base/test/csp/file_csp_bug768029.sjs
rename : content/base/test/csp/file_csp_bug773891.html => dom/base/test/csp/file_csp_bug773891.html
rename : content/base/test/csp/file_csp_bug773891.sjs => dom/base/test/csp/file_csp_bug773891.sjs
rename : content/base/test/csp/file_csp_invalid_source_expression.html => dom/base/test/csp/file_csp_invalid_source_expression.html
rename : content/base/test/csp/file_csp_path_matching.html => dom/base/test/csp/file_csp_path_matching.html
rename : content/base/test/csp/file_csp_path_matching.js => dom/base/test/csp/file_csp_path_matching.js
rename : content/base/test/csp/file_csp_path_matching_redirect.html => dom/base/test/csp/file_csp_path_matching_redirect.html
rename : content/base/test/csp/file_csp_path_matching_redirect_server.sjs => dom/base/test/csp/file_csp_path_matching_redirect_server.sjs
rename : content/base/test/csp/file_csp_redirects_main.html => dom/base/test/csp/file_csp_redirects_main.html
rename : content/base/test/csp/file_csp_redirects_page.sjs => dom/base/test/csp/file_csp_redirects_page.sjs
rename : content/base/test/csp/file_csp_redirects_resource.sjs => dom/base/test/csp/file_csp_redirects_resource.sjs
rename : content/base/test/csp/file_csp_report.html => dom/base/test/csp/file_csp_report.html
rename : content/base/test/csp/file_csp_testserver.sjs => dom/base/test/csp/file_csp_testserver.sjs
rename : content/base/test/csp/file_hash_source.html => dom/base/test/csp/file_hash_source.html
rename : content/base/test/csp/file_hash_source.html^headers^ => dom/base/test/csp/file_hash_source.html^headers^
rename : content/base/test/csp/file_leading_wildcard.html => dom/base/test/csp/file_leading_wildcard.html
rename : content/base/test/csp/file_multi_policy_injection_bypass.html => dom/base/test/csp/file_multi_policy_injection_bypass.html
rename : content/base/test/csp/file_multi_policy_injection_bypass.html^headers^ => dom/base/test/csp/file_multi_policy_injection_bypass.html^headers^
rename : content/base/test/csp/file_multi_policy_injection_bypass_2.html => dom/base/test/csp/file_multi_policy_injection_bypass_2.html
rename : content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^ => dom/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename : content/base/test/csp/file_nonce_source.html => dom/base/test/csp/file_nonce_source.html
rename : content/base/test/csp/file_nonce_source.html^headers^ => dom/base/test/csp/file_nonce_source.html^headers^
rename : content/base/test/csp/file_policyuri_regression_from_multipolicy.html => dom/base/test/csp/file_policyuri_regression_from_multipolicy.html
rename : content/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ => dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
rename : content/base/test/csp/file_policyuri_regression_from_multipolicy_policy => dom/base/test/csp/file_policyuri_regression_from_multipolicy_policy
rename : content/base/test/csp/file_redirect_content.sjs => dom/base/test/csp/file_redirect_content.sjs
rename : content/base/test/csp/file_redirect_report.sjs => dom/base/test/csp/file_redirect_report.sjs
rename : content/base/test/csp/file_report_uri_missing_in_report_only_header.html => dom/base/test/csp/file_report_uri_missing_in_report_only_header.html
rename : content/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ => dom/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
rename : content/base/test/csp/file_self_none_as_hostname_confusion.html => dom/base/test/csp/file_self_none_as_hostname_confusion.html
rename : content/base/test/csp/file_self_none_as_hostname_confusion.html^headers^ => dom/base/test/csp/file_self_none_as_hostname_confusion.html^headers^
rename : content/base/test/csp/file_subframe_run_js_if_allowed.html => dom/base/test/csp/file_subframe_run_js_if_allowed.html
rename : content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^ => dom/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
rename : content/base/test/csp/mochitest.ini => dom/base/test/csp/mochitest.ini
rename : content/base/test/csp/test_301_redirect.html => dom/base/test/csp/test_301_redirect.html
rename : content/base/test/csp/test_302_redirect.html => dom/base/test/csp/test_302_redirect.html
rename : content/base/test/csp/test_303_redirect.html => dom/base/test/csp/test_303_redirect.html
rename : content/base/test/csp/test_307_redirect.html => dom/base/test/csp/test_307_redirect.html
rename : content/base/test/csp/test_CSP.html => dom/base/test/csp/test_CSP.html
rename : content/base/test/csp/test_CSP_bug663567.html => dom/base/test/csp/test_CSP_bug663567.html
rename : content/base/test/csp/test_CSP_bug802872.html => dom/base/test/csp/test_CSP_bug802872.html
rename : content/base/test/csp/test_CSP_bug885433.html => dom/base/test/csp/test_CSP_bug885433.html
rename : content/base/test/csp/test_CSP_bug888172.html => dom/base/test/csp/test_CSP_bug888172.html
rename : content/base/test/csp/test_CSP_bug909029.html => dom/base/test/csp/test_CSP_bug909029.html
rename : content/base/test/csp/test_CSP_bug910139.html => dom/base/test/csp/test_CSP_bug910139.html
rename : content/base/test/csp/test_CSP_bug941404.html => dom/base/test/csp/test_CSP_bug941404.html
rename : content/base/test/csp/test_CSP_evalscript.html => dom/base/test/csp/test_CSP_evalscript.html
rename : content/base/test/csp/test_CSP_frameancestors.html => dom/base/test/csp/test_CSP_frameancestors.html
rename : content/base/test/csp/test_CSP_inlinescript.html => dom/base/test/csp/test_CSP_inlinescript.html
rename : content/base/test/csp/test_CSP_inlinestyle.html => dom/base/test/csp/test_CSP_inlinestyle.html
rename : content/base/test/csp/test_base-uri.html => dom/base/test/csp/test_base-uri.html
rename : content/base/test/csp/test_bug836922_npolicies.html => dom/base/test/csp/test_bug836922_npolicies.html
rename : content/base/test/csp/test_bug886164.html => dom/base/test/csp/test_bug886164.html
rename : content/base/test/csp/test_bug949549.html => dom/base/test/csp/test_bug949549.html
rename : content/base/test/csp/test_connect-src.html => dom/base/test/csp/test_connect-src.html
rename : content/base/test/csp/test_csp_bug768029.html => dom/base/test/csp/test_csp_bug768029.html
rename : content/base/test/csp/test_csp_bug773891.html => dom/base/test/csp/test_csp_bug773891.html
rename : content/base/test/csp/test_csp_invalid_source_expression.html => dom/base/test/csp/test_csp_invalid_source_expression.html
rename : content/base/test/csp/test_csp_path_matching.html => dom/base/test/csp/test_csp_path_matching.html
rename : content/base/test/csp/test_csp_path_matching_redirect.html => dom/base/test/csp/test_csp_path_matching_redirect.html
rename : content/base/test/csp/test_csp_redirects.html => dom/base/test/csp/test_csp_redirects.html
rename : content/base/test/csp/test_csp_report.html => dom/base/test/csp/test_csp_report.html
rename : content/base/test/csp/test_hash_source.html => dom/base/test/csp/test_hash_source.html
rename : content/base/test/csp/test_leading_wildcard.html => dom/base/test/csp/test_leading_wildcard.html
rename : content/base/test/csp/test_multi_policy_injection_bypass.html => dom/base/test/csp/test_multi_policy_injection_bypass.html
rename : content/base/test/csp/test_nonce_source.html => dom/base/test/csp/test_nonce_source.html
rename : content/base/test/csp/test_policyuri_regression_from_multipolicy.html => dom/base/test/csp/test_policyuri_regression_from_multipolicy.html
rename : content/base/test/csp/test_report_uri_missing_in_report_only_header.html => dom/base/test/csp/test_report_uri_missing_in_report_only_header.html
rename : content/base/test/csp/test_self_none_as_hostname_confusion.html => dom/base/test/csp/test_self_none_as_hostname_confusion.html
rename : content/base/test/csp/test_subframe_run_js_if_allowed.html => dom/base/test/csp/test_subframe_run_js_if_allowed.html
rename : content/base/test/delayedServerEvents.sjs => dom/base/test/delayedServerEvents.sjs
rename : content/base/test/eventsource.resource => dom/base/test/eventsource.resource
rename : content/base/test/eventsource.resource^headers^ => dom/base/test/eventsource.resource^headers^
rename : content/base/test/eventsource_redirect.resource => dom/base/test/eventsource_redirect.resource
rename : content/base/test/eventsource_redirect.resource^headers^ => dom/base/test/eventsource_redirect.resource^headers^
rename : content/base/test/eventsource_redirect_to.resource => dom/base/test/eventsource_redirect_to.resource
rename : content/base/test/eventsource_redirect_to.resource^headers^ => dom/base/test/eventsource_redirect_to.resource^headers^
rename : content/base/test/fake_plugin.tst => dom/base/test/fake_plugin.tst
rename : content/base/test/file_CrossSiteXHR_cache_server.sjs => dom/base/test/file_CrossSiteXHR_cache_server.sjs
rename : content/base/test/file_CrossSiteXHR_inner.html => dom/base/test/file_CrossSiteXHR_inner.html
rename : content/base/test/file_CrossSiteXHR_inner.jar => dom/base/test/file_CrossSiteXHR_inner.jar
rename : content/base/test/file_CrossSiteXHR_inner_data.sjs => dom/base/test/file_CrossSiteXHR_inner_data.sjs
rename : content/base/test/file_CrossSiteXHR_server.sjs => dom/base/test/file_CrossSiteXHR_server.sjs
rename : content/base/test/file_XHRDocURI.html => dom/base/test/file_XHRDocURI.html
rename : content/base/test/file_XHRDocURI.html^headers^ => dom/base/test/file_XHRDocURI.html^headers^
rename : content/base/test/file_XHRDocURI.sjs => dom/base/test/file_XHRDocURI.sjs
rename : content/base/test/file_XHRDocURI.text => dom/base/test/file_XHRDocURI.text
rename : content/base/test/file_XHRDocURI.text^headers^ => dom/base/test/file_XHRDocURI.text^headers^
rename : content/base/test/file_XHRDocURI.xml => dom/base/test/file_XHRDocURI.xml
rename : content/base/test/file_XHRDocURI.xml^headers^ => dom/base/test/file_XHRDocURI.xml^headers^
rename : content/base/test/file_XHRResponseURL.js => dom/base/test/file_XHRResponseURL.js
rename : content/base/test/file_XHRResponseURL.sjs => dom/base/test/file_XHRResponseURL.sjs
rename : content/base/test/file_XHRResponseURL.text => dom/base/test/file_XHRResponseURL.text
rename : content/base/test/file_XHRResponseURL.text^headers^ => dom/base/test/file_XHRResponseURL.text^headers^
rename : content/base/test/file_XHRResponseURL_nocors.text => dom/base/test/file_XHRResponseURL_nocors.text
rename : content/base/test/file_XHRSendData.sjs => dom/base/test/file_XHRSendData.sjs
rename : content/base/test/file_XHRSendData_doc.xml => dom/base/test/file_XHRSendData_doc.xml
rename : content/base/test/file_XHRSendData_doc.xml^headers^ => dom/base/test/file_XHRSendData_doc.xml^headers^
rename : content/base/test/file_XHR_anon.sjs => dom/base/test/file_XHR_anon.sjs
rename : content/base/test/file_XHR_binary1.bin => dom/base/test/file_XHR_binary1.bin
rename : content/base/test/file_XHR_binary1.bin^headers^ => dom/base/test/file_XHR_binary1.bin^headers^
rename : content/base/test/file_XHR_binary2.bin => dom/base/test/file_XHR_binary2.bin
rename : content/base/test/file_XHR_fail1.txt => dom/base/test/file_XHR_fail1.txt
rename : content/base/test/file_XHR_fail1.txt^headers^ => dom/base/test/file_XHR_fail1.txt^headers^
rename : content/base/test/file_XHR_fail1b.txt => dom/base/test/file_XHR_fail1b.txt
rename : content/base/test/file_XHR_header.sjs => dom/base/test/file_XHR_header.sjs
rename : content/base/test/file_XHR_pass1.xml => dom/base/test/file_XHR_pass1.xml
rename : content/base/test/file_XHR_pass2.txt => dom/base/test/file_XHR_pass2.txt
rename : content/base/test/file_XHR_pass3.txt => dom/base/test/file_XHR_pass3.txt
rename : content/base/test/file_XHR_pass3.txt^headers^ => dom/base/test/file_XHR_pass3.txt^headers^
rename : content/base/test/file_XHR_system_redirect.html => dom/base/test/file_XHR_system_redirect.html
rename : content/base/test/file_XHR_system_redirect.html^headers^ => dom/base/test/file_XHR_system_redirect.html^headers^
rename : content/base/test/file_XHR_timeout.sjs => dom/base/test/file_XHR_timeout.sjs
rename : content/base/test/file_base_xbl.xml => dom/base/test/file_base_xbl.xml
rename : content/base/test/file_bug1008126_worker.js => dom/base/test/file_bug1008126_worker.js
rename : content/base/test/file_bug1011748_OK.sjs => dom/base/test/file_bug1011748_OK.sjs
rename : content/base/test/file_bug1011748_redirect.sjs => dom/base/test/file_bug1011748_redirect.sjs
rename : content/base/test/file_bug28293.sjs => dom/base/test/file_bug28293.sjs
rename : content/base/test/file_bug326337.xml => dom/base/test/file_bug326337.xml
rename : content/base/test/file_bug326337_inner.html => dom/base/test/file_bug326337_inner.html
rename : content/base/test/file_bug326337_outer.html => dom/base/test/file_bug326337_outer.html
rename : content/base/test/file_bug416317.xhtml => dom/base/test/file_bug416317.xhtml
rename : content/base/test/file_bug426646-1.html => dom/base/test/file_bug426646-1.html
rename : content/base/test/file_bug426646-2.html => dom/base/test/file_bug426646-2.html
rename : content/base/test/file_bug428847-1.xhtml => dom/base/test/file_bug428847-1.xhtml
rename : content/base/test/file_bug428847-2.xhtml => dom/base/test/file_bug428847-2.xhtml
rename : content/base/test/file_bug498897.css => dom/base/test/file_bug498897.css
rename : content/base/test/file_bug498897.html => dom/base/test/file_bug498897.html
rename : content/base/test/file_bug498897.html^headers^ => dom/base/test/file_bug498897.html^headers^
rename : content/base/test/file_bug503473-frame.sjs => dom/base/test/file_bug503473-frame.sjs
rename : content/base/test/file_bug503481.sjs => dom/base/test/file_bug503481.sjs
rename : content/base/test/file_bug503481b_inner.html => dom/base/test/file_bug503481b_inner.html
rename : content/base/test/file_bug541937.html => dom/base/test/file_bug541937.html
rename : content/base/test/file_bug541937.xhtml => dom/base/test/file_bug541937.xhtml
rename : content/base/test/file_bug557892.html => dom/base/test/file_bug557892.html
rename : content/base/test/file_bug562137.txt => dom/base/test/file_bug562137.txt
rename : content/base/test/file_bug590812-ref.xhtml => dom/base/test/file_bug590812-ref.xhtml
rename : content/base/test/file_bug590812.xml => dom/base/test/file_bug590812.xml
rename : content/base/test/file_bug590870.html => dom/base/test/file_bug590870.html
rename : content/base/test/file_bug601803a.html => dom/base/test/file_bug601803a.html
rename : content/base/test/file_bug601803b.html => dom/base/test/file_bug601803b.html
rename : content/base/test/file_bug604660-1.xml => dom/base/test/file_bug604660-1.xml
rename : content/base/test/file_bug604660-2.xsl => dom/base/test/file_bug604660-2.xsl
rename : content/base/test/file_bug604660-3.js => dom/base/test/file_bug604660-3.js
rename : content/base/test/file_bug604660-4.js => dom/base/test/file_bug604660-4.js
rename : content/base/test/file_bug604660-5.xml => dom/base/test/file_bug604660-5.xml
rename : content/base/test/file_bug604660-6.xsl => dom/base/test/file_bug604660-6.xsl
rename : content/base/test/file_bug622088.sjs => dom/base/test/file_bug622088.sjs
rename : content/base/test/file_bug622088_inner.html => dom/base/test/file_bug622088_inner.html
rename : content/base/test/file_bug675121.sjs => dom/base/test/file_bug675121.sjs
rename : content/base/test/file_bug687859-16.js => dom/base/test/file_bug687859-16.js
rename : content/base/test/file_bug687859-16.js^headers^ => dom/base/test/file_bug687859-16.js^headers^
rename : content/base/test/file_bug687859-bom.js => dom/base/test/file_bug687859-bom.js
rename : content/base/test/file_bug687859-bom.js^headers^ => dom/base/test/file_bug687859-bom.js^headers^
rename : content/base/test/file_bug687859-charset.js => dom/base/test/file_bug687859-charset.js
rename : content/base/test/file_bug687859-http.js => dom/base/test/file_bug687859-http.js
rename : content/base/test/file_bug687859-http.js^headers^ => dom/base/test/file_bug687859-http.js^headers^
rename : content/base/test/file_bug687859-inherit.js => dom/base/test/file_bug687859-inherit.js
rename : content/base/test/file_bug692434.xml => dom/base/test/file_bug692434.xml
rename : content/base/test/file_bug707142_baseline.json => dom/base/test/file_bug707142_baseline.json
rename : content/base/test/file_bug707142_bom.json => dom/base/test/file_bug707142_bom.json
rename : content/base/test/file_bug707142_utf-16.json => dom/base/test/file_bug707142_utf-16.json
rename : content/base/test/file_bug708620-2.html => dom/base/test/file_bug708620-2.html
rename : content/base/test/file_bug708620.html => dom/base/test/file_bug708620.html
rename : content/base/test/file_bug782342.txt => dom/base/test/file_bug782342.txt
rename : content/base/test/file_bug787778.sjs => dom/base/test/file_bug787778.sjs
rename : content/base/test/file_bug804395.jar => dom/base/test/file_bug804395.jar
rename : content/base/test/file_bug869432.eventsource => dom/base/test/file_bug869432.eventsource
rename : content/base/test/file_bug869432.eventsource^headers^ => dom/base/test/file_bug869432.eventsource^headers^
rename : content/base/test/file_bug902350.html => dom/base/test/file_bug902350.html
rename : content/base/test/file_bug902350_frame.html => dom/base/test/file_bug902350_frame.html
rename : content/base/test/file_bug907892.html => dom/base/test/file_bug907892.html
rename : content/base/test/file_bug945152.jar => dom/base/test/file_bug945152.jar
rename : content/base/test/file_bug945152_worker.js => dom/base/test/file_bug945152_worker.js
rename : content/base/test/file_general_document.html => dom/base/test/file_general_document.html
rename : content/base/test/file_html_in_xhr.html => dom/base/test/file_html_in_xhr.html
rename : content/base/test/file_html_in_xhr.sjs => dom/base/test/file_html_in_xhr.sjs
rename : content/base/test/file_html_in_xhr2.html => dom/base/test/file_html_in_xhr2.html
rename : content/base/test/file_html_in_xhr3.html => dom/base/test/file_html_in_xhr3.html
rename : content/base/test/file_htmlserializer_1.html => dom/base/test/file_htmlserializer_1.html
rename : content/base/test/file_htmlserializer_1_bodyonly.html => dom/base/test/file_htmlserializer_1_bodyonly.html
rename : content/base/test/file_htmlserializer_1_format.html => dom/base/test/file_htmlserializer_1_format.html
rename : content/base/test/file_htmlserializer_1_linebreak.html => dom/base/test/file_htmlserializer_1_linebreak.html
rename : content/base/test/file_htmlserializer_1_links.html => dom/base/test/file_htmlserializer_1_links.html
rename : content/base/test/file_htmlserializer_1_nested_body.html => dom/base/test/file_htmlserializer_1_nested_body.html
rename : content/base/test/file_htmlserializer_1_no_body.html => dom/base/test/file_htmlserializer_1_no_body.html
rename : content/base/test/file_htmlserializer_1_noflag.html => dom/base/test/file_htmlserializer_1_noflag.html
rename : content/base/test/file_htmlserializer_1_noformatpre.html => dom/base/test/file_htmlserializer_1_noformatpre.html
rename : content/base/test/file_htmlserializer_1_raw.html => dom/base/test/file_htmlserializer_1_raw.html
rename : content/base/test/file_htmlserializer_1_sibling_body.html => dom/base/test/file_htmlserializer_1_sibling_body.html
rename : content/base/test/file_htmlserializer_1_sibling_body_only_body.html => dom/base/test/file_htmlserializer_1_sibling_body_only_body.html
rename : content/base/test/file_htmlserializer_1_wrap.html => dom/base/test/file_htmlserializer_1_wrap.html
rename : content/base/test/file_htmlserializer_2.html => dom/base/test/file_htmlserializer_2.html
rename : content/base/test/file_htmlserializer_2_basic.html => dom/base/test/file_htmlserializer_2_basic.html
rename : content/base/test/file_htmlserializer_2_enthtml.html => dom/base/test/file_htmlserializer_2_enthtml.html
rename : content/base/test/file_htmlserializer_2_entw3c.html => dom/base/test/file_htmlserializer_2_entw3c.html
rename : content/base/test/file_htmlserializer_2_latin1.html => dom/base/test/file_htmlserializer_2_latin1.html
rename : content/base/test/file_htmlserializer_ipv6.html => dom/base/test/file_htmlserializer_ipv6.html
rename : content/base/test/file_htmlserializer_ipv6_out.html => dom/base/test/file_htmlserializer_ipv6_out.html
rename : content/base/test/file_mixed_content_frameNavigation.html => dom/base/test/file_mixed_content_frameNavigation.html
rename : content/base/test/file_mixed_content_frameNavigation_blankTarget.html => dom/base/test/file_mixed_content_frameNavigation_blankTarget.html
rename : content/base/test/file_mixed_content_frameNavigation_grandchild.html => dom/base/test/file_mixed_content_frameNavigation_grandchild.html
rename : content/base/test/file_mixed_content_frameNavigation_innermost.html => dom/base/test/file_mixed_content_frameNavigation_innermost.html
rename : content/base/test/file_mixed_content_frameNavigation_secure.html => dom/base/test/file_mixed_content_frameNavigation_secure.html
rename : content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html => dom/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
rename : content/base/test/file_mixed_content_main.html => dom/base/test/file_mixed_content_main.html
rename : content/base/test/file_mixed_content_main_bug803225.html => dom/base/test/file_mixed_content_main_bug803225.html
rename : content/base/test/file_mixed_content_main_bug803225_websocket_wsh.py => dom/base/test/file_mixed_content_main_bug803225_websocket_wsh.py
rename : content/base/test/file_mixed_content_server.sjs => dom/base/test/file_mixed_content_server.sjs
rename : content/base/test/file_mozfiledataurl_audio.ogg => dom/base/test/file_mozfiledataurl_audio.ogg
rename : content/base/test/file_mozfiledataurl_doc.html => dom/base/test/file_mozfiledataurl_doc.html
rename : content/base/test/file_mozfiledataurl_img.jpg => dom/base/test/file_mozfiledataurl_img.jpg
rename : content/base/test/file_mozfiledataurl_inner.html => dom/base/test/file_mozfiledataurl_inner.html
rename : content/base/test/file_mozfiledataurl_text.txt => dom/base/test/file_mozfiledataurl_text.txt
rename : content/base/test/file_restrictedEventSource.sjs => dom/base/test/file_restrictedEventSource.sjs
rename : content/base/test/file_websocket_basic_wsh.py => dom/base/test/file_websocket_basic_wsh.py
rename : content/base/test/file_websocket_hello_wsh.py => dom/base/test/file_websocket_hello_wsh.py
rename : content/base/test/file_websocket_http_resource.txt => dom/base/test/file_websocket_http_resource.txt
rename : content/base/test/file_websocket_wsh.py => dom/base/test/file_websocket_wsh.py
rename : content/base/test/file_x-frame-options_main.html => dom/base/test/file_x-frame-options_main.html
rename : content/base/test/file_x-frame-options_page.sjs => dom/base/test/file_x-frame-options_page.sjs
rename : content/base/test/file_xhtmlserializer_1.xhtml => dom/base/test/file_xhtmlserializer_1.xhtml
rename : content/base/test/file_xhtmlserializer_1_bodyonly.xhtml => dom/base/test/file_xhtmlserializer_1_bodyonly.xhtml
rename : content/base/test/file_xhtmlserializer_1_format.xhtml => dom/base/test/file_xhtmlserializer_1_format.xhtml
rename : content/base/test/file_xhtmlserializer_1_linebreak.xhtml => dom/base/test/file_xhtmlserializer_1_linebreak.xhtml
rename : content/base/test/file_xhtmlserializer_1_links.xhtml => dom/base/test/file_xhtmlserializer_1_links.xhtml
rename : content/base/test/file_xhtmlserializer_1_nested_body.xhtml => dom/base/test/file_xhtmlserializer_1_nested_body.xhtml
rename : content/base/test/file_xhtmlserializer_1_no_body.xhtml => dom/base/test/file_xhtmlserializer_1_no_body.xhtml
rename : content/base/test/file_xhtmlserializer_1_noflag.xhtml => dom/base/test/file_xhtmlserializer_1_noflag.xhtml
rename : content/base/test/file_xhtmlserializer_1_noformatpre.xhtml => dom/base/test/file_xhtmlserializer_1_noformatpre.xhtml
rename : content/base/test/file_xhtmlserializer_1_raw.xhtml => dom/base/test/file_xhtmlserializer_1_raw.xhtml
rename : content/base/test/file_xhtmlserializer_1_sibling_body.xhtml => dom/base/test/file_xhtmlserializer_1_sibling_body.xhtml
rename : content/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml => dom/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml
rename : content/base/test/file_xhtmlserializer_1_wrap.xhtml => dom/base/test/file_xhtmlserializer_1_wrap.xhtml
rename : content/base/test/file_xhtmlserializer_2.xhtml => dom/base/test/file_xhtmlserializer_2.xhtml
rename : content/base/test/file_xhtmlserializer_2_basic.xhtml => dom/base/test/file_xhtmlserializer_2_basic.xhtml
rename : content/base/test/file_xhtmlserializer_2_enthtml.xhtml => dom/base/test/file_xhtmlserializer_2_enthtml.xhtml
rename : content/base/test/file_xhtmlserializer_2_entw3c.xhtml => dom/base/test/file_xhtmlserializer_2_entw3c.xhtml
rename : content/base/test/file_xhtmlserializer_2_latin1.xhtml => dom/base/test/file_xhtmlserializer_2_latin1.xhtml
rename : content/base/test/fileutils.js => dom/base/test/fileutils.js
rename : content/base/test/forRemoval.resource => dom/base/test/forRemoval.resource
rename : content/base/test/forRemoval.resource^headers^ => dom/base/test/forRemoval.resource^headers^
rename : content/base/test/formReset.html => dom/base/test/formReset.html
rename : content/base/test/invalid_accesscontrol.resource => dom/base/test/invalid_accesscontrol.resource
rename : content/base/test/invalid_accesscontrol.resource^headers^ => dom/base/test/invalid_accesscontrol.resource^headers^
rename : content/base/test/mochitest-child-permissions.ini => dom/base/test/mochitest-child-permissions.ini
rename : content/base/test/moz.build => dom/base/test/moz.build
rename : content/base/test/mutationobserver_dialog.html => dom/base/test/mutationobserver_dialog.html
rename : content/base/test/progressserver.sjs => dom/base/test/progressserver.sjs
rename : content/base/test/reftest/mixed-bmp-png.ico => dom/base/test/reftest/mixed-bmp-png.ico
rename : content/base/test/reftest/reftest.list => dom/base/test/reftest/reftest.list
rename : content/base/test/reftest/test_bug920877-ref.html => dom/base/test/reftest/test_bug920877-ref.html
rename : content/base/test/reftest/test_bug920877.html => dom/base/test/reftest/test_bug920877.html
rename : content/base/test/responseIdentical.sjs => dom/base/test/responseIdentical.sjs
rename : content/base/test/script-1_bug597345.sjs => dom/base/test/script-1_bug597345.sjs
rename : content/base/test/script-2_bug597345.js => dom/base/test/script-2_bug597345.js
rename : content/base/test/script_bug602838.sjs => dom/base/test/script_bug602838.sjs
rename : content/base/test/send_gzip_content.sjs => dom/base/test/send_gzip_content.sjs
rename : content/base/test/somedatas.resource => dom/base/test/somedatas.resource
rename : content/base/test/somedatas.resource^headers^ => dom/base/test/somedatas.resource^headers^
rename : content/base/test/test_CrossSiteXHR.html => dom/base/test/test_CrossSiteXHR.html
rename : content/base/test/test_CrossSiteXHR_cache.html => dom/base/test/test_CrossSiteXHR_cache.html
rename : content/base/test/test_CrossSiteXHR_origin.html => dom/base/test/test_CrossSiteXHR_origin.html
rename : content/base/test/test_DOMException.html => dom/base/test/test_DOMException.html
rename : content/base/test/test_EventSource_redirects.html => dom/base/test/test_EventSource_redirects.html
rename : content/base/test/test_NodeIterator_basics_filters.xhtml => dom/base/test/test_NodeIterator_basics_filters.xhtml
rename : content/base/test/test_NodeIterator_mutations_1.xhtml => dom/base/test/test_NodeIterator_mutations_1.xhtml
rename : content/base/test/test_NodeIterator_mutations_2.html => dom/base/test/test_NodeIterator_mutations_2.html
rename : content/base/test/test_NodeIterator_mutations_3.html => dom/base/test/test_NodeIterator_mutations_3.html
rename : content/base/test/test_XHR.html => dom/base/test/test_XHR.html
rename : content/base/test/test_XHRDocURI.html => dom/base/test/test_XHRDocURI.html
rename : content/base/test/test_XHRResponseURL.html => dom/base/test/test_XHRResponseURL.html
rename : content/base/test/test_XHRSendData.html => dom/base/test/test_XHRSendData.html
rename : content/base/test/test_XHR_anon.html => dom/base/test/test_XHR_anon.html
rename : content/base/test/test_XHR_header.html => dom/base/test/test_XHR_header.html
rename : content/base/test/test_XHR_onuploadprogress.html => dom/base/test/test_XHR_onuploadprogress.html
rename : content/base/test/test_XHR_parameters.html => dom/base/test/test_XHR_parameters.html
rename : content/base/test/test_XHR_system.html => dom/base/test/test_XHR_system.html
rename : content/base/test/test_XHR_timeout.html => dom/base/test/test_XHR_timeout.html
rename : content/base/test/test_XHR_timeout.js => dom/base/test/test_XHR_timeout.js
rename : content/base/test/test_base.xhtml => dom/base/test/test_base.xhtml
rename : content/base/test/test_blobconstructor.html => dom/base/test/test_blobconstructor.html
rename : content/base/test/test_bug1008126.html => dom/base/test/test_bug1008126.html
rename : content/base/test/test_bug1011748.html => dom/base/test/test_bug1011748.html
rename : content/base/test/test_bug1025933.html => dom/base/test/test_bug1025933.html
rename : content/base/test/test_bug1057176.html => dom/base/test/test_bug1057176.html
rename : content/base/test/test_bug1081686.html => dom/base/test/test_bug1081686.html
rename : content/base/test/test_bug166235.html => dom/base/test/test_bug166235.html
rename : content/base/test/test_bug199959.html => dom/base/test/test_bug199959.html
rename : content/base/test/test_bug218236.html => dom/base/test/test_bug218236.html
rename : content/base/test/test_bug218277.html => dom/base/test/test_bug218277.html
rename : content/base/test/test_bug238409.html => dom/base/test/test_bug238409.html
rename : content/base/test/test_bug254337.html => dom/base/test/test_bug254337.html
rename : content/base/test/test_bug270145.xhtml => dom/base/test/test_bug270145.xhtml
rename : content/base/test/test_bug276037-1.html => dom/base/test/test_bug276037-1.html
rename : content/base/test/test_bug276037-2.xhtml => dom/base/test/test_bug276037-2.xhtml
rename : content/base/test/test_bug282547.html => dom/base/test/test_bug282547.html
rename : content/base/test/test_bug28293.html => dom/base/test/test_bug28293.html
rename : content/base/test/test_bug28293.xhtml => dom/base/test/test_bug28293.xhtml
rename : content/base/test/test_bug298064.html => dom/base/test/test_bug298064.html
rename : content/base/test/test_bug300992.html => dom/base/test/test_bug300992.html
rename : content/base/test/test_bug311681.xml => dom/base/test/test_bug311681.xml
rename : content/base/test/test_bug313646.html => dom/base/test/test_bug313646.html
rename : content/base/test/test_bug320799.html => dom/base/test/test_bug320799.html
rename : content/base/test/test_bug322317.html => dom/base/test/test_bug322317.html
rename : content/base/test/test_bug326337.html => dom/base/test/test_bug326337.html
rename : content/base/test/test_bug330925.xhtml => dom/base/test/test_bug330925.xhtml
rename : content/base/test/test_bug331959.html => dom/base/test/test_bug331959.html
rename : content/base/test/test_bug333198.html => dom/base/test/test_bug333198.html
rename : content/base/test/test_bug333673.html => dom/base/test/test_bug333673.html
rename : content/base/test/test_bug337631.html => dom/base/test/test_bug337631.html
rename : content/base/test/test_bug338541.xhtml => dom/base/test/test_bug338541.xhtml
rename : content/base/test/test_bug338583.html => dom/base/test/test_bug338583.html
rename : content/base/test/test_bug338679.html => dom/base/test/test_bug338679.html
rename : content/base/test/test_bug339494.html => dom/base/test/test_bug339494.html
rename : content/base/test/test_bug339494.xhtml => dom/base/test/test_bug339494.xhtml
rename : content/base/test/test_bug340571.html => dom/base/test/test_bug340571.html
rename : content/base/test/test_bug343596.html => dom/base/test/test_bug343596.html
rename : content/base/test/test_bug345339.html => dom/base/test/test_bug345339.html
rename : content/base/test/test_bug346485.html => dom/base/test/test_bug346485.html
rename : content/base/test/test_bug352728.html => dom/base/test/test_bug352728.html
rename : content/base/test/test_bug352728.xhtml => dom/base/test/test_bug352728.xhtml
rename : content/base/test/test_bug353334.html => dom/base/test/test_bug353334.html
rename : content/base/test/test_bug355026.html => dom/base/test/test_bug355026.html
rename : content/base/test/test_bug357450.html => dom/base/test/test_bug357450.html
rename : content/base/test/test_bug357450.js => dom/base/test/test_bug357450.js
rename : content/base/test/test_bug357450.xhtml => dom/base/test/test_bug357450.xhtml
rename : content/base/test/test_bug357450_svg.xhtml => dom/base/test/test_bug357450_svg.xhtml
rename : content/base/test/test_bug357509.html => dom/base/test/test_bug357509.html
rename : content/base/test/test_bug358660.html => dom/base/test/test_bug358660.html
rename : content/base/test/test_bug362391.xhtml => dom/base/test/test_bug362391.xhtml
rename : content/base/test/test_bug364092.xhtml => dom/base/test/test_bug364092.xhtml
rename : content/base/test/test_bug364413.xhtml => dom/base/test/test_bug364413.xhtml
rename : content/base/test/test_bug366944.html => dom/base/test/test_bug366944.html
rename : content/base/test/test_bug366946.html => dom/base/test/test_bug366946.html
rename : content/base/test/test_bug367164.html => dom/base/test/test_bug367164.html
rename : content/base/test/test_bug368972.html => dom/base/test/test_bug368972.html
rename : content/base/test/test_bug371576-2.html => dom/base/test/test_bug371576-2.html
rename : content/base/test/test_bug371576-3.html => dom/base/test/test_bug371576-3.html
rename : content/base/test/test_bug371576-4.html => dom/base/test/test_bug371576-4.html
rename : content/base/test/test_bug371576-5.html => dom/base/test/test_bug371576-5.html
rename : content/base/test/test_bug372086.html => dom/base/test/test_bug372086.html
rename : content/base/test/test_bug372964-2.html => dom/base/test/test_bug372964-2.html
rename : content/base/test/test_bug372964.html => dom/base/test/test_bug372964.html
rename : content/base/test/test_bug373181.xhtml => dom/base/test/test_bug373181.xhtml
rename : content/base/test/test_bug375314.html => dom/base/test/test_bug375314.html
rename : content/base/test/test_bug378969.html => dom/base/test/test_bug378969.html
rename : content/base/test/test_bug380418.html => dom/base/test/test_bug380418.html
rename : content/base/test/test_bug380418.html^headers^ => dom/base/test/test_bug380418.html^headers^
rename : content/base/test/test_bug382113.html => dom/base/test/test_bug382113.html
rename : content/base/test/test_bug382871.html => dom/base/test/test_bug382871.html
rename : content/base/test/test_bug384003.xhtml => dom/base/test/test_bug384003.xhtml
rename : content/base/test/test_bug390219.html => dom/base/test/test_bug390219.html
rename : content/base/test/test_bug390735.html => dom/base/test/test_bug390735.html
rename : content/base/test/test_bug392318.html => dom/base/test/test_bug392318.html
rename : content/base/test/test_bug392511.html => dom/base/test/test_bug392511.html
rename : content/base/test/test_bug393968.html => dom/base/test/test_bug393968.html
rename : content/base/test/test_bug395915.html => dom/base/test/test_bug395915.html
rename : content/base/test/test_bug397234.html => dom/base/test/test_bug397234.html
rename : content/base/test/test_bug398243.html => dom/base/test/test_bug398243.html
rename : content/base/test/test_bug401662.html => dom/base/test/test_bug401662.html
rename : content/base/test/test_bug402150.html => dom/base/test/test_bug402150.html
rename : content/base/test/test_bug402150.html^headers^ => dom/base/test/test_bug402150.html^headers^
rename : content/base/test/test_bug403841.html => dom/base/test/test_bug403841.html
rename : content/base/test/test_bug403852.html => dom/base/test/test_bug403852.html
rename : content/base/test/test_bug403868.xml => dom/base/test/test_bug403868.xml
rename : content/base/test/test_bug405182.html => dom/base/test/test_bug405182.html
rename : content/base/test/test_bug409380.html => dom/base/test/test_bug409380.html
rename : content/base/test/test_bug410229.html => dom/base/test/test_bug410229.html
rename : content/base/test/test_bug413974.html => dom/base/test/test_bug413974.html
rename : content/base/test/test_bug414190.html => dom/base/test/test_bug414190.html
rename : content/base/test/test_bug415860.html => dom/base/test/test_bug415860.html
rename : content/base/test/test_bug416317-1.html => dom/base/test/test_bug416317-1.html
rename : content/base/test/test_bug416317-2.html => dom/base/test/test_bug416317-2.html
rename : content/base/test/test_bug416383.html => dom/base/test/test_bug416383.html
rename : content/base/test/test_bug417255.html => dom/base/test/test_bug417255.html
rename : content/base/test/test_bug417384.html => dom/base/test/test_bug417384.html
rename : content/base/test/test_bug418214.html => dom/base/test/test_bug418214.html
rename : content/base/test/test_bug419132.html => dom/base/test/test_bug419132.html
rename : content/base/test/test_bug419527.xhtml => dom/base/test/test_bug419527.xhtml
rename : content/base/test/test_bug420609.xhtml => dom/base/test/test_bug420609.xhtml
rename : content/base/test/test_bug420700.html => dom/base/test/test_bug420700.html
rename : content/base/test/test_bug421602.html => dom/base/test/test_bug421602.html
rename : content/base/test/test_bug422403-1.html => dom/base/test/test_bug422403-1.html
rename : content/base/test/test_bug422403-2.xhtml => dom/base/test/test_bug422403-2.xhtml
rename : content/base/test/test_bug422537.html => dom/base/test/test_bug422537.html
rename : content/base/test/test_bug424212.html => dom/base/test/test_bug424212.html
rename : content/base/test/test_bug424359-1.html => dom/base/test/test_bug424359-1.html
rename : content/base/test/test_bug424359-2.html => dom/base/test/test_bug424359-2.html
rename : content/base/test/test_bug425013.html => dom/base/test/test_bug425013.html
rename : content/base/test/test_bug426308.html => dom/base/test/test_bug426308.html
rename : content/base/test/test_bug426646.html => dom/base/test/test_bug426646.html
rename : content/base/test/test_bug428847.html => dom/base/test/test_bug428847.html
rename : content/base/test/test_bug429157.html => dom/base/test/test_bug429157.html
rename : content/base/test/test_bug431082.html => dom/base/test/test_bug431082.html
rename : content/base/test/test_bug431701.html => dom/base/test/test_bug431701.html
rename : content/base/test/test_bug431833.html => dom/base/test/test_bug431833.html
rename : content/base/test/test_bug433533.html => dom/base/test/test_bug433533.html
rename : content/base/test/test_bug433662.html => dom/base/test/test_bug433662.html
rename : content/base/test/test_bug435425.html => dom/base/test/test_bug435425.html
rename : content/base/test/test_bug438519.html => dom/base/test/test_bug438519.html
rename : content/base/test/test_bug444030.xhtml => dom/base/test/test_bug444030.xhtml
rename : content/base/test/test_bug444322.html => dom/base/test/test_bug444322.html
rename : content/base/test/test_bug444546.html => dom/base/test/test_bug444546.html
rename : content/base/test/test_bug444722.html => dom/base/test/test_bug444722.html
rename : content/base/test/test_bug448993.html => dom/base/test/test_bug448993.html
rename : content/base/test/test_bug450160.html => dom/base/test/test_bug450160.html
rename : content/base/test/test_bug451376.html => dom/base/test/test_bug451376.html
rename : content/base/test/test_bug453521.html => dom/base/test/test_bug453521.html
rename : content/base/test/test_bug453736.html => dom/base/test/test_bug453736.html
rename : content/base/test/test_bug454325.html => dom/base/test/test_bug454325.html
rename : content/base/test/test_bug454326.html => dom/base/test/test_bug454326.html
rename : content/base/test/test_bug455472.html => dom/base/test/test_bug455472.html
rename : content/base/test/test_bug455629.html => dom/base/test/test_bug455629.html
rename : content/base/test/test_bug456262.html => dom/base/test/test_bug456262.html
rename : content/base/test/test_bug457746.html => dom/base/test/test_bug457746.html
rename : content/base/test/test_bug459424.html => dom/base/test/test_bug459424.html
rename : content/base/test/test_bug461555.html => dom/base/test/test_bug461555.html
rename : content/base/test/test_bug461735.html => dom/base/test/test_bug461735.html
rename : content/base/test/test_bug465767.html => dom/base/test/test_bug465767.html
rename : content/base/test/test_bug466080.html => dom/base/test/test_bug466080.html
rename : content/base/test/test_bug466409.html => dom/base/test/test_bug466409.html
rename : content/base/test/test_bug466751.xhtml => dom/base/test/test_bug466751.xhtml
rename : content/base/test/test_bug469020.html => dom/base/test/test_bug469020.html
rename : content/base/test/test_bug469304.html => dom/base/test/test_bug469304.html
rename : content/base/test/test_bug473162-1.html => dom/base/test/test_bug473162-1.html
rename : content/base/test/test_bug473162-2.html => dom/base/test/test_bug473162-2.html
rename : content/base/test/test_bug475156.html => dom/base/test/test_bug475156.html
rename : content/base/test/test_bug482935.html => dom/base/test/test_bug482935.html
rename : content/base/test/test_bug484396.html => dom/base/test/test_bug484396.html
rename : content/base/test/test_bug493881.html => dom/base/test/test_bug493881.html
rename : content/base/test/test_bug493881.js => dom/base/test/test_bug493881.js
rename : content/base/test/test_bug498240.html => dom/base/test/test_bug498240.html
rename : content/base/test/test_bug498433.html => dom/base/test/test_bug498433.html
rename : content/base/test/test_bug498897.html => dom/base/test/test_bug498897.html
rename : content/base/test/test_bug499656.html => dom/base/test/test_bug499656.html
rename : content/base/test/test_bug499656.xhtml => dom/base/test/test_bug499656.xhtml
rename : content/base/test/test_bug500937.html => dom/base/test/test_bug500937.html
rename : content/base/test/test_bug503473.html => dom/base/test/test_bug503473.html
rename : content/base/test/test_bug503481.html => dom/base/test/test_bug503481.html
rename : content/base/test/test_bug503481b.html => dom/base/test/test_bug503481b.html
rename : content/base/test/test_bug505783.html => dom/base/test/test_bug505783.html
rename : content/base/test/test_bug51034.html => dom/base/test/test_bug51034.html
rename : content/base/test/test_bug513194.html => dom/base/test/test_bug513194.html
rename : content/base/test/test_bug5141.html => dom/base/test/test_bug5141.html
rename : content/base/test/test_bug514487.html => dom/base/test/test_bug514487.html
rename : content/base/test/test_bug515401.html => dom/base/test/test_bug515401.html
rename : content/base/test/test_bug518104.html => dom/base/test/test_bug518104.html
rename : content/base/test/test_bug527896.html => dom/base/test/test_bug527896.html
rename : content/base/test/test_bug540854.html => dom/base/test/test_bug540854.html
rename : content/base/test/test_bug541937.html => dom/base/test/test_bug541937.html
rename : content/base/test/test_bug544642.html => dom/base/test/test_bug544642.html
rename : content/base/test/test_bug545644.html => dom/base/test/test_bug545644.html
rename : content/base/test/test_bug545644.xhtml => dom/base/test/test_bug545644.xhtml
rename : content/base/test/test_bug548463.html => dom/base/test/test_bug548463.html
rename : content/base/test/test_bug553896.xhtml => dom/base/test/test_bug553896.xhtml
rename : content/base/test/test_bug557892.html => dom/base/test/test_bug557892.html
rename : content/base/test/test_bug558726.html => dom/base/test/test_bug558726.html
rename : content/base/test/test_bug559526.html => dom/base/test/test_bug559526.html
rename : content/base/test/test_bug560780.html => dom/base/test/test_bug560780.html
rename : content/base/test/test_bug562137.html => dom/base/test/test_bug562137.html
rename : content/base/test/test_bug562169-1.html => dom/base/test/test_bug562169-1.html
rename : content/base/test/test_bug562169-2.html => dom/base/test/test_bug562169-2.html
rename : content/base/test/test_bug562652.html => dom/base/test/test_bug562652.html
rename : content/base/test/test_bug564047.html => dom/base/test/test_bug564047.html
rename : content/base/test/test_bug564863.xhtml => dom/base/test/test_bug564863.xhtml
rename : content/base/test/test_bug567350.html => dom/base/test/test_bug567350.html
rename : content/base/test/test_bug578096.html => dom/base/test/test_bug578096.html
rename : content/base/test/test_bug585978.html => dom/base/test/test_bug585978.html
rename : content/base/test/test_bug587931.html => dom/base/test/test_bug587931.html
rename : content/base/test/test_bug588990.html => dom/base/test/test_bug588990.html
rename : content/base/test/test_bug590812.html => dom/base/test/test_bug590812.html
rename : content/base/test/test_bug590870.html => dom/base/test/test_bug590870.html
rename : content/base/test/test_bug592366.html => dom/base/test/test_bug592366.html
rename : content/base/test/test_bug592829.html => dom/base/test/test_bug592829.html
rename : content/base/test/test_bug597345.html => dom/base/test/test_bug597345.html
rename : content/base/test/test_bug599588.html => dom/base/test/test_bug599588.html
rename : content/base/test/test_bug601803.html => dom/base/test/test_bug601803.html
rename : content/base/test/test_bug602838.html => dom/base/test/test_bug602838.html
rename : content/base/test/test_bug604592.html => dom/base/test/test_bug604592.html
rename : content/base/test/test_bug604660.html => dom/base/test/test_bug604660.html
rename : content/base/test/test_bug605982.html => dom/base/test/test_bug605982.html
rename : content/base/test/test_bug606729.html => dom/base/test/test_bug606729.html
rename : content/base/test/test_bug614058.html => dom/base/test/test_bug614058.html
rename : content/base/test/test_bug614583.html => dom/base/test/test_bug614583.html
rename : content/base/test/test_bug622088.html => dom/base/test/test_bug622088.html
rename : content/base/test/test_bug622117.html => dom/base/test/test_bug622117.html
rename : content/base/test/test_bug622246.html => dom/base/test/test_bug622246.html
rename : content/base/test/test_bug625722.html => dom/base/test/test_bug625722.html
rename : content/base/test/test_bug626262.html => dom/base/test/test_bug626262.html
rename : content/base/test/test_bug628938.html => dom/base/test/test_bug628938.html
rename : content/base/test/test_bug631615.html => dom/base/test/test_bug631615.html
rename : content/base/test/test_bug638112.html => dom/base/test/test_bug638112.html
rename : content/base/test/test_bug647518.html => dom/base/test/test_bug647518.html
rename : content/base/test/test_bug650001.html => dom/base/test/test_bug650001.html
rename : content/base/test/test_bug656283.html => dom/base/test/test_bug656283.html
rename : content/base/test/test_bug664916.html => dom/base/test/test_bug664916.html
rename : content/base/test/test_bug666604.html => dom/base/test/test_bug666604.html
rename : content/base/test/test_bug675121.html => dom/base/test/test_bug675121.html
rename : content/base/test/test_bug675166.html => dom/base/test/test_bug675166.html
rename : content/base/test/test_bug682463.html => dom/base/test/test_bug682463.html
rename : content/base/test/test_bug682554.html => dom/base/test/test_bug682554.html
rename : content/base/test/test_bug682592.html => dom/base/test/test_bug682592.html
rename : content/base/test/test_bug684671.html => dom/base/test/test_bug684671.html
rename : content/base/test/test_bug685798.html => dom/base/test/test_bug685798.html
rename : content/base/test/test_bug686449.xhtml => dom/base/test/test_bug686449.xhtml
rename : content/base/test/test_bug687859.html => dom/base/test/test_bug687859.html
rename : content/base/test/test_bug690056.html => dom/base/test/test_bug690056.html
rename : content/base/test/test_bug692434.html => dom/base/test/test_bug692434.html
rename : content/base/test/test_bug693615.html => dom/base/test/test_bug693615.html
rename : content/base/test/test_bug693875.html => dom/base/test/test_bug693875.html
rename : content/base/test/test_bug694754.xhtml => dom/base/test/test_bug694754.xhtml
rename : content/base/test/test_bug696301-1.html => dom/base/test/test_bug696301-1.html
rename : content/base/test/test_bug696301-2.html => dom/base/test/test_bug696301-2.html
rename : content/base/test/test_bug698381.html => dom/base/test/test_bug698381.html
rename : content/base/test/test_bug698384.html => dom/base/test/test_bug698384.html
rename : content/base/test/test_bug704063.html => dom/base/test/test_bug704063.html
rename : content/base/test/test_bug707142.html => dom/base/test/test_bug707142.html
rename : content/base/test/test_bug708620.html => dom/base/test/test_bug708620.html
rename : content/base/test/test_bug711047.html => dom/base/test/test_bug711047.html
rename : content/base/test/test_bug711180.html => dom/base/test/test_bug711180.html
rename : content/base/test/test_bug719533.html => dom/base/test/test_bug719533.html
rename : content/base/test/test_bug726364.html => dom/base/test/test_bug726364.html
rename : content/base/test/test_bug737087.html => dom/base/test/test_bug737087.html
rename : content/base/test/test_bug737565.html => dom/base/test/test_bug737565.html
rename : content/base/test/test_bug737612.html => dom/base/test/test_bug737612.html
rename : content/base/test/test_bug738108.html => dom/base/test/test_bug738108.html
rename : content/base/test/test_bug744830.html => dom/base/test/test_bug744830.html
rename : content/base/test/test_bug749367.html => dom/base/test/test_bug749367.html
rename : content/base/test/test_bug753278.html => dom/base/test/test_bug753278.html
rename : content/base/test/test_bug761120.html => dom/base/test/test_bug761120.html
rename : content/base/test/test_bug782342.html => dom/base/test/test_bug782342.html
rename : content/base/test/test_bug787778.html => dom/base/test/test_bug787778.html
rename : content/base/test/test_bug789856.html => dom/base/test/test_bug789856.html
rename : content/base/test/test_bug804395.html => dom/base/test/test_bug804395.html
rename : content/base/test/test_bug809003.html => dom/base/test/test_bug809003.html
rename : content/base/test/test_bug810494.html => dom/base/test/test_bug810494.html
rename : content/base/test/test_bug811701.html => dom/base/test/test_bug811701.html
rename : content/base/test/test_bug811701.xhtml => dom/base/test/test_bug811701.xhtml
rename : content/base/test/test_bug813919.html => dom/base/test/test_bug813919.html
rename : content/base/test/test_bug814576.html => dom/base/test/test_bug814576.html
rename : content/base/test/test_bug819051.html => dom/base/test/test_bug819051.html
rename : content/base/test/test_bug820909.html => dom/base/test/test_bug820909.html
rename : content/base/test/test_bug827160.html => dom/base/test/test_bug827160.html
rename : content/base/test/test_bug840098.html => dom/base/test/test_bug840098.html
rename : content/base/test/test_bug864595.html => dom/base/test/test_bug864595.html
rename : content/base/test/test_bug868999.html => dom/base/test/test_bug868999.html
rename : content/base/test/test_bug869000.html => dom/base/test/test_bug869000.html
rename : content/base/test/test_bug869002.html => dom/base/test/test_bug869002.html
rename : content/base/test/test_bug869006.html => dom/base/test/test_bug869006.html
rename : content/base/test/test_bug876282.html => dom/base/test/test_bug876282.html
rename : content/base/test/test_bug890580.html => dom/base/test/test_bug890580.html
rename : content/base/test/test_bug891952.html => dom/base/test/test_bug891952.html
rename : content/base/test/test_bug894874.html => dom/base/test/test_bug894874.html
rename : content/base/test/test_bug895239.html => dom/base/test/test_bug895239.html
rename : content/base/test/test_bug895974.html => dom/base/test/test_bug895974.html
rename : content/base/test/test_bug902847.html => dom/base/test/test_bug902847.html
rename : content/base/test/test_bug907892.html => dom/base/test/test_bug907892.html
rename : content/base/test/test_bug922681.html => dom/base/test/test_bug922681.html
rename : content/base/test/test_bug927196.html => dom/base/test/test_bug927196.html
rename : content/base/test/test_bug945152.html => dom/base/test/test_bug945152.html
rename : content/base/test/test_bug982153.html => dom/base/test/test_bug982153.html
rename : content/base/test/test_caretPositionFromPoint.html => dom/base/test/test_caretPositionFromPoint.html
rename : content/base/test/test_child_process_shutdown_message.html => dom/base/test/test_child_process_shutdown_message.html
rename : content/base/test/test_classList.html => dom/base/test/test_classList.html
rename : content/base/test/test_copyimage.html => dom/base/test/test_copyimage.html
rename : content/base/test/test_copypaste.html => dom/base/test/test_copypaste.html
rename : content/base/test/test_copypaste.xhtml => dom/base/test/test_copypaste.xhtml
rename : content/base/test/test_copypaste.xul => dom/base/test/test_copypaste.xul
rename : content/base/test/test_createHTMLDocument.html => dom/base/test/test_createHTMLDocument.html
rename : content/base/test/test_declare_stylesheet_obsolete.html => dom/base/test/test_declare_stylesheet_obsolete.html
rename : content/base/test/test_document_constructor.html => dom/base/test/test_document_constructor.html
rename : content/base/test/test_domparser_null_char.html => dom/base/test/test_domparser_null_char.html
rename : content/base/test/test_domparsing.html => dom/base/test/test_domparsing.html
rename : content/base/test/test_element.matches.html => dom/base/test/test_element.matches.html
rename : content/base/test/test_elementTraversal.html => dom/base/test/test_elementTraversal.html
rename : content/base/test/test_element_closest.html => dom/base/test/test_element_closest.html
rename : content/base/test/test_encodeToStringWithMaxLength.html => dom/base/test/test_encodeToStringWithMaxLength.html
rename : content/base/test/test_file_from_blob.html => dom/base/test/test_file_from_blob.html
rename : content/base/test/test_fileapi.html => dom/base/test/test_fileapi.html
rename : content/base/test/test_fileapi_slice.html => dom/base/test/test_fileapi_slice.html
rename : content/base/test/test_getElementById.html => dom/base/test/test_getElementById.html
rename : content/base/test/test_html_colors_quirks.html => dom/base/test/test_html_colors_quirks.html
rename : content/base/test/test_html_colors_standards.html => dom/base/test/test_html_colors_standards.html
rename : content/base/test/test_html_in_xhr.html => dom/base/test/test_html_in_xhr.html
rename : content/base/test/test_htmlcopyencoder.html => dom/base/test/test_htmlcopyencoder.html
rename : content/base/test/test_htmlcopyencoder.xhtml => dom/base/test/test_htmlcopyencoder.xhtml
rename : content/base/test/test_ipc_messagemanager_blob.html => dom/base/test/test_ipc_messagemanager_blob.html
rename : content/base/test/test_messagemanager_assertpermission.html => dom/base/test/test_messagemanager_assertpermission.html
rename : content/base/test/test_messagemanager_principal.html => dom/base/test/test_messagemanager_principal.html
rename : content/base/test/test_messagemanager_send_principal.html => dom/base/test/test_messagemanager_send_principal.html
rename : content/base/test/test_meta_viewport0.html => dom/base/test/test_meta_viewport0.html
rename : content/base/test/test_meta_viewport1.html => dom/base/test/test_meta_viewport1.html
rename : content/base/test/test_meta_viewport2.html => dom/base/test/test_meta_viewport2.html
rename : content/base/test/test_meta_viewport3.html => dom/base/test/test_meta_viewport3.html
rename : content/base/test/test_meta_viewport4.html => dom/base/test/test_meta_viewport4.html
rename : content/base/test/test_meta_viewport5.html => dom/base/test/test_meta_viewport5.html
rename : content/base/test/test_meta_viewport6.html => dom/base/test/test_meta_viewport6.html
rename : content/base/test/test_mixed_content_blocker.html => dom/base/test/test_mixed_content_blocker.html
rename : content/base/test/test_mixed_content_blocker_bug803225.html => dom/base/test/test_mixed_content_blocker_bug803225.html
rename : content/base/test/test_mixed_content_blocker_frameNavigation.html => dom/base/test/test_mixed_content_blocker_frameNavigation.html
rename : content/base/test/test_mozMatchesSelector.html => dom/base/test/test_mozMatchesSelector.html
rename : content/base/test/test_mozfiledataurl.html => dom/base/test/test_mozfiledataurl.html
rename : content/base/test/test_mutationobservers.html => dom/base/test/test_mutationobservers.html
rename : content/base/test/test_nodelist_holes.html => dom/base/test/test_nodelist_holes.html
rename : content/base/test/test_object.html => dom/base/test/test_object.html
rename : content/base/test/test_plugin_freezing.html => dom/base/test/test_plugin_freezing.html
rename : content/base/test/test_processing_instruction_update_stylesheet.xhtml => dom/base/test/test_processing_instruction_update_stylesheet.xhtml
rename : content/base/test/test_progress_events_for_gzip_data.html => dom/base/test/test_progress_events_for_gzip_data.html
rename : content/base/test/test_range_bounds.html => dom/base/test/test_range_bounds.html
rename : content/base/test/test_reentrant_flush.html => dom/base/test/test_reentrant_flush.html
rename : content/base/test/test_sync_xhr_timer.xhtml => dom/base/test/test_sync_xhr_timer.xhtml
rename : content/base/test/test_text_wholeText.html => dom/base/test/test_text_wholeText.html
rename : content/base/test/test_textnode_normalize_in_selection.html => dom/base/test/test_textnode_normalize_in_selection.html
rename : content/base/test/test_textnode_split_in_selection.html => dom/base/test/test_textnode_split_in_selection.html
rename : content/base/test/test_title.html => dom/base/test/test_title.html
rename : content/base/test/test_treewalker_nextsibling.xml => dom/base/test/test_treewalker_nextsibling.xml
rename : content/base/test/test_user_select.html => dom/base/test/test_user_select.html
rename : content/base/test/test_viewport_scroll.html => dom/base/test/test_viewport_scroll.html
rename : content/base/test/test_viewsource_forbidden_in_object.html => dom/base/test/test_viewsource_forbidden_in_object.html
rename : content/base/test/test_w3element_traversal.html => dom/base/test/test_w3element_traversal.html
rename : content/base/test/test_w3element_traversal.xhtml => dom/base/test/test_w3element_traversal.xhtml
rename : content/base/test/test_w3element_traversal_svg.html => dom/base/test/test_w3element_traversal_svg.html
rename : content/base/test/test_warning_for_blocked_cross_site_request.html => dom/base/test/test_warning_for_blocked_cross_site_request.html
rename : content/base/test/test_websocket.html => dom/base/test/test_websocket.html
rename : content/base/test/test_websocket_basic.html => dom/base/test/test_websocket_basic.html
rename : content/base/test/test_websocket_hello.html => dom/base/test/test_websocket_hello.html
rename : content/base/test/test_x-frame-options.html => dom/base/test/test_x-frame-options.html
rename : content/base/test/test_xbl_userdata.xhtml => dom/base/test/test_xbl_userdata.xhtml
rename : content/base/test/test_xhr_abort_after_load.html => dom/base/test/test_xhr_abort_after_load.html
rename : content/base/test/test_xhr_forbidden_headers.html => dom/base/test/test_xhr_forbidden_headers.html
rename : content/base/test/test_xhr_progressevents.html => dom/base/test/test_xhr_progressevents.html
rename : content/base/test/test_xhr_send_readystate.html => dom/base/test/test_xhr_send_readystate.html
rename : content/base/test/test_xhr_withCredentials.html => dom/base/test/test_xhr_withCredentials.html
rename : content/base/test/unit/1_original.xml => dom/base/test/unit/1_original.xml
rename : content/base/test/unit/1_result.xml => dom/base/test/unit/1_result.xml
rename : content/base/test/unit/2_original.xml => dom/base/test/unit/2_original.xml
rename : content/base/test/unit/2_result_1.xml => dom/base/test/unit/2_result_1.xml
rename : content/base/test/unit/2_result_2.xml => dom/base/test/unit/2_result_2.xml
rename : content/base/test/unit/2_result_3.xml => dom/base/test/unit/2_result_3.xml
rename : content/base/test/unit/2_result_4.xml => dom/base/test/unit/2_result_4.xml
rename : content/base/test/unit/3_original.xml => dom/base/test/unit/3_original.xml
rename : content/base/test/unit/3_result.xml => dom/base/test/unit/3_result.xml
rename : content/base/test/unit/3_result_2.xml => dom/base/test/unit/3_result_2.xml
rename : content/base/test/unit/4_original.xml => dom/base/test/unit/4_original.xml
rename : content/base/test/unit/4_result_1.xml => dom/base/test/unit/4_result_1.xml
rename : content/base/test/unit/4_result_2.xml => dom/base/test/unit/4_result_2.xml
rename : content/base/test/unit/4_result_3.xml => dom/base/test/unit/4_result_3.xml
rename : content/base/test/unit/4_result_4.xml => dom/base/test/unit/4_result_4.xml
rename : content/base/test/unit/4_result_5.xml => dom/base/test/unit/4_result_5.xml
rename : content/base/test/unit/4_result_6.xml => dom/base/test/unit/4_result_6.xml
rename : content/base/test/unit/head_utilities.js => dom/base/test/unit/head_utilities.js
rename : content/base/test/unit/test_bug553888.js => dom/base/test/unit/test_bug553888.js
rename : content/base/test/unit/test_bug737966.js => dom/base/test/unit/test_bug737966.js
rename : content/base/test/unit/test_cspreports.js => dom/base/test/unit/test_cspreports.js
rename : content/base/test/unit/test_error_codes.js => dom/base/test/unit/test_error_codes.js
rename : content/base/test/unit/test_thirdpartyutil.js => dom/base/test/unit/test_thirdpartyutil.js
rename : content/base/test/unit/test_xhr_document.js => dom/base/test/unit/test_xhr_document.js
rename : content/base/test/unit/test_xhr_standalone.js => dom/base/test/unit/test_xhr_standalone.js
rename : content/base/test/unit/test_xmlserializer.js => dom/base/test/unit/test_xmlserializer.js
rename : content/base/test/unit/xpcshell.ini => dom/base/test/unit/xpcshell.ini
rename : content/base/test/unit_ipc/test_bug553888_wrap.js => dom/base/test/unit_ipc/test_bug553888_wrap.js
rename : content/base/test/unit_ipc/test_xhr_document_ipc.js => dom/base/test/unit_ipc/test_xhr_document_ipc.js
rename : content/base/test/unit_ipc/xpcshell.ini => dom/base/test/unit_ipc/xpcshell.ini
rename : content/base/test/variable_style_sheet.sjs => dom/base/test/variable_style_sheet.sjs
rename : content/base/test/viewport_helpers.js => dom/base/test/viewport_helpers.js
rename : content/base/test/w3element_traversal.svg => dom/base/test/w3element_traversal.svg
rename : content/base/test/websocket_hybi/file_binary-frames_wsh.py => dom/base/test/websocket_hybi/file_binary-frames_wsh.py
rename : content/base/test/websocket_hybi/file_check-binary-messages_wsh.py => dom/base/test/websocket_hybi/file_check-binary-messages_wsh.py
rename : content/base/test/websocket_hybi/mochitest.ini => dom/base/test/websocket_hybi/mochitest.ini
rename : content/base/test/websocket_hybi/test_receive-arraybuffer.html => dom/base/test/websocket_hybi/test_receive-arraybuffer.html
rename : content/base/test/websocket_hybi/test_receive-blob.html => dom/base/test/websocket_hybi/test_receive-blob.html
rename : content/base/test/websocket_hybi/test_send-arraybuffer.html => dom/base/test/websocket_hybi/test_send-arraybuffer.html
rename : content/base/test/websocket_hybi/test_send-blob.html => dom/base/test/websocket_hybi/test_send-blob.html
rename : content/base/test/wholeTexty-helper.xml => dom/base/test/wholeTexty-helper.xml
---
 accessible/generic/moz.build                  |   2 +-
 accessible/windows/msaa/moz.build             |   2 +-
 b2g/installer/package-manifest.in             |   1 -
 browser/installer/package-manifest.in         |   1 -
 .../content/library/SelectionPrototype.js     |  10 +-
 content/base/crashtests/crashtests.list       | 155 ----
 content/base/moz.build                        |   8 -
 content/base/public/moz.build                 |  81 ---
 content/base/src/moz.build                    | 232 ------
 content/base/test/bug461735-redirect1.sjs     |   4 -
 content/base/test/bug461735-redirect2.sjs     |   4 -
 content/base/test/chrome.ini                  |   7 -
 .../test/csp/file_bug836922_npolicies.html    |  15 -
 .../file_bug836922_npolicies.html^headers^    |   2 -
 content/base/test/csp/file_bug886164.html     |  15 -
 content/base/test/csp/file_bug886164_3.html   |  12 -
 content/base/test/csp/file_bug886164_4.html   |  12 -
 ..._regression_from_multipolicy.html^headers^ |   1 -
 content/base/test/file_XHR_fail1.txt^headers^ |   2 -
 .../base/test/file_x-frame-options_main.html  |  44 --
 content/base/test/mochitest.ini               | 666 ------------------
 content/moz.build                             |   4 -
 content/test/reftest/reftest.list             |   2 -
 docshell/base/moz.build                       |   1 -
 {content/base/src => dom/base}/Attr.cpp       |   0
 {content/base/src => dom/base}/Attr.h         |   0
 .../src => dom/base}/AutocompleteFieldList.h  |   0
 {content/base/public => dom/base}/BlobSet.h   |   0
 {content/base/public => dom/base}/CORSMode.h  |   0
 .../base/src => dom/base}/ChildIterator.cpp   |   0
 .../base/src => dom/base}/ChildIterator.h     |   0
 {content/base/src => dom/base}/Comment.cpp    |   0
 {content/base/src => dom/base}/Comment.h      |   0
 .../src => dom/base}/DOMImplementation.cpp    |   0
 .../base/src => dom/base}/DOMImplementation.h |   0
 {content/base/src => dom/base}/DOMMatrix.cpp  |   0
 {content/base/src => dom/base}/DOMMatrix.h    |   0
 {content/base/src => dom/base}/DOMParser.cpp  |   0
 {content/base/src => dom/base}/DOMParser.h    |   0
 {content/base/src => dom/base}/DOMPoint.cpp   |   0
 {content/base/src => dom/base}/DOMPoint.h     |   0
 {content/base/src => dom/base}/DOMQuad.cpp    |   0
 {content/base/src => dom/base}/DOMQuad.h      |   0
 {content/base/src => dom/base}/DOMRect.cpp    |   0
 {content/base/src => dom/base}/DOMRect.h      |   0
 .../base/src => dom/base}/DOMStringList.cpp   |   0
 .../base/src => dom/base}/DOMStringList.h     |   0
 .../src => dom/base}/DirectionalityUtils.cpp  |   0
 .../public => dom/base}/DirectionalityUtils.h |   0
 .../src => dom/base}/DocumentFragment.cpp     |   0
 .../base/src => dom/base}/DocumentFragment.h  |   0
 .../base/src => dom/base}/DocumentType.cpp    |   0
 {content/base/src => dom/base}/DocumentType.h |   0
 {content/base/src => dom/base}/Element.cpp    |   0
 {content/base/public => dom/base}/Element.h   |   0
 .../base/public => dom/base}/ElementInlines.h |   0
 .../base/src => dom/base}/EventSource.cpp     |   0
 {content/base/src => dom/base}/EventSource.h  |   0
 .../base/src => dom/base}/FeedWriterEnabled.h |   0
 {content/base/src => dom/base}/File.cpp       |   0
 {content/base/public => dom/base}/File.h      |   0
 .../base/src => dom/base}/FileIOObject.cpp    |   0
 {content/base/src => dom/base}/FileIOObject.h |   0
 .../src => dom/base}/FragmentOrElement.cpp    |   0
 .../public => dom/base}/FragmentOrElement.h   |   0
 .../base/public => dom/base}/FromParser.h     |   0
 .../base}/HTMLSplitOnSpacesTokenizer.h        |   0
 .../base/src => dom/base}/ImportManager.cpp   |   0
 .../base/src => dom/base}/ImportManager.h     |   0
 {content/base/src => dom/base}/Link.cpp       |   0
 {content/base/src => dom/base}/Link.h         |   0
 .../src => dom/base}/MultipartFileImpl.cpp    |   0
 .../base/src => dom/base}/MultipartFileImpl.h |   0
 .../base/src => dom/base}/NodeIterator.cpp    |   0
 {content/base/src => dom/base}/NodeIterator.h |   0
 .../base}/ResponsiveImageSelector.cpp         |   0
 .../base}/ResponsiveImageSelector.h           |   0
 {content/base/src => dom/base}/ShadowRoot.cpp |   0
 {content/base/src => dom/base}/ShadowRoot.h   |   0
 .../base/src => dom/base}/StyleSheetList.cpp  |   0
 .../base/src => dom/base}/StyleSheetList.h    |   0
 {content/base/src => dom/base}/Text.cpp       |   0
 {content/base/src => dom/base}/Text.h         |   0
 .../base/src => dom/base}/ThirdPartyUtil.cpp  |   0
 .../base/src => dom/base}/ThirdPartyUtil.h    |   0
 {content/base/src => dom/base}/TreeWalker.cpp |   0
 {content/base/src => dom/base}/TreeWalker.h   |   0
 {content/base/src => dom/base}/WebSocket.cpp  |   0
 {content/base/src => dom/base}/WebSocket.h    |   0
 .../base}/contentAreaDropListener.js          |   0
 .../base}/contentAreaDropListener.manifest    |   0
 .../base/crashtests/1024428-1.html            |   0
 {content => dom}/base/crashtests/1026714.html |   0
 .../base/crashtests/1027461-1.html            |   0
 .../base/crashtests/1027461-inner.xul         |   0
 .../base/crashtests/116848-1.html             |   0
 .../base/crashtests/149320-1.html             |   0
 .../base/crashtests/205225-1.html             |   0
 .../base/crashtests/231475-1.html             |   0
 .../base/crashtests/293388-1.html             |   0
 {content => dom}/base/crashtests/308120-1.xul |   0
 .../base/crashtests/324871-1.html             |   0
 .../base/crashtests/325730-1.html             |   0
 .../base/crashtests/326618-1.html             |   0
 .../base/crashtests/326646-1.html             |   0
 {content => dom}/base/crashtests/326778-1.xul |   0
 .../base/crashtests/326865-1.html             |   0
 {content => dom}/base/crashtests/327694.html  |   0
 .../base/crashtests/330925-1.xhtml            |   0
 .../base/crashtests/336381-1.xhtml            |   0
 .../base/crashtests/336715-1.xhtml            |   0
 .../base/crashtests/338391-1.xhtml            |   0
 .../base/crashtests/340733-1.html             |   0
 .../base/crashtests/343730-1.xhtml            |   0
 .../base/crashtests/343850-1.xhtml            |   0
 .../base/crashtests/343889-1.html             |   0
 .../base/crashtests/344434-1.xhtml            |   0
 .../base/crashtests/344882-1.html             |   0
 .../base/crashtests/345837-1.xhtml            |   0
 .../base/crashtests/348049-1.xhtml            |   0
 .../base/crashtests/349355-1.html             |   0
 {content => dom}/base/crashtests/354645-1.xul |   0
 .../base/crashtests/360599-1.html             |   0
 .../base/crashtests/366200-1.xhtml            |   0
 .../base/crashtests/371466-1.xhtml            |   0
 .../base/crashtests/377360-1.xhtml            |   0
 .../base/crashtests/377960-1.html             |   0
 .../base/crashtests/377960-2.html             |   0
 .../base/crashtests/384663-1-inner.xul        |   0
 .../base/crashtests/384663-1.html             |   0
 .../base/crashtests/386000-1.html             |   0
 .../base/crashtests/386794-1.html             |   0
 .../base/crashtests/387460-1-inner.xhtml      |   0
 .../base/crashtests/387460-1.html             |   0
 .../base/crashtests/395469-1.xhtml            |   0
 .../base/crashtests/395469-2.xhtml            |   0
 {content => dom}/base/crashtests/398088-1.xul |   0
 .../base/crashtests/399712-1.html             |   0
 .../base/crashtests/400763-1.html             |   0
 .../base/crashtests/401993-1.html             |   0
 {content => dom}/base/crashtests/401993-1.xml |   0
 {content => dom}/base/crashtests/407818.html  |   0
 {content => dom}/base/crashtests/410860-1.xml |   0
 .../base/crashtests/411882-1.xhtml            |   0
 .../base/crashtests/416734-1.html             |   0
 .../base/crashtests/418928-1.html             |   0
 .../base/crashtests/420620-1.html             |   0
 .../base/crashtests/424276-1.html             |   0
 .../base/crashtests/426987-1.html             |   0
 {content => dom}/base/crashtests/43040-1.html |   0
 {content => dom}/base/crashtests/443538-1.svg |   0
 .../base/crashtests/448615-1.html             |   0
 .../base/crashtests/450383-1.html             |   0
 .../base/crashtests/450385-1.html             |   0
 .../base/crashtests/458637-1-inner.xhtml      |   0
 .../base/crashtests/458637-1.html             |   0
 {content => dom}/base/crashtests/467392.html  |   0
 .../base/crashtests/472593-1.html             |   0
 {content => dom}/base/crashtests/474041-1.svg |   0
 .../base/crashtests/483818-1.html             |   0
 .../base/crashtests/490760-1.xhtml            |   0
 .../base/crashtests/493281-1.html             |   0
 .../base/crashtests/493281-2.html             |   0
 .../base/crashtests/494810-1.html             |   0
 .../base/crashtests/509536-1.html             |   0
 .../base/crashtests/522516-1.html             |   0
 {content => dom}/base/crashtests/529670.html  |   0
 .../base/crashtests/535926-1.html             |   0
 {content => dom}/base/crashtests/543645.html  |   0
 .../base/crashtests/551631-1.html             |   0
 {content => dom}/base/crashtests/552651.html  |   0
 {content => dom}/base/crashtests/552651.xml   |   0
 .../base/crashtests/554230-1.xhtml            |   0
 {content => dom}/base/crashtests/558973.html  |   0
 .../base/crashtests/561981-1-iframe.xhtml     |   0
 .../base/crashtests/561981-1.html             |   0
 .../base/crashtests/561981-2-iframe.xhtml     |   0
 .../base/crashtests/561981-2.html             |   0
 .../base/crashtests/564079-1.html             |   0
 {content => dom}/base/crashtests/564114.html  |   0
 .../base/crashtests/565125-1.html             |   0
 {content => dom}/base/crashtests/575462.svg   |   0
 {content => dom}/base/crashtests/582601.html  |   0
 .../base/crashtests/590395-1.html             |   0
 .../base/crashtests/593302-1.html             |   0
 .../base/crashtests/593302-2.html             |   0
 .../base/crashtests/595606-1.html             |   0
 .../base/crashtests/595606-2.html             |   0
 .../base/crashtests/604262-1.html             |   0
 {content => dom}/base/crashtests/605672-1.svg |   0
 .../base/crashtests/606729-1.html             |   0
 .../base/crashtests/610571-1.html             |   0
 .../base/crashtests/628599-1.html             |   0
 {content => dom}/base/crashtests/637214-1.svg |   0
 {content => dom}/base/crashtests/637214-2.svg |   0
 .../base/crashtests/642022-1.html             |   0
 {content => dom}/base/crashtests/646184.html  |   0
 {content => dom}/base/crashtests/658845-1.svg |   0
 .../base/crashtests/667336-1.html             |   0
 {content => dom}/base/crashtests/679459.html  |   0
 .../base/crashtests/679689-1.html             |   0
 {content => dom}/base/crashtests/682463.html  |   0
 {content => dom}/base/crashtests/693212.xhtml |   0
 .../base/crashtests/698974-1.html             |   0
 .../base/crashtests/700090-1.html             |   0
 .../base/crashtests/700090-2.html             |   0
 .../base/crashtests/700512-worker.js          |   0
 {content => dom}/base/crashtests/700512.html  |   0
 {content => dom}/base/crashtests/709384.html  |   0
 {content => dom}/base/crashtests/709954.html  |   0
 .../base/crashtests/713417-2.html             |   0
 {content => dom}/base/crashtests/713417.html  |   0
 {content => dom}/base/crashtests/715056.html  |   0
 .../base/crashtests/741163-1.html             |   0
 .../base/crashtests/752226-1.html             |   0
 .../base/crashtests/752226-2.html             |   0
 {content => dom}/base/crashtests/766426.html  |   0
 {content => dom}/base/crashtests/771639.html  |   0
 {content => dom}/base/crashtests/786854.html  |   0
 {content => dom}/base/crashtests/815043.html  |   0
 {content => dom}/base/crashtests/815276.html  |   0
 {content => dom}/base/crashtests/815477.html  |   0
 {content => dom}/base/crashtests/815500.html  |   0
 {content => dom}/base/crashtests/816253.html  |   0
 {content => dom}/base/crashtests/819014.html  |   0
 {content => dom}/base/crashtests/822691.html  |   0
 {content => dom}/base/crashtests/822723.html  |   0
 {content => dom}/base/crashtests/824719.html  |   0
 {content => dom}/base/crashtests/827190.html  |   0
 {content => dom}/base/crashtests/828054.html  |   0
 .../base/crashtests/828903-iframe.html        |   0
 {content => dom}/base/crashtests/828903.html  |   0
 {content => dom}/base/crashtests/829428.html  |   0
 {content => dom}/base/crashtests/830098.html  |   0
 {content => dom}/base/crashtests/831287.html  |   0
 {content => dom}/base/crashtests/832644.html  |   0
 {content => dom}/base/crashtests/836890.html  |   0
 .../base/crashtests/838489-1.html             |   0
 .../base/crashtests/838489-2.html             |   0
 {content => dom}/base/crashtests/841205.html  |   0
 {content => dom}/base/crashtests/844404.html  |   0
 .../base/crashtests/845093-1.html             |   0
 .../base/crashtests/845093-2.html             |   0
 {content => dom}/base/crashtests/847127.html  |   0
 {content => dom}/base/crashtests/849601.html  |   0
 {content => dom}/base/crashtests/849727.html  |   0
 {content => dom}/base/crashtests/849732.html  |   0
 .../base/crashtests/851353-1.html             |   0
 {content => dom}/base/crashtests/863950.html  |   0
 {content => dom}/base/crashtests/864448.html  |   0
 {content => dom}/base/crashtests/930250.html  |   0
 {content => dom}/base/crashtests/942979.html  |   0
 {content => dom}/base/crashtests/978646.html  |   0
 dom/base/crashtests/crashtests.list           | 163 ++++-
 .../base/crashtests/xhr_abortinprogress.html  |   0
 .../base/crashtests/xhr_empty_datauri.html    |   0
 .../crashtests/xhr_html_nullresponse.html     |   0
 .../src => dom/base}/messageWakeupService.js  |   0
 .../base}/messageWakeupService.manifest       |   0
 dom/base/moz.build                            | 272 ++++++-
 .../base/src => dom/base}/mozAutoDocUpdate.h  |   0
 .../base/public => dom/base}/mozFlushType.h   |   0
 .../base/src => dom/base}/nsAtomListUtils.cpp |   0
 .../base/src => dom/base}/nsAtomListUtils.h   |   0
 .../src => dom/base}/nsAttrAndChildArray.cpp  |   0
 .../src => dom/base}/nsAttrAndChildArray.h    |   0
 {content/base/src => dom/base}/nsAttrName.h   |   0
 .../base/src => dom/base}/nsAttrValue.cpp     |   0
 {content/base/src => dom/base}/nsAttrValue.h  |   0
 .../src => dom/base}/nsAttrValueInlines.h     |   0
 .../src => dom/base}/nsAttrValueOrString.cpp  |   0
 .../src => dom/base}/nsAttrValueOrString.h    |   0
 .../base}/nsCCUncollectableMarker.cpp         |   0
 .../base}/nsCCUncollectableMarker.h           |   0
 .../base/src => dom/base}/nsCSPContext.cpp    |   0
 {content/base/src => dom/base}/nsCSPContext.h |   0
 .../base/src => dom/base}/nsCSPParser.cpp     |   0
 {content/base/src => dom/base}/nsCSPParser.h  |   0
 .../base/src => dom/base}/nsCSPService.cpp    |   0
 {content/base/src => dom/base}/nsCSPService.h |   0
 {content/base/src => dom/base}/nsCSPUtils.cpp |   0
 {content/base/src => dom/base}/nsCSPUtils.h   |   0
 .../public => dom/base}/nsCaseTreatment.h     |   0
 .../base}/nsContentAreaDragDrop.cpp           |   0
 .../src => dom/base}/nsContentAreaDragDrop.h  |   0
 .../base/public => dom/base}/nsContentCID.h   |   0
 .../base}/nsContentCreatorFunctions.h         |   0
 .../src => dom/base}/nsContentIterator.cpp    |   0
 .../base/src => dom/base}/nsContentList.cpp   |   0
 .../base/src => dom/base}/nsContentList.h     |   0
 .../base}/nsContentListDeclarations.h         |   0
 .../base/src => dom/base}/nsContentPolicy.cpp |   0
 .../base/src => dom/base}/nsContentPolicy.h   |   0
 .../base}/nsContentPolicyUtils.h              |   0
 .../base/src => dom/base}/nsContentSink.cpp   |   0
 .../base/src => dom/base}/nsContentSink.h     |   0
 .../public => dom/base}/nsContentTypeParser.h |   0
 .../base/src => dom/base}/nsContentUtils.cpp  |   0
 .../base/public => dom/base}/nsContentUtils.h |   0
 .../base/src => dom/base}/nsCopySupport.cpp   |   0
 .../base/public => dom/base}/nsCopySupport.h  |   0
 .../base}/nsCrossSiteListenerProxy.cpp        |   0
 .../base}/nsCrossSiteListenerProxy.h          |   0
 .../src => dom/base}/nsDOMAttributeMap.cpp    |   0
 .../base/src => dom/base}/nsDOMAttributeMap.h |   0
 .../src => dom/base}/nsDOMCaretPosition.cpp   |   0
 .../src => dom/base}/nsDOMCaretPosition.h     |   0
 .../src => dom/base}/nsDOMDataChannel.cpp     |   0
 .../base/src => dom/base}/nsDOMDataChannel.h  |   0
 .../base}/nsDOMDataChannelDeclarations.h      |   0
 .../base/src => dom/base}/nsDOMFileReader.cpp |   0
 .../base/src => dom/base}/nsDOMFileReader.h   |   0
 .../base}/nsDOMMutationObserver.cpp           |   0
 .../src => dom/base}/nsDOMMutationObserver.h  |   0
 .../base/src => dom/base}/nsDOMSerializer.cpp |   0
 .../base/src => dom/base}/nsDOMSerializer.h   |   0
 .../base}/nsDOMSettableTokenList.cpp          |   0
 .../src => dom/base}/nsDOMSettableTokenList.h |   0
 .../base/src => dom/base}/nsDOMTokenList.cpp  |   0
 .../base/src => dom/base}/nsDOMTokenList.h    |   0
 .../base}/nsDataDocumentContentPolicy.cpp     |   0
 .../base}/nsDataDocumentContentPolicy.h       |   0
 .../base}/nsDeprecatedOperationList.h         |   0
 .../nsDocElementCreatedNotificationRunner.h   |   0
 {content/base/src => dom/base}/nsDocument.cpp |   0
 {content/base/src => dom/base}/nsDocument.h   |   0
 .../src => dom/base}/nsDocumentEncoder.cpp    |   0
 .../base}/nsElementFrameLoaderOwner.cpp       |   0
 .../base}/nsElementFrameLoaderOwner.h         |   0
 {content/base/src => dom/base}/nsFormData.cpp |   0
 {content/base/src => dom/base}/nsFormData.h   |   0
 .../base/src => dom/base}/nsFrameLoader.cpp   |   0
 .../base/src => dom/base}/nsFrameLoader.h     |   0
 .../base}/nsFrameMessageManager.cpp           |   0
 .../src => dom/base}/nsFrameMessageManager.h  |   0
 .../src => dom/base}/nsGenConImageContent.cpp |   0
 .../src => dom/base}/nsGenericDOMDataNode.cpp |   0
 .../src => dom/base}/nsGenericDOMDataNode.h   |   0
 {content/base/src => dom/base}/nsGkAtomList.h |   0
 {content/base/src => dom/base}/nsGkAtoms.cpp  |   0
 {content/base/src => dom/base}/nsGkAtoms.h    |   0
 .../base}/nsHTMLContentSerializer.cpp         |   0
 .../base}/nsHTMLContentSerializer.h           |   0
 .../base}/nsHostObjectProtocolHandler.cpp     |   0
 .../base}/nsHostObjectProtocolHandler.h       |   0
 .../base/src => dom/base}/nsHostObjectURI.cpp |   0
 .../base/src => dom/base}/nsHostObjectURI.h   |   0
 .../base/public => dom/base}/nsIAttribute.h   |   0
 .../base/public => dom/base}/nsIContent.h     |   0
 .../public => dom/base}/nsIContentInlines.h   |   0
 .../public => dom/base}/nsIContentIterator.h  |   0
 .../public => dom/base}/nsIContentPolicy.idl  |   0
 .../base}/nsIContentSecurityPolicy.idl        |   0
 .../base}/nsIContentSerializer.h              |   0
 .../public => dom/base}/nsIDOMDataChannel.idl |   0
 .../base/public => dom/base}/nsIDOMFile.idl   |   0
 .../public => dom/base}/nsIDOMFileList.idl    |   0
 .../public => dom/base}/nsIDOMFileReader.idl  |   0
 .../public => dom/base}/nsIDOMFormData.idl    |   0
 .../base/public => dom/base}/nsIDOMParser.idl |   0
 .../public => dom/base}/nsIDOMSerializer.idl  |   0
 .../base/public => dom/base}/nsIDocument.h    |   0
 .../base}/nsIDocumentEncoder.idl              |   0
 .../public => dom/base}/nsIDocumentInlines.h  |   0
 .../public => dom/base}/nsIDocumentObserver.h |   0
 .../base}/nsIDroppedLinkHandler.idl           |   0
 .../public => dom/base}/nsIFrameLoader.idl    |   0
 .../base}/nsIImageLoadingContent.idl          |   0
 .../public => dom/base}/nsIMessageManager.idl |   0
 .../public => dom/base}/nsIMutationObserver.h |   0
 {content/base/src => dom/base}/nsINode.cpp    |   0
 {content/base/public => dom/base}/nsINode.h   |   0
 .../base/public => dom/base}/nsINodeList.h    |   0
 .../base}/nsIObjectLoadingContent.idl         |   0
 .../public => dom/base}/nsIScriptElement.h    |   0
 .../base}/nsIScriptLoaderObserver.idl         |   0
 .../base/public => dom/base}/nsISelection.idl |   0
 .../base}/nsISelectionController.idl          |   0
 .../base}/nsISelectionDisplay.idl             |   0
 .../base}/nsISelectionListener.idl            |   0
 .../base}/nsISelectionPrivate.idl             |   0
 .../base}/nsIStyleSheetLinkingElement.h       |   0
 .../public => dom/base}/nsIXMLHttpRequest.idl |   0
 .../base}/nsImageLoadingContent.cpp           |   0
 .../src => dom/base}/nsImageLoadingContent.h  |   0
 .../base}/nsInProcessTabChildGlobal.cpp       |   0
 .../base}/nsInProcessTabChildGlobal.h         |   0
 .../base/src => dom/base}/nsLineBreaker.cpp   |   0
 .../base/public => dom/base}/nsLineBreaker.h  |   0
 .../base}/nsMappedAttributeElement.cpp        |   0
 .../base}/nsMappedAttributeElement.h          |   0
 .../src => dom/base}/nsMappedAttributes.cpp   |   0
 .../src => dom/base}/nsMappedAttributes.h     |   0
 .../base}/nsMixedContentBlocker.cpp           |   0
 .../src => dom/base}/nsMixedContentBlocker.h  |   0
 .../src => dom/base}/nsNameSpaceManager.cpp   |   0
 .../public => dom/base}/nsNameSpaceManager.h  |   0
 .../base}/nsNoDataProtocolContentPolicy.cpp   |   0
 .../base}/nsNoDataProtocolContentPolicy.h     |   0
 .../src => dom/base}/nsNodeInfoManager.cpp    |   0
 .../base/src => dom/base}/nsNodeInfoManager.h |   0
 .../base/src => dom/base}/nsNodeUtils.cpp     |   0
 {content/base/src => dom/base}/nsNodeUtils.h  |   0
 .../base}/nsObjectLoadingContent.cpp          |   0
 .../src => dom/base}/nsObjectLoadingContent.h |   0
 .../base}/nsPlainTextSerializer.cpp           |   0
 .../src => dom/base}/nsPlainTextSerializer.h  |   0
 .../base/src => dom/base}/nsPropertyTable.cpp |   0
 .../base/src => dom/base}/nsPropertyTable.h   |   0
 {content/base/src => dom/base}/nsRange.cpp    |   0
 {content/base/src => dom/base}/nsRange.h      |   0
 .../src => dom/base}/nsReferencedElement.cpp  |   0
 .../public => dom/base}/nsReferencedElement.h |   0
 .../base/src => dom/base}/nsSandboxFlags.h    |   0
 .../base/src => dom/base}/nsScriptElement.cpp |   0
 .../base/src => dom/base}/nsScriptElement.h   |   0
 .../base/src => dom/base}/nsScriptLoader.cpp  |   0
 .../base/src => dom/base}/nsScriptLoader.h    |   0
 .../base}/nsStubDocumentObserver.cpp          |   0
 .../src => dom/base}/nsStubDocumentObserver.h |   0
 .../base}/nsStubMutationObserver.cpp          |   0
 .../src => dom/base}/nsStubMutationObserver.h |   0
 .../src => dom/base}/nsStyleLinkElement.cpp   |   0
 .../src => dom/base}/nsStyleLinkElement.h     |   0
 .../base/src => dom/base}/nsStyledElement.cpp |   0
 .../base/src => dom/base}/nsStyledElement.h   |   0
 .../src => dom/base}/nsSyncLoadService.cpp    |   0
 .../base/src => dom/base}/nsSyncLoadService.h |   0
 .../base/src => dom/base}/nsTextFragment.cpp  |   0
 .../base/src => dom/base}/nsTextFragment.h    |   0
 .../src => dom/base}/nsTextFragmentImpl.h     |   0
 .../src => dom/base}/nsTextFragmentSSE2.cpp   |   0
 {content/base/src => dom/base}/nsTextNode.cpp |   0
 {content/base/src => dom/base}/nsTextNode.h   |   0
 .../base/src => dom/base}/nsTraversal.cpp     |   0
 {content/base/src => dom/base}/nsTraversal.h  |   0
 .../base/src => dom/base}/nsTreeSanitizer.cpp |   0
 .../public => dom/base}/nsTreeSanitizer.h     |   0
 .../base/src => dom/base}/nsViewportInfo.cpp  |   0
 .../base/public => dom/base}/nsViewportInfo.h |   0
 .../base}/nsXHTMLContentSerializer.cpp        |   0
 .../base}/nsXHTMLContentSerializer.h          |   0
 .../base}/nsXMLContentSerializer.cpp          |   0
 .../src => dom/base}/nsXMLContentSerializer.h |   0
 .../src => dom/base}/nsXMLHttpRequest.cpp     |   0
 .../base/src => dom/base}/nsXMLHttpRequest.h  |   0
 .../src => dom/base}/nsXMLNameSpaceMap.cpp    |   0
 .../public => dom/base}/nsXMLNameSpaceMap.h   |   0
 {content => dom}/base/test/345339_iframe.html |   0
 {content => dom}/base/test/Ahem.ttf           | Bin
 {content => dom}/base/test/TestCSPParser.cpp  |   2 +-
 {content => dom}/base/test/TestGetURL.cpp     |   0
 .../base/test/TestNativeXMLHttpRequest.cpp    |   0
 .../base/test/TestPlainTextSerializer.cpp     |   0
 .../base/test/accesscontrol.resource          |   0
 .../base/test/accesscontrol.resource^headers^ |   0
 .../base/test/badContentType.eventsource      |   0
 .../test/badContentType.eventsource^headers^  |   0
 .../base/test/badHTTPResponseCode.eventsource |   0
 .../badHTTPResponseCode.eventsource^headers^  |   0
 .../base/test/badMessageEvent.eventsource     |   0
 .../test/badMessageEvent.eventsource^headers^ |   0
 .../base/test/badMessageEvent2.eventsource    |   0
 .../badMessageEvent2.eventsource^headers^     |   0
 {content => dom}/base/test/browser.ini        |   0
 .../base/test/browser_bug1058164.js           |   0
 .../base/test/browser_bug593387.js            |   4 +-
 .../base/test/browser_bug902350.js            |   2 +-
 .../base/test/browser_state_notifications.js  |   0
 {content => dom}/base/test/bug282547.sjs      |   0
 .../base/test/bug298064-subframe.html         |   0
 {content => dom}/base/test/bug313646.txt      |   0
 .../base/test/bug382113_object.html           |   0
 {content => dom}/base/test/bug419132.html     |   0
 .../base/test/bug426308-redirect.sjs          |   0
 {content => dom}/base/test/bug435425.sjs      |   0
 .../base/test/bug435425_redirect.sjs          |   0
 {content => dom}/base/test/bug444322.js       |   0
 {content => dom}/base/test/bug444322.txt      |   0
 {content => dom}/base/test/bug444546.sjs      |   0
 .../base/test/bug455629-helper.svg            |   0
 {content => dom}/base/test/bug457746.sjs      |   0
 .../base/test/bug461735-post-redirect.js      |   0
 dom/base/test/bug461735-redirect1.sjs         |   4 +
 dom/base/test/bug461735-redirect2.sjs         |   4 +
 {content => dom}/base/test/bug466080.sjs      |   0
 .../base/test/bug466409-empty.css             |   0
 .../base/test/bug466409-page.html             |   0
 {content => dom}/base/test/bug475156.sjs      |   0
 {content => dom}/base/test/bug482935.sjs      |   0
 {content => dom}/base/test/bug540854.sjs      |   0
 .../base/test/bug578096LoadChromeScript.js    |   0
 .../base/test/bug638112-response.txt          | Bin
 {content => dom}/base/test/bug638112.sjs      |   2 +-
 .../base/test/bug682592-subframe-ref.html     |   0
 .../base/test/bug682592-subframe.html         |   0
 .../base/test/bug696301-script-1.js           |   0
 .../base/test/bug696301-script-1.js^headers^  |   0
 .../base/test/bug696301-script-2.js           |   0
 .../base/test/bug803225_test_mailto.html      |   0
 {content => dom}/base/test/bug819051.sjs      |   0
 dom/base/test/chrome.ini                      |   5 +
 .../base/test/chrome/blockNoPlugins.xml       |   0
 .../base/test/chrome/blockPluginHard.xml      |   0
 .../base/test/chrome/bug421622-referer.sjs    |   0
 {content => dom}/base/test/chrome/chrome.ini  |   0
 .../base/test/chrome/cpows_child.js           |   0
 .../base/test/chrome/cpows_parent.xul         |   2 +-
 .../base/test/chrome/file_bug391728.html      |   0
 .../base/test/chrome/file_bug391728_2.html    |   0
 .../base/test/chrome/file_bug549682.xul       |   0
 .../base/test/chrome/file_bug616841.xul       |   0
 .../base/test/chrome/file_bug816340.xul       |   0
 .../base/test/chrome/file_bug990812-1.xul     |   0
 .../base/test/chrome/file_bug990812-2.xul     |   0
 .../base/test/chrome/file_bug990812-3.xul     |   0
 .../base/test/chrome/file_bug990812-4.xul     |   0
 .../base/test/chrome/file_bug990812-5.xul     |   0
 .../base/test/chrome/file_bug990812.xul       |   0
 .../base/test/chrome/fileconstructor_file.png | Bin
 .../base/test/chrome/frame_bug814638.xul      |   0
 .../base/test/chrome/host_bug814638.xul       |   0
 .../base/test/chrome/mochitest.ini            |   0
 .../base/test/chrome/nochrome_bug765993.html  |   0
 .../base/test/chrome/nochrome_bug765993.js    |   0
 .../chrome/nochrome_bug765993.js^headers^     |   0
 .../base/test/chrome/test_bug1063837.xul      |   0
 .../base/test/chrome/test_bug206691.xul       |   0
 .../base/test/chrome/test_bug339494.xul       |   0
 .../base/test/chrome/test_bug357450.xul       |   0
 .../base/test/chrome/test_bug380418.html      |   0
 .../test/chrome/test_bug380418.html^headers^  |   0
 .../base/test/chrome/test_bug383430.html      |   0
 .../base/test/chrome/test_bug391728.html      |   0
 .../base/test/chrome/test_bug421622.xul       |   2 +-
 .../base/test/chrome/test_bug429785.xul       |   0
 .../base/test/chrome/test_bug430050.xul       |   0
 .../base/test/chrome/test_bug467123.xul       |   0
 .../base/test/chrome/test_bug549682.xul       |   0
 .../base/test/chrome/test_bug571390.xul       |   0
 .../base/test/chrome/test_bug574596.html      |   0
 .../base/test/chrome/test_bug599295.html      |   0
 .../base/test/chrome/test_bug616841.xul       |   0
 .../base/test/chrome/test_bug635835.xul       |   0
 .../base/test/chrome/test_bug650776.html      |   0
 .../base/test/chrome/test_bug650784.html      |   0
 .../base/test/chrome/test_bug682305.html      |   0
 .../base/test/chrome/test_bug683852.xul       |   0
 .../base/test/chrome/test_bug750096.html      |   0
 .../base/test/chrome/test_bug752226-3.xul     |   0
 .../base/test/chrome/test_bug752226-4.xul     |   0
 .../base/test/chrome/test_bug765993.html      |   6 +-
 .../base/test/chrome/test_bug780199.xul       |   0
 .../base/test/chrome/test_bug780529.xul       |   0
 .../base/test/chrome/test_bug800386.xul       |   0
 .../base/test/chrome/test_bug814638.xul       |   2 +-
 .../base/test/chrome/test_bug816340.xul       |   0
 .../base/test/chrome/test_bug914381.html      |   0
 .../base/test/chrome/test_bug990812.xul       |   0
 .../base/test/chrome/test_cpows.xul           |   0
 .../test/chrome/test_document_register.xul    |   0
 .../base/test/chrome/test_domparsing.xul      |   0
 .../base/test/chrome/test_fileconstructor.xul |   2 +-
 .../chrome/test_fileconstructor_tempfile.xul  |   0
 .../base/test/chrome/test_title.xul           |   0
 .../base/test/chrome/title_window.xul         |   0
 {content => dom}/base/test/copypaste.js       |   0
 {content => dom}/base/test/csp/chrome.ini     |   0
 {content => dom}/base/test/csp/file_CSP.css   |   2 +-
 {content => dom}/base/test/csp/file_CSP.sjs   |   0
 .../base/test/csp/file_CSP_bug663567.xsl      |   0
 .../test/csp/file_CSP_bug663567_allows.xml    |   0
 .../file_CSP_bug663567_allows.xml^headers^    |   0
 .../test/csp/file_CSP_bug663567_blocks.xml    |   0
 .../file_CSP_bug663567_blocks.xml^headers^    |   0
 .../base/test/csp/file_CSP_bug802872.html     |   0
 .../test/csp/file_CSP_bug802872.html^headers^ |   0
 .../base/test/csp/file_CSP_bug802872.js       |   4 +-
 .../base/test/csp/file_CSP_bug802872.sjs      |   0
 .../test/csp/file_CSP_bug885433_allows.html   |   0
 .../file_CSP_bug885433_allows.html^headers^   |   0
 .../test/csp/file_CSP_bug885433_blocks.html   |   0
 .../file_CSP_bug885433_blocks.html^headers^   |   0
 .../base/test/csp/file_CSP_bug888172.html     |   0
 .../base/test/csp/file_CSP_bug888172.sjs      |   2 +-
 .../test/csp/file_CSP_bug909029_none.html     |   0
 .../csp/file_CSP_bug909029_none.html^headers^ |   0
 .../test/csp/file_CSP_bug909029_star.html     |   0
 .../csp/file_CSP_bug909029_star.html^headers^ |   0
 .../base/test/csp/file_CSP_bug910139.sjs      |   2 +-
 .../base/test/csp/file_CSP_bug910139.xml      |   0
 .../base/test/csp/file_CSP_bug910139.xsl      |   0
 .../base/test/csp/file_CSP_bug941404.html     |   4 +-
 .../base/test/csp/file_CSP_bug941404_xhr.html |   0
 .../csp/file_CSP_bug941404_xhr.html^headers^  |   0
 .../test/csp/file_CSP_evalscript_main.html    |   0
 .../file_CSP_evalscript_main.html^headers^    |   0
 .../base/test/csp/file_CSP_evalscript_main.js |   0
 .../csp/file_CSP_evalscript_main_allowed.html |   0
 ..._CSP_evalscript_main_allowed.html^headers^ |   0
 .../csp/file_CSP_evalscript_main_allowed.js   |   0
 .../base/test/csp/file_CSP_frameancestors.sjs |   0
 .../csp/file_CSP_frameancestors_main.html     |   0
 .../test/csp/file_CSP_frameancestors_main.js  |   6 +-
 .../test/csp/file_CSP_inlinescript_main.html  |   0
 .../file_CSP_inlinescript_main.html^headers^  |   0
 .../file_CSP_inlinescript_main_allowed.html   |   0
 ...SP_inlinescript_main_allowed.html^headers^ |   0
 .../test/csp/file_CSP_inlinestyle_main.html   |   0
 .../file_CSP_inlinestyle_main.html^headers^   |   0
 .../file_CSP_inlinestyle_main_allowed.html    |   0
 ...CSP_inlinestyle_main_allowed.html^headers^ |   0
 .../base/test/csp/file_CSP_main.html          |  16 +-
 .../base/test/csp/file_CSP_main.html^headers^ |   0
 .../base/test/csp/file_CSP_main.js            |   4 +-
 .../base/test/csp/file_base-uri.html          |   0
 .../test/csp/file_bug836922_npolicies.html    |  15 +
 .../file_bug836922_npolicies.html^headers^    |   2 +
 .../file_bug836922_npolicies_ro_violation.sjs |   0
 .../file_bug836922_npolicies_violation.sjs    |   0
 dom/base/test/csp/file_bug886164.html         |  15 +
 .../test/csp/file_bug886164.html^headers^     |   0
 .../base/test/csp/file_bug886164_2.html       |   4 +-
 .../test/csp/file_bug886164_2.html^headers^   |   0
 dom/base/test/csp/file_bug886164_3.html       |  12 +
 .../test/csp/file_bug886164_3.html^headers^   |   0
 dom/base/test/csp/file_bug886164_4.html       |  12 +
 .../test/csp/file_bug886164_4.html^headers^   |   0
 .../base/test/csp/file_bug886164_5.html       |   8 +-
 .../test/csp/file_bug886164_5.html^headers^   |   0
 .../base/test/csp/file_bug886164_6.html       |   4 +-
 .../test/csp/file_bug886164_6.html^headers^   |   0
 .../base/test/csp/file_connect-src.html       |   0
 .../base/test/csp/file_csp_bug768029.html     |   6 +-
 .../base/test/csp/file_csp_bug768029.sjs      |   0
 .../base/test/csp/file_csp_bug773891.html     |   6 +-
 .../base/test/csp/file_csp_bug773891.sjs      |   0
 .../file_csp_invalid_source_expression.html   |   2 +-
 .../base/test/csp/file_csp_path_matching.html |   2 +-
 .../base/test/csp/file_csp_path_matching.js   |   0
 .../csp/file_csp_path_matching_redirect.html  |   2 +-
 ...file_csp_path_matching_redirect_server.sjs |   2 +-
 .../test/csp/file_csp_redirects_main.html     |   2 +-
 .../base/test/csp/file_csp_redirects_page.sjs |   2 +-
 .../test/csp/file_csp_redirects_resource.sjs  |   2 +-
 .../base/test/csp/file_csp_report.html        |   0
 .../base/test/csp/file_csp_testserver.sjs     |   0
 .../base/test/csp/file_hash_source.html       |   0
 .../test/csp/file_hash_source.html^headers^   |   0
 .../base/test/csp/file_leading_wildcard.html  |   4 +-
 .../file_multi_policy_injection_bypass.html   |   4 +-
 ...ulti_policy_injection_bypass.html^headers^ |   0
 .../file_multi_policy_injection_bypass_2.html |   4 +-
 ...ti_policy_injection_bypass_2.html^headers^ |   0
 .../base/test/csp/file_nonce_source.html      |  10 +-
 .../test/csp/file_nonce_source.html^headers^  |   0
 ...policyuri_regression_from_multipolicy.html |   0
 ..._regression_from_multipolicy.html^headers^ |   1 +
 ...licyuri_regression_from_multipolicy_policy |   0
 .../base/test/csp/file_redirect_content.sjs   |   2 +-
 .../base/test/csp/file_redirect_report.sjs    |   0
 ...ort_uri_missing_in_report_only_header.html |   0
 ...issing_in_report_only_header.html^headers^ |   0
 .../file_self_none_as_hostname_confusion.html |   0
 ...f_none_as_hostname_confusion.html^headers^ |   0
 .../csp/file_subframe_run_js_if_allowed.html  |   0
 ...e_subframe_run_js_if_allowed.html^headers^ |   0
 {content => dom}/base/test/csp/mochitest.ini  |   0
 .../base/test/csp/test_301_redirect.html      |   0
 .../base/test/csp/test_302_redirect.html      |   0
 .../base/test/csp/test_303_redirect.html      |   0
 .../base/test/csp/test_307_redirect.html      |   0
 {content => dom}/base/test/csp/test_CSP.html  |   0
 .../base/test/csp/test_CSP_bug663567.html     |   0
 .../base/test/csp/test_CSP_bug802872.html     |   0
 .../base/test/csp/test_CSP_bug885433.html     |   0
 .../base/test/csp/test_CSP_bug888172.html     |   0
 .../base/test/csp/test_CSP_bug909029.html     |   0
 .../base/test/csp/test_CSP_bug910139.html     |   0
 .../base/test/csp/test_CSP_bug941404.html     |   2 +-
 .../base/test/csp/test_CSP_evalscript.html    |   0
 .../test/csp/test_CSP_frameancestors.html     |   0
 .../base/test/csp/test_CSP_inlinescript.html  |   0
 .../base/test/csp/test_CSP_inlinestyle.html   |   0
 .../base/test/csp/test_base-uri.html          |   4 +-
 .../test/csp/test_bug836922_npolicies.html    |   2 +-
 .../base/test/csp/test_bug886164.html         |   2 +-
 .../base/test/csp/test_bug949549.html         |   0
 .../base/test/csp/test_connect-src.html       |   2 +-
 .../base/test/csp/test_csp_bug768029.html     |   6 +-
 .../base/test/csp/test_csp_bug773891.html     |   6 +-
 .../test_csp_invalid_source_expression.html   |   2 +-
 .../base/test/csp/test_csp_path_matching.html |  36 +-
 .../csp/test_csp_path_matching_redirect.html  |  10 +-
 .../base/test/csp/test_csp_redirects.html     |   2 +-
 .../base/test/csp/test_csp_report.html        |   8 +-
 .../base/test/csp/test_hash_source.html       |   0
 .../base/test/csp/test_leading_wildcard.html  |   2 +-
 .../test_multi_policy_injection_bypass.html   |   2 +-
 .../base/test/csp/test_nonce_source.html      |   0
 ...policyuri_regression_from_multipolicy.html |   0
 ...ort_uri_missing_in_report_only_header.html |   0
 .../test_self_none_as_hostname_confusion.html |   0
 .../csp/test_subframe_run_js_if_allowed.html  |   0
 .../base/test/delayedServerEvents.sjs         |   0
 .../base/test/eventsource.resource            |   0
 .../base/test/eventsource.resource^headers^   |   0
 .../base/test/eventsource_redirect.resource   |   0
 .../eventsource_redirect.resource^headers^    |   0
 .../test/eventsource_redirect_to.resource     |   0
 .../eventsource_redirect_to.resource^headers^ |   0
 {content => dom}/base/test/fake_plugin.tst    |   0
 .../test/file_CrossSiteXHR_cache_server.sjs   |   4 +-
 .../base/test/file_CrossSiteXHR_inner.html    |   0
 .../base/test/file_CrossSiteXHR_inner.jar     | Bin
 .../test/file_CrossSiteXHR_inner_data.sjs     |   0
 .../base/test/file_CrossSiteXHR_server.sjs    |   2 +-
 .../base/test/file_XHRDocURI.html             |   0
 .../base/test/file_XHRDocURI.html^headers^    |   0
 {content => dom}/base/test/file_XHRDocURI.sjs |   0
 .../base/test/file_XHRDocURI.text             |   0
 .../base/test/file_XHRDocURI.text^headers^    |   0
 {content => dom}/base/test/file_XHRDocURI.xml |   0
 .../base/test/file_XHRDocURI.xml^headers^     |   0
 .../base/test/file_XHRResponseURL.js          |  64 +-
 .../base/test/file_XHRResponseURL.sjs         |   0
 .../base/test/file_XHRResponseURL.text        |   0
 .../test/file_XHRResponseURL.text^headers^    |   0
 .../base/test/file_XHRResponseURL_nocors.text |   0
 .../base/test/file_XHRSendData.sjs            |   0
 .../base/test/file_XHRSendData_doc.xml        |   0
 .../test/file_XHRSendData_doc.xml^headers^    |   0
 {content => dom}/base/test/file_XHR_anon.sjs  |   0
 .../base/test/file_XHR_binary1.bin            | Bin
 .../base/test/file_XHR_binary1.bin^headers^   |   0
 .../base/test/file_XHR_binary2.bin            | Bin
 {content => dom}/base/test/file_XHR_fail1.txt |   0
 dom/base/test/file_XHR_fail1.txt^headers^     |   2 +
 .../base/test/file_XHR_fail1b.txt             |   0
 .../base/test/file_XHR_header.sjs             |   0
 {content => dom}/base/test/file_XHR_pass1.xml |   0
 {content => dom}/base/test/file_XHR_pass2.txt |   0
 {content => dom}/base/test/file_XHR_pass3.txt |   0
 .../base/test/file_XHR_pass3.txt^headers^     |   0
 .../base/test/file_XHR_system_redirect.html   |   0
 .../file_XHR_system_redirect.html^headers^    |   0
 .../base/test/file_XHR_timeout.sjs            |   0
 {content => dom}/base/test/file_base_xbl.xml  |   0
 .../base/test/file_bug1008126_worker.js       |   6 +-
 .../base/test/file_bug1011748_OK.sjs          |   0
 .../base/test/file_bug1011748_redirect.sjs    |   0
 {content => dom}/base/test/file_bug28293.sjs  |   0
 {content => dom}/base/test/file_bug326337.xml |   0
 .../base/test/file_bug326337_inner.html       |   0
 .../base/test/file_bug326337_outer.html       |   2 +-
 .../base/test/file_bug416317.xhtml            |   0
 .../base/test/file_bug426646-1.html           |   0
 .../base/test/file_bug426646-2.html           |   0
 .../base/test/file_bug428847-1.xhtml          |   0
 .../base/test/file_bug428847-2.xhtml          |   0
 {content => dom}/base/test/file_bug498897.css |   0
 .../base/test/file_bug498897.html             |   0
 .../base/test/file_bug498897.html^headers^    |   0
 .../base/test/file_bug503473-frame.sjs        |   0
 {content => dom}/base/test/file_bug503481.sjs |   0
 .../base/test/file_bug503481b_inner.html      |   0
 .../base/test/file_bug541937.html             |   0
 .../base/test/file_bug541937.xhtml            |   0
 .../base/test/file_bug557892.html             |   0
 {content => dom}/base/test/file_bug562137.txt |   0
 .../base/test/file_bug590812-ref.xhtml        |   0
 {content => dom}/base/test/file_bug590812.xml |   0
 .../base/test/file_bug590870.html             |   0
 .../base/test/file_bug601803a.html            |   2 +-
 .../base/test/file_bug601803b.html            |   0
 .../base/test/file_bug604660-1.xml            |   0
 .../base/test/file_bug604660-2.xsl            |   0
 .../base/test/file_bug604660-3.js             |   0
 .../base/test/file_bug604660-4.js             |   0
 .../base/test/file_bug604660-5.xml            |   0
 .../base/test/file_bug604660-6.xsl            |   0
 {content => dom}/base/test/file_bug622088.sjs |   0
 .../base/test/file_bug622088_inner.html       |   0
 {content => dom}/base/test/file_bug675121.sjs |   0
 .../base/test/file_bug687859-16.js            | Bin
 .../base/test/file_bug687859-16.js^headers^   |   0
 .../base/test/file_bug687859-bom.js           |   0
 .../base/test/file_bug687859-bom.js^headers^  |   0
 .../base/test/file_bug687859-charset.js       |   0
 .../base/test/file_bug687859-http.js          |   0
 .../base/test/file_bug687859-http.js^headers^ |   0
 .../base/test/file_bug687859-inherit.js       |   0
 {content => dom}/base/test/file_bug692434.xml |   0
 .../base/test/file_bug707142_baseline.json    |   0
 .../base/test/file_bug707142_bom.json         |   0
 .../base/test/file_bug707142_utf-16.json      | Bin
 .../base/test/file_bug708620-2.html           |   0
 .../base/test/file_bug708620.html             |   0
 {content => dom}/base/test/file_bug782342.txt |   0
 {content => dom}/base/test/file_bug787778.sjs |   0
 {content => dom}/base/test/file_bug804395.jar | Bin
 .../base/test/file_bug869432.eventsource      |   0
 .../test/file_bug869432.eventsource^headers^  |   0
 .../base/test/file_bug902350.html             |   2 +-
 .../base/test/file_bug902350_frame.html       |   0
 .../base/test/file_bug907892.html             |   0
 {content => dom}/base/test/file_bug945152.jar | Bin
 .../base/test/file_bug945152_worker.js        |   6 +-
 .../base/test/file_general_document.html      |   0
 .../base/test/file_html_in_xhr.html           |   0
 .../base/test/file_html_in_xhr.sjs            |   0
 .../base/test/file_html_in_xhr2.html          |   0
 .../base/test/file_html_in_xhr3.html          |   0
 .../base/test/file_htmlserializer_1.html      |   0
 .../test/file_htmlserializer_1_bodyonly.html  |   0
 .../test/file_htmlserializer_1_format.html    |   0
 .../test/file_htmlserializer_1_linebreak.html |   0
 .../test/file_htmlserializer_1_links.html     |   2 +-
 .../file_htmlserializer_1_nested_body.html    |   0
 .../test/file_htmlserializer_1_no_body.html   |   0
 .../test/file_htmlserializer_1_noflag.html    |   0
 .../file_htmlserializer_1_noformatpre.html    |   0
 .../base/test/file_htmlserializer_1_raw.html  |   0
 .../file_htmlserializer_1_sibling_body.html   |   0
 ...mlserializer_1_sibling_body_only_body.html |   0
 .../base/test/file_htmlserializer_1_wrap.html |   0
 .../base/test/file_htmlserializer_2.html      |   0
 .../test/file_htmlserializer_2_basic.html     |   0
 .../test/file_htmlserializer_2_enthtml.html   |   0
 .../test/file_htmlserializer_2_entw3c.html    |   0
 .../test/file_htmlserializer_2_latin1.html    |   0
 .../base/test/file_htmlserializer_ipv6.html   |   0
 .../test/file_htmlserializer_ipv6_out.html    |   0
 .../file_mixed_content_frameNavigation.html   |   6 +-
 ...d_content_frameNavigation_blankTarget.html |   2 +-
 ...ed_content_frameNavigation_grandchild.html |   4 +-
 ...xed_content_frameNavigation_innermost.html |   8 +-
 ..._mixed_content_frameNavigation_secure.html |   6 +-
 ...ent_frameNavigation_secure_grandchild.html |   4 +-
 .../base/test/file_mixed_content_main.html    |   2 +-
 .../file_mixed_content_main_bug803225.html    |   4 +-
 ...ed_content_main_bug803225_websocket_wsh.py |   0
 .../base/test/file_mixed_content_server.sjs   |   0
 .../base/test/file_mozfiledataurl_audio.ogg   | Bin
 .../base/test/file_mozfiledataurl_doc.html    |   0
 .../base/test/file_mozfiledataurl_img.jpg     | Bin
 .../base/test/file_mozfiledataurl_inner.html  |   0
 .../base/test/file_mozfiledataurl_text.txt    |   0
 .../base/test/file_restrictedEventSource.sjs  |   0
 .../base/test/file_websocket_basic_wsh.py     |   0
 .../base/test/file_websocket_hello_wsh.py     |   0
 .../test/file_websocket_http_resource.txt     |   0
 .../base/test/file_websocket_wsh.py           |   0
 dom/base/test/file_x-frame-options_main.html  |  44 ++
 .../base/test/file_x-frame-options_page.sjs   |   0
 .../base/test/file_xhtmlserializer_1.xhtml    |   0
 .../file_xhtmlserializer_1_bodyonly.xhtml     |   0
 .../test/file_xhtmlserializer_1_format.xhtml  |   0
 .../file_xhtmlserializer_1_linebreak.xhtml    |   0
 .../test/file_xhtmlserializer_1_links.xhtml   |   2 +-
 .../file_xhtmlserializer_1_nested_body.xhtml  |   0
 .../test/file_xhtmlserializer_1_no_body.xhtml |   0
 .../test/file_xhtmlserializer_1_noflag.xhtml  |   0
 .../file_xhtmlserializer_1_noformatpre.xhtml  |   0
 .../test/file_xhtmlserializer_1_raw.xhtml     |   0
 .../file_xhtmlserializer_1_sibling_body.xhtml |   0
 ...lserializer_1_sibling_body_only_body.xhtml |   0
 .../test/file_xhtmlserializer_1_wrap.xhtml    |   0
 .../base/test/file_xhtmlserializer_2.xhtml    |   0
 .../test/file_xhtmlserializer_2_basic.xhtml   |   0
 .../test/file_xhtmlserializer_2_enthtml.xhtml |   0
 .../test/file_xhtmlserializer_2_entw3c.xhtml  |   0
 .../test/file_xhtmlserializer_2_latin1.xhtml  |   0
 {content => dom}/base/test/fileutils.js       |   0
 .../base/test/forRemoval.resource             |   0
 .../base/test/forRemoval.resource^headers^    |   0
 {content => dom}/base/test/formReset.html     |   0
 .../base/test/invalid_accesscontrol.resource  |   0
 .../invalid_accesscontrol.resource^headers^   |   0
 .../base/test/mochitest-child-permissions.ini |   0
 dom/base/test/mochitest.ini                   | 663 +++++++++++++++++
 {content => dom}/base/test/moz.build          |   0
 .../base/test/mutationobserver_dialog.html    |   0
 {content => dom}/base/test/progressserver.sjs |   4 +-
 .../base/test/reftest/mixed-bmp-png.ico       | Bin
 .../base/test/reftest/reftest.list            |   0
 .../base/test/reftest/test_bug920877-ref.html |   0
 .../base/test/reftest/test_bug920877.html     |   0
 .../base/test/responseIdentical.sjs           |   0
 .../base/test/script-1_bug597345.sjs          |   0
 .../base/test/script-2_bug597345.js           |   0
 .../base/test/script_bug602838.sjs            |   0
 .../base/test/send_gzip_content.sjs           |   0
 {content => dom}/base/test/somedatas.resource |   0
 .../base/test/somedatas.resource^headers^     |   0
 .../base/test/test_CrossSiteXHR.html          |   6 +-
 .../base/test/test_CrossSiteXHR_cache.html    |   4 +-
 .../base/test/test_CrossSiteXHR_origin.html   |   8 +-
 .../base/test/test_DOMException.html          |   0
 .../base/test/test_EventSource_redirects.html |   2 +-
 .../test_NodeIterator_basics_filters.xhtml    |   0
 .../test/test_NodeIterator_mutations_1.xhtml  |   0
 .../test/test_NodeIterator_mutations_2.html   |   0
 .../test/test_NodeIterator_mutations_3.html   |   0
 {content => dom}/base/test/test_XHR.html      |   2 +-
 .../base/test/test_XHRDocURI.html             | 108 +--
 .../base/test/test_XHRResponseURL.html        |   0
 .../base/test/test_XHRSendData.html           |   0
 {content => dom}/base/test/test_XHR_anon.html |   2 +-
 .../base/test/test_XHR_header.html            |   0
 .../base/test/test_XHR_onuploadprogress.html  |   0
 .../base/test/test_XHR_parameters.html        |   0
 .../base/test/test_XHR_system.html            |   4 +-
 .../base/test/test_XHR_timeout.html           |   0
 .../base/test/test_XHR_timeout.js             |   0
 {content => dom}/base/test/test_base.xhtml    |  24 +-
 .../base/test/test_blobconstructor.html       |   0
 .../base/test/test_bug1008126.html            |   0
 .../base/test/test_bug1011748.html            |   0
 .../base/test/test_bug1025933.html            |   0
 .../base/test/test_bug1057176.html            |   0
 .../base/test/test_bug1081686.html            |   4 +-
 .../base/test/test_bug166235.html             |   0
 .../base/test/test_bug199959.html             |   0
 .../base/test/test_bug218236.html             |   0
 .../base/test/test_bug218277.html             |   0
 .../base/test/test_bug238409.html             |   0
 .../base/test/test_bug254337.html             |   0
 .../base/test/test_bug270145.xhtml            |   0
 .../base/test/test_bug276037-1.html           |   0
 .../base/test/test_bug276037-2.xhtml          |   0
 .../base/test/test_bug282547.html             |   2 +-
 {content => dom}/base/test/test_bug28293.html |   0
 .../base/test/test_bug28293.xhtml             |   0
 .../base/test/test_bug298064.html             |   0
 .../base/test/test_bug300992.html             |   0
 {content => dom}/base/test/test_bug311681.xml |   0
 .../base/test/test_bug313646.html             |   2 +-
 .../base/test/test_bug320799.html             |   0
 .../base/test/test_bug322317.html             |   0
 .../base/test/test_bug326337.html             |   0
 .../base/test/test_bug330925.xhtml            |   0
 .../base/test/test_bug331959.html             |   0
 .../base/test/test_bug333198.html             |   0
 .../base/test/test_bug333673.html             |   0
 .../base/test/test_bug337631.html             |   0
 .../base/test/test_bug338541.xhtml            |   0
 .../base/test/test_bug338583.html             |  24 +-
 .../base/test/test_bug338679.html             |   0
 .../base/test/test_bug339494.html             |   0
 .../base/test/test_bug339494.xhtml            |   0
 .../base/test/test_bug340571.html             |   0
 .../base/test/test_bug343596.html             |   0
 .../base/test/test_bug345339.html             |   2 +-
 .../base/test/test_bug346485.html             |   0
 .../base/test/test_bug352728.html             |   0
 .../base/test/test_bug352728.xhtml            |   0
 .../base/test/test_bug353334.html             |   0
 .../base/test/test_bug355026.html             |   0
 .../base/test/test_bug357450.html             |   0
 {content => dom}/base/test/test_bug357450.js  |   0
 .../base/test/test_bug357450.xhtml            |   0
 .../base/test/test_bug357450_svg.xhtml        |   0
 .../base/test/test_bug357509.html             |   0
 .../base/test/test_bug358660.html             |   0
 .../base/test/test_bug362391.xhtml            |   0
 .../base/test/test_bug364092.xhtml            |   0
 .../base/test/test_bug364413.xhtml            |   0
 .../base/test/test_bug366944.html             |   0
 .../base/test/test_bug366946.html             |   0
 .../base/test/test_bug367164.html             |   0
 .../base/test/test_bug368972.html             |   0
 .../base/test/test_bug371576-2.html           |   0
 .../base/test/test_bug371576-3.html           |   0
 .../base/test/test_bug371576-4.html           |   0
 .../base/test/test_bug371576-5.html           |   0
 .../base/test/test_bug372086.html             |   0
 .../base/test/test_bug372964-2.html           |   0
 .../base/test/test_bug372964.html             |   0
 .../base/test/test_bug373181.xhtml            |   0
 .../base/test/test_bug375314.html             |   0
 .../base/test/test_bug378969.html             |   0
 .../base/test/test_bug380418.html             |   0
 .../base/test/test_bug380418.html^headers^    |   0
 .../base/test/test_bug382113.html             |   0
 .../base/test/test_bug382871.html             |   0
 .../base/test/test_bug384003.xhtml            |   0
 .../base/test/test_bug390219.html             |   0
 .../base/test/test_bug390735.html             |   0
 .../base/test/test_bug392318.html             |   0
 .../base/test/test_bug392511.html             |   0
 .../base/test/test_bug393968.html             |   0
 .../base/test/test_bug395915.html             |   0
 .../base/test/test_bug397234.html             |   0
 .../base/test/test_bug398243.html             |   2 +-
 .../base/test/test_bug401662.html             |   0
 .../base/test/test_bug402150.html             |   0
 .../base/test/test_bug402150.html^headers^    |   0
 .../base/test/test_bug403841.html             |   0
 .../base/test/test_bug403852.html             |   0
 {content => dom}/base/test/test_bug403868.xml |   0
 .../base/test/test_bug405182.html             |   0
 .../base/test/test_bug409380.html             |   0
 .../base/test/test_bug410229.html             |   0
 .../base/test/test_bug413974.html             |   0
 .../base/test/test_bug414190.html             |   0
 .../base/test/test_bug415860.html             |   0
 .../base/test/test_bug416317-1.html           |   0
 .../base/test/test_bug416317-2.html           |   0
 .../base/test/test_bug416383.html             |   0
 .../base/test/test_bug417255.html             |   0
 .../base/test/test_bug417384.html             |   0
 .../base/test/test_bug418214.html             |   0
 .../base/test/test_bug419132.html             |   0
 .../base/test/test_bug419527.xhtml            |   0
 .../base/test/test_bug420609.xhtml            |   0
 .../base/test/test_bug420700.html             |   0
 .../base/test/test_bug421602.html             |   0
 .../base/test/test_bug422403-1.html           |   0
 .../base/test/test_bug422403-2.xhtml          |   0
 .../base/test/test_bug422537.html             |   0
 .../base/test/test_bug424212.html             |   0
 .../base/test/test_bug424359-1.html           |   0
 .../base/test/test_bug424359-2.html           |   0
 .../base/test/test_bug425013.html             |   0
 .../base/test/test_bug426308.html             |   2 +-
 .../base/test/test_bug426646.html             |   0
 .../base/test/test_bug428847.html             |   0
 .../base/test/test_bug429157.html             |   0
 .../base/test/test_bug431082.html             |   0
 .../base/test/test_bug431701.html             |   0
 .../base/test/test_bug431833.html             |   0
 .../base/test/test_bug433533.html             |   0
 .../base/test/test_bug433662.html             |   0
 .../base/test/test_bug435425.html             |   0
 .../base/test/test_bug438519.html             |   0
 .../base/test/test_bug444030.xhtml            |   0
 .../base/test/test_bug444322.html             |   0
 .../base/test/test_bug444546.html             |   0
 .../base/test/test_bug444722.html             |   0
 .../base/test/test_bug448993.html             |   0
 .../base/test/test_bug450160.html             |   0
 .../base/test/test_bug451376.html             |   0
 .../base/test/test_bug453521.html             |   0
 .../base/test/test_bug453736.html             |   0
 .../base/test/test_bug454325.html             |   0
 .../base/test/test_bug454326.html             |   0
 .../base/test/test_bug455472.html             |   0
 .../base/test/test_bug455629.html             |   4 +-
 .../base/test/test_bug456262.html             |   0
 .../base/test/test_bug457746.html             |   0
 .../base/test/test_bug459424.html             |   0
 .../base/test/test_bug461555.html             |   0
 .../base/test/test_bug461735.html             |   4 +-
 .../base/test/test_bug465767.html             |   0
 .../base/test/test_bug466080.html             |  16 +-
 .../base/test/test_bug466409.html             |   0
 .../base/test/test_bug466751.xhtml            |   0
 .../base/test/test_bug469020.html             |   0
 .../base/test/test_bug469304.html             |   0
 .../base/test/test_bug473162-1.html           |   0
 .../base/test/test_bug473162-2.html           |   0
 .../base/test/test_bug475156.html             |   2 +-
 .../base/test/test_bug482935.html             |   0
 .../base/test/test_bug484396.html             |   0
 .../base/test/test_bug493881.html             |   0
 {content => dom}/base/test/test_bug493881.js  |   0
 .../base/test/test_bug498240.html             |   0
 .../base/test/test_bug498433.html             |   0
 .../base/test/test_bug498897.html             |   0
 .../base/test/test_bug499656.html             |   0
 .../base/test/test_bug499656.xhtml            |   0
 .../base/test/test_bug500937.html             |   0
 .../base/test/test_bug503473.html             |   0
 .../base/test/test_bug503481.html             |   0
 .../base/test/test_bug503481b.html            |   0
 .../base/test/test_bug505783.html             |   0
 {content => dom}/base/test/test_bug51034.html |   0
 .../base/test/test_bug513194.html             |   0
 {content => dom}/base/test/test_bug5141.html  |   0
 .../base/test/test_bug514487.html             |   0
 .../base/test/test_bug515401.html             |   2 +-
 .../base/test/test_bug518104.html             |   0
 .../base/test/test_bug527896.html             |   0
 .../base/test/test_bug540854.html             |   0
 .../base/test/test_bug541937.html             |   0
 .../base/test/test_bug544642.html             |   0
 .../base/test/test_bug545644.html             |   0
 .../base/test/test_bug545644.xhtml            |   0
 .../base/test/test_bug548463.html             |   0
 .../base/test/test_bug553896.xhtml            |   0
 .../base/test/test_bug557892.html             |   0
 .../base/test/test_bug558726.html             |   0
 .../base/test/test_bug559526.html             |   0
 .../base/test/test_bug560780.html             |   0
 .../base/test/test_bug562137.html             |   0
 .../base/test/test_bug562169-1.html           |   0
 .../base/test/test_bug562169-2.html           |   0
 .../base/test/test_bug562652.html             |   0
 .../base/test/test_bug564047.html             |   0
 .../base/test/test_bug564863.xhtml            |   0
 .../base/test/test_bug567350.html             |   0
 .../base/test/test_bug578096.html             |   0
 .../base/test/test_bug585978.html             |   0
 .../base/test/test_bug587931.html             |   0
 .../base/test/test_bug588990.html             |   0
 .../base/test/test_bug590812.html             |   2 +-
 .../base/test/test_bug590870.html             |   2 +-
 .../base/test/test_bug592366.html             |   0
 .../base/test/test_bug592829.html             |   0
 .../base/test/test_bug597345.html             |   0
 .../base/test/test_bug599588.html             |   0
 .../base/test/test_bug601803.html             |   2 +-
 .../base/test/test_bug602838.html             |   0
 .../base/test/test_bug604592.html             |   0
 .../base/test/test_bug604660.html             |   0
 .../base/test/test_bug605982.html             |   0
 .../base/test/test_bug606729.html             |   0
 .../base/test/test_bug614058.html             |   0
 .../base/test/test_bug614583.html             |   0
 .../base/test/test_bug622088.html             |   0
 .../base/test/test_bug622117.html             |   0
 .../base/test/test_bug622246.html             |   0
 .../base/test/test_bug625722.html             |   0
 .../base/test/test_bug626262.html             |   0
 .../base/test/test_bug628938.html             |   0
 .../base/test/test_bug631615.html             |   0
 .../base/test/test_bug638112.html             |   0
 .../base/test/test_bug647518.html             |   0
 .../base/test/test_bug650001.html             |   0
 .../base/test/test_bug656283.html             |   0
 .../base/test/test_bug664916.html             |   0
 .../base/test/test_bug666604.html             |   0
 .../base/test/test_bug675121.html             |   0
 .../base/test/test_bug675166.html             |   0
 .../base/test/test_bug682463.html             |   0
 .../base/test/test_bug682554.html             |   0
 .../base/test/test_bug682592.html             |   0
 .../base/test/test_bug684671.html             |   0
 .../base/test/test_bug685798.html             |   0
 .../base/test/test_bug686449.xhtml            |   0
 .../base/test/test_bug687859.html             |   0
 .../base/test/test_bug690056.html             |   0
 .../base/test/test_bug692434.html             |   0
 .../base/test/test_bug693615.html             |   0
 .../base/test/test_bug693875.html             |   0
 .../base/test/test_bug694754.xhtml            |   0
 .../base/test/test_bug696301-1.html           |  10 +-
 .../base/test/test_bug696301-2.html           |  10 +-
 .../base/test/test_bug698381.html             |   0
 .../base/test/test_bug698384.html             |   0
 .../base/test/test_bug704063.html             |   0
 .../base/test/test_bug707142.html             |   0
 .../base/test/test_bug708620.html             |   0
 .../base/test/test_bug711047.html             |   0
 .../base/test/test_bug711180.html             |   0
 .../base/test/test_bug719533.html             |   0
 .../base/test/test_bug726364.html             |   0
 .../base/test/test_bug737087.html             |   0
 .../base/test/test_bug737565.html             |   0
 .../base/test/test_bug737612.html             |   0
 .../base/test/test_bug738108.html             |   0
 .../base/test/test_bug744830.html             |   0
 .../base/test/test_bug749367.html             |   0
 .../base/test/test_bug753278.html             |   0
 .../base/test/test_bug761120.html             |   0
 .../base/test/test_bug782342.html             |   0
 .../base/test/test_bug787778.html             |   0
 .../base/test/test_bug789856.html             |   0
 .../base/test/test_bug804395.html             |   6 +-
 .../base/test/test_bug809003.html             |   0
 .../base/test/test_bug810494.html             |   0
 .../base/test/test_bug811701.html             |   0
 .../base/test/test_bug811701.xhtml            |   0
 .../base/test/test_bug813919.html             |   0
 .../base/test/test_bug814576.html             |   0
 .../base/test/test_bug819051.html             |   2 +-
 .../base/test/test_bug820909.html             |   0
 .../base/test/test_bug827160.html             |   0
 .../base/test/test_bug840098.html             |   0
 .../base/test/test_bug864595.html             |   0
 .../base/test/test_bug868999.html             |   0
 .../base/test/test_bug869000.html             |   0
 .../base/test/test_bug869002.html             |   0
 .../base/test/test_bug869006.html             |   0
 .../base/test/test_bug876282.html             |   0
 .../base/test/test_bug890580.html             |   0
 .../base/test/test_bug891952.html             |   0
 .../base/test/test_bug894874.html             |   0
 .../base/test/test_bug895239.html             |   0
 .../base/test/test_bug895974.html             |   0
 .../base/test/test_bug902847.html             |   0
 .../base/test/test_bug907892.html             |   4 +-
 .../base/test/test_bug922681.html             |   0
 .../base/test/test_bug927196.html             |   0
 .../base/test/test_bug945152.html             |   0
 .../base/test/test_bug982153.html             |   0
 .../test/test_caretPositionFromPoint.html     |   0
 .../test_child_process_shutdown_message.html  |   0
 .../base/test/test_classList.html             |   0
 .../base/test/test_copyimage.html             |   0
 .../base/test/test_copypaste.html             |   0
 .../base/test/test_copypaste.xhtml            |   0
 {content => dom}/base/test/test_copypaste.xul |   0
 .../base/test/test_createHTMLDocument.html    |   0
 .../test_declare_stylesheet_obsolete.html     |   0
 .../base/test/test_document_constructor.html  |   0
 .../base/test/test_domparser_null_char.html   |   0
 .../base/test/test_domparsing.html            |   0
 .../base/test/test_element.matches.html       |   0
 .../base/test/test_elementTraversal.html      |   0
 .../base/test/test_element_closest.html       |   0
 .../test_encodeToStringWithMaxLength.html     |   0
 .../base/test/test_file_from_blob.html        |   0
 {content => dom}/base/test/test_fileapi.html  |   0
 .../base/test/test_fileapi_slice.html         |   0
 .../base/test/test_getElementById.html        |   0
 .../base/test/test_html_colors_quirks.html    |   0
 .../base/test/test_html_colors_standards.html |   0
 .../base/test/test_html_in_xhr.html           |   0
 .../base/test/test_htmlcopyencoder.html       |   0
 .../base/test/test_htmlcopyencoder.xhtml      |   0
 .../test/test_ipc_messagemanager_blob.html    |   0
 .../test_messagemanager_assertpermission.html |   0
 .../test/test_messagemanager_principal.html   |   0
 .../test_messagemanager_send_principal.html   |   0
 .../base/test/test_meta_viewport0.html        |   0
 .../base/test/test_meta_viewport1.html        |   0
 .../base/test/test_meta_viewport2.html        |   0
 .../base/test/test_meta_viewport3.html        |   0
 .../base/test/test_meta_viewport4.html        |   0
 .../base/test/test_meta_viewport5.html        |   0
 .../base/test/test_meta_viewport6.html        |   0
 .../base/test/test_mixed_content_blocker.html |   2 +-
 .../test_mixed_content_blocker_bug803225.html |   4 +-
 ...mixed_content_blocker_frameNavigation.html |   6 +-
 .../base/test/test_mozMatchesSelector.html    |   0
 .../base/test/test_mozfiledataurl.html        |   2 +-
 .../base/test/test_mutationobservers.html     |   0
 .../base/test/test_nodelist_holes.html        |   0
 {content => dom}/base/test/test_object.html   |   0
 .../base/test/test_plugin_freezing.html       |   0
 ...essing_instruction_update_stylesheet.xhtml |   0
 .../test_progress_events_for_gzip_data.html   |   0
 .../base/test/test_range_bounds.html          |   0
 .../base/test/test_reentrant_flush.html       |   0
 .../base/test/test_sync_xhr_timer.xhtml       |   0
 .../base/test/test_text_wholeText.html        |   0
 .../test_textnode_normalize_in_selection.html |   0
 .../test_textnode_split_in_selection.html     |   0
 {content => dom}/base/test/test_title.html    |   0
 .../base/test/test_treewalker_nextsibling.xml |   0
 .../base/test/test_user_select.html           |   0
 .../base/test/test_viewport_scroll.html       |   0
 .../test_viewsource_forbidden_in_object.html  |   0
 .../base/test/test_w3element_traversal.html   |   0
 .../base/test/test_w3element_traversal.xhtml  |   0
 .../test/test_w3element_traversal_svg.html    |   0
 ...arning_for_blocked_cross_site_request.html |   4 +-
 .../base/test/test_websocket.html             | 106 +--
 .../base/test/test_websocket_basic.html       |   4 +-
 .../base/test/test_websocket_hello.html       |   2 +-
 .../base/test/test_x-frame-options.html       |   6 +-
 .../base/test/test_xbl_userdata.xhtml         |   0
 .../base/test/test_xhr_abort_after_load.html  |   0
 .../base/test/test_xhr_forbidden_headers.html |   0
 .../base/test/test_xhr_progressevents.html    |   0
 .../base/test/test_xhr_send_readystate.html   |   0
 .../base/test/test_xhr_withCredentials.html   |   0
 .../base/test/unit/1_original.xml             |   0
 {content => dom}/base/test/unit/1_result.xml  |   0
 .../base/test/unit/2_original.xml             |   0
 .../base/test/unit/2_result_1.xml             |   0
 .../base/test/unit/2_result_2.xml             |   0
 .../base/test/unit/2_result_3.xml             |   0
 .../base/test/unit/2_result_4.xml             |   0
 .../base/test/unit/3_original.xml             |   0
 {content => dom}/base/test/unit/3_result.xml  |   0
 .../base/test/unit/3_result_2.xml             |   0
 .../base/test/unit/4_original.xml             |   0
 .../base/test/unit/4_result_1.xml             |   0
 .../base/test/unit/4_result_2.xml             |   0
 .../base/test/unit/4_result_3.xml             |   0
 .../base/test/unit/4_result_4.xml             |   0
 .../base/test/unit/4_result_5.xml             |   0
 .../base/test/unit/4_result_6.xml             |   0
 .../base/test/unit/head_utilities.js          |   0
 .../base/test/unit/test_bug553888.js          |   0
 .../base/test/unit/test_bug737966.js          |   0
 .../base/test/unit/test_cspreports.js         |   0
 .../base/test/unit/test_error_codes.js        |   0
 .../base/test/unit/test_thirdpartyutil.js     |   0
 .../base/test/unit/test_xhr_document.js       |   0
 .../base/test/unit/test_xhr_standalone.js     |   0
 .../base/test/unit/test_xmlserializer.js      |   0
 {content => dom}/base/test/unit/xpcshell.ini  |   0
 .../base/test/unit_ipc/test_bug553888_wrap.js |   0
 .../test/unit_ipc/test_xhr_document_ipc.js    |   0
 .../base/test/unit_ipc/xpcshell.ini           |   0
 .../base/test/variable_style_sheet.sjs        |   0
 .../base/test/viewport_helpers.js             |   0
 .../base/test/w3element_traversal.svg         |   0
 .../websocket_hybi/file_binary-frames_wsh.py  |   0
 .../file_check-binary-messages_wsh.py         |   0
 .../base/test/websocket_hybi/mochitest.ini    |   0
 .../test_receive-arraybuffer.html             |   2 +-
 .../websocket_hybi/test_receive-blob.html     |   2 +-
 .../websocket_hybi/test_send-arraybuffer.html |   2 +-
 .../test/websocket_hybi/test_send-blob.html   |   2 +-
 .../base/test/wholeTexty-helper.xml           |   0
 dom/bindings/moz.build                        |   1 -
 dom/browser-element/moz.build                 |   1 -
 dom/canvas/moz.build                          |   1 -
 dom/devicestorage/moz.build                   |   1 -
 dom/events/moz.build                          |   1 -
 dom/geolocation/moz.build                     |   1 -
 dom/html/moz.build                            |   1 -
 dom/indexedDB/moz.build                       |   1 -
 dom/ipc/moz.build                             |   1 -
 dom/json/moz.build                            |   2 +-
 dom/mathml/moz.build                          |   2 +-
 dom/media/android/moz.build                   |   2 +-
 dom/media/gstreamer/moz.build                 |   2 +-
 dom/media/moz.build                           |   1 -
 dom/media/omx/moz.build                       |   2 +-
 dom/media/raw/moz.build                       |   2 +-
 dom/notification/moz.build                    |   1 -
 dom/offline/moz.build                         |   3 +-
 dom/plugins/base/moz.build                    |   1 -
 dom/smil/moz.build                            |   2 +-
 dom/svg/moz.build                             |   2 +-
 dom/workers/moz.build                         |   2 +-
 dom/workers/test/test_xhr_parameters.js       |   2 +-
 dom/workers/test/test_xhr_responseURL.html    |   2 +-
 dom/workers/test/test_xhr_system.js           |   2 +-
 dom/workers/test/test_xhr_timeout.html        |   2 +-
 dom/workers/test/websocket_basic_worker.js    |   2 +-
 .../test/websocket_loadgroup_worker.js        |   2 +-
 dom/workers/test/websocket_worker.js          |  86 +--
 dom/xbl/moz.build                             |   1 -
 dom/xml/moz.build                             |   1 -
 dom/xslt/xml/moz.build                        |   2 +-
 dom/xslt/xslt/moz.build                       |   2 +-
 dom/xul/moz.build                             |   1 -
 dom/xul/templates/moz.build                   |   1 -
 editor/libeditor/moz.build                    |   2 +-
 embedding/browser/moz.build                   |   2 +-
 .../printingui/win/nsPrintDialogUtil.cpp      |   2 +-
 .../components/webbrowserpersist/moz.build    |   2 +-
 extensions/spellcheck/hunspell/src/moz.build  |   2 +-
 extensions/spellcheck/src/moz.build           |   2 +-
 image/src/moz.build                           |   2 +-
 js/xpconnect/loader/moz.build                 |   2 +-
 js/xpconnect/src/moz.build                    |   2 -
 layout/base/moz.build                         |   1 -
 layout/build/moz.build                        |   1 -
 layout/forms/moz.build                        |   2 +-
 layout/generic/moz.build                      |   3 +-
 layout/inspector/moz.build                    |   2 +-
 layout/ipc/moz.build                          |   2 +-
 layout/mathml/moz.build                       |   2 +-
 layout/printing/moz.build                     |   2 +-
 layout/style/moz.build                        |   1 -
 layout/svg/moz.build                          |   2 +-
 layout/tables/moz.build                       |   2 +-
 layout/xul/moz.build                          |   2 +-
 layout/xul/tree/moz.build                     |   2 +-
 mobile/android/components/build/moz.build     |   2 +-
 mobile/android/installer/package-manifest.in  |   1 -
 netwerk/protocol/http/moz.build               |   2 +-
 netwerk/protocol/rtsp/moz.build               |   2 +-
 netwerk/protocol/websocket/moz.build          |   2 +-
 netwerk/sctp/src/moz.build                    |   2 +-
 parser/html/moz.build                         |   2 +-
 testing/crashtest/crashtests.list             |   2 -
 testing/mochitest/androidx86.json             |   2 +-
 testing/mochitest/pywebsocket/README-MOZILLA  |   2 +-
 .../specialpowers/content/specialpowersAPI.js |   2 +-
 .../resources/xmlhttprequest-timeout.js       |   2 +-
 uriloader/exthandler/moz.build                |   1 -
 uriloader/prefetch/moz.build                  |   2 +-
 1381 files changed, 1674 insertions(+), 1786 deletions(-)
 delete mode 100644 content/base/crashtests/crashtests.list
 delete mode 100644 content/base/moz.build
 delete mode 100644 content/base/public/moz.build
 delete mode 100644 content/base/src/moz.build
 delete mode 100644 content/base/test/bug461735-redirect1.sjs
 delete mode 100644 content/base/test/bug461735-redirect2.sjs
 delete mode 100644 content/base/test/chrome.ini
 delete mode 100644 content/base/test/csp/file_bug836922_npolicies.html
 delete mode 100644 content/base/test/csp/file_bug836922_npolicies.html^headers^
 delete mode 100644 content/base/test/csp/file_bug886164.html
 delete mode 100644 content/base/test/csp/file_bug886164_3.html
 delete mode 100644 content/base/test/csp/file_bug886164_4.html
 delete mode 100644 content/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
 delete mode 100644 content/base/test/file_XHR_fail1.txt^headers^
 delete mode 100644 content/base/test/file_x-frame-options_main.html
 delete mode 100644 content/base/test/mochitest.ini
 rename {content/base/src => dom/base}/Attr.cpp (100%)
 rename {content/base/src => dom/base}/Attr.h (100%)
 rename {content/base/src => dom/base}/AutocompleteFieldList.h (100%)
 rename {content/base/public => dom/base}/BlobSet.h (100%)
 rename {content/base/public => dom/base}/CORSMode.h (100%)
 rename {content/base/src => dom/base}/ChildIterator.cpp (100%)
 rename {content/base/src => dom/base}/ChildIterator.h (100%)
 rename {content/base/src => dom/base}/Comment.cpp (100%)
 rename {content/base/src => dom/base}/Comment.h (100%)
 rename {content/base/src => dom/base}/DOMImplementation.cpp (100%)
 rename {content/base/src => dom/base}/DOMImplementation.h (100%)
 rename {content/base/src => dom/base}/DOMMatrix.cpp (100%)
 rename {content/base/src => dom/base}/DOMMatrix.h (100%)
 rename {content/base/src => dom/base}/DOMParser.cpp (100%)
 rename {content/base/src => dom/base}/DOMParser.h (100%)
 rename {content/base/src => dom/base}/DOMPoint.cpp (100%)
 rename {content/base/src => dom/base}/DOMPoint.h (100%)
 rename {content/base/src => dom/base}/DOMQuad.cpp (100%)
 rename {content/base/src => dom/base}/DOMQuad.h (100%)
 rename {content/base/src => dom/base}/DOMRect.cpp (100%)
 rename {content/base/src => dom/base}/DOMRect.h (100%)
 rename {content/base/src => dom/base}/DOMStringList.cpp (100%)
 rename {content/base/src => dom/base}/DOMStringList.h (100%)
 rename {content/base/src => dom/base}/DirectionalityUtils.cpp (100%)
 rename {content/base/public => dom/base}/DirectionalityUtils.h (100%)
 rename {content/base/src => dom/base}/DocumentFragment.cpp (100%)
 rename {content/base/src => dom/base}/DocumentFragment.h (100%)
 rename {content/base/src => dom/base}/DocumentType.cpp (100%)
 rename {content/base/src => dom/base}/DocumentType.h (100%)
 rename {content/base/src => dom/base}/Element.cpp (100%)
 rename {content/base/public => dom/base}/Element.h (100%)
 rename {content/base/public => dom/base}/ElementInlines.h (100%)
 rename {content/base/src => dom/base}/EventSource.cpp (100%)
 rename {content/base/src => dom/base}/EventSource.h (100%)
 rename {content/base/src => dom/base}/FeedWriterEnabled.h (100%)
 rename {content/base/src => dom/base}/File.cpp (100%)
 rename {content/base/public => dom/base}/File.h (100%)
 rename {content/base/src => dom/base}/FileIOObject.cpp (100%)
 rename {content/base/src => dom/base}/FileIOObject.h (100%)
 rename {content/base/src => dom/base}/FragmentOrElement.cpp (100%)
 rename {content/base/public => dom/base}/FragmentOrElement.h (100%)
 rename {content/base/public => dom/base}/FromParser.h (100%)
 rename {content/base/public => dom/base}/HTMLSplitOnSpacesTokenizer.h (100%)
 rename {content/base/src => dom/base}/ImportManager.cpp (100%)
 rename {content/base/src => dom/base}/ImportManager.h (100%)
 rename {content/base/src => dom/base}/Link.cpp (100%)
 rename {content/base/src => dom/base}/Link.h (100%)
 rename {content/base/src => dom/base}/MultipartFileImpl.cpp (100%)
 rename {content/base/src => dom/base}/MultipartFileImpl.h (100%)
 rename {content/base/src => dom/base}/NodeIterator.cpp (100%)
 rename {content/base/src => dom/base}/NodeIterator.h (100%)
 rename {content/base/src => dom/base}/ResponsiveImageSelector.cpp (100%)
 rename {content/base/src => dom/base}/ResponsiveImageSelector.h (100%)
 rename {content/base/src => dom/base}/ShadowRoot.cpp (100%)
 rename {content/base/src => dom/base}/ShadowRoot.h (100%)
 rename {content/base/src => dom/base}/StyleSheetList.cpp (100%)
 rename {content/base/src => dom/base}/StyleSheetList.h (100%)
 rename {content/base/src => dom/base}/Text.cpp (100%)
 rename {content/base/src => dom/base}/Text.h (100%)
 rename {content/base/src => dom/base}/ThirdPartyUtil.cpp (100%)
 rename {content/base/src => dom/base}/ThirdPartyUtil.h (100%)
 rename {content/base/src => dom/base}/TreeWalker.cpp (100%)
 rename {content/base/src => dom/base}/TreeWalker.h (100%)
 rename {content/base/src => dom/base}/WebSocket.cpp (100%)
 rename {content/base/src => dom/base}/WebSocket.h (100%)
 rename {content/base/src => dom/base}/contentAreaDropListener.js (100%)
 rename {content/base/src => dom/base}/contentAreaDropListener.manifest (100%)
 rename {content => dom}/base/crashtests/1024428-1.html (100%)
 rename {content => dom}/base/crashtests/1026714.html (100%)
 rename {content => dom}/base/crashtests/1027461-1.html (100%)
 rename {content => dom}/base/crashtests/1027461-inner.xul (100%)
 rename {content => dom}/base/crashtests/116848-1.html (100%)
 rename {content => dom}/base/crashtests/149320-1.html (100%)
 rename {content => dom}/base/crashtests/205225-1.html (100%)
 rename {content => dom}/base/crashtests/231475-1.html (100%)
 rename {content => dom}/base/crashtests/293388-1.html (100%)
 rename {content => dom}/base/crashtests/308120-1.xul (100%)
 rename {content => dom}/base/crashtests/324871-1.html (100%)
 rename {content => dom}/base/crashtests/325730-1.html (100%)
 rename {content => dom}/base/crashtests/326618-1.html (100%)
 rename {content => dom}/base/crashtests/326646-1.html (100%)
 rename {content => dom}/base/crashtests/326778-1.xul (100%)
 rename {content => dom}/base/crashtests/326865-1.html (100%)
 rename {content => dom}/base/crashtests/327694.html (100%)
 rename {content => dom}/base/crashtests/330925-1.xhtml (100%)
 rename {content => dom}/base/crashtests/336381-1.xhtml (100%)
 rename {content => dom}/base/crashtests/336715-1.xhtml (100%)
 rename {content => dom}/base/crashtests/338391-1.xhtml (100%)
 rename {content => dom}/base/crashtests/340733-1.html (100%)
 rename {content => dom}/base/crashtests/343730-1.xhtml (100%)
 rename {content => dom}/base/crashtests/343850-1.xhtml (100%)
 rename {content => dom}/base/crashtests/343889-1.html (100%)
 rename {content => dom}/base/crashtests/344434-1.xhtml (100%)
 rename {content => dom}/base/crashtests/344882-1.html (100%)
 rename {content => dom}/base/crashtests/345837-1.xhtml (100%)
 rename {content => dom}/base/crashtests/348049-1.xhtml (100%)
 rename {content => dom}/base/crashtests/349355-1.html (100%)
 rename {content => dom}/base/crashtests/354645-1.xul (100%)
 rename {content => dom}/base/crashtests/360599-1.html (100%)
 rename {content => dom}/base/crashtests/366200-1.xhtml (100%)
 rename {content => dom}/base/crashtests/371466-1.xhtml (100%)
 rename {content => dom}/base/crashtests/377360-1.xhtml (100%)
 rename {content => dom}/base/crashtests/377960-1.html (100%)
 rename {content => dom}/base/crashtests/377960-2.html (100%)
 rename {content => dom}/base/crashtests/384663-1-inner.xul (100%)
 rename {content => dom}/base/crashtests/384663-1.html (100%)
 rename {content => dom}/base/crashtests/386000-1.html (100%)
 rename {content => dom}/base/crashtests/386794-1.html (100%)
 rename {content => dom}/base/crashtests/387460-1-inner.xhtml (100%)
 rename {content => dom}/base/crashtests/387460-1.html (100%)
 rename {content => dom}/base/crashtests/395469-1.xhtml (100%)
 rename {content => dom}/base/crashtests/395469-2.xhtml (100%)
 rename {content => dom}/base/crashtests/398088-1.xul (100%)
 rename {content => dom}/base/crashtests/399712-1.html (100%)
 rename {content => dom}/base/crashtests/400763-1.html (100%)
 rename {content => dom}/base/crashtests/401993-1.html (100%)
 rename {content => dom}/base/crashtests/401993-1.xml (100%)
 rename {content => dom}/base/crashtests/407818.html (100%)
 rename {content => dom}/base/crashtests/410860-1.xml (100%)
 rename {content => dom}/base/crashtests/411882-1.xhtml (100%)
 rename {content => dom}/base/crashtests/416734-1.html (100%)
 rename {content => dom}/base/crashtests/418928-1.html (100%)
 rename {content => dom}/base/crashtests/420620-1.html (100%)
 rename {content => dom}/base/crashtests/424276-1.html (100%)
 rename {content => dom}/base/crashtests/426987-1.html (100%)
 rename {content => dom}/base/crashtests/43040-1.html (100%)
 rename {content => dom}/base/crashtests/443538-1.svg (100%)
 rename {content => dom}/base/crashtests/448615-1.html (100%)
 rename {content => dom}/base/crashtests/450383-1.html (100%)
 rename {content => dom}/base/crashtests/450385-1.html (100%)
 rename {content => dom}/base/crashtests/458637-1-inner.xhtml (100%)
 rename {content => dom}/base/crashtests/458637-1.html (100%)
 rename {content => dom}/base/crashtests/467392.html (100%)
 rename {content => dom}/base/crashtests/472593-1.html (100%)
 rename {content => dom}/base/crashtests/474041-1.svg (100%)
 rename {content => dom}/base/crashtests/483818-1.html (100%)
 rename {content => dom}/base/crashtests/490760-1.xhtml (100%)
 rename {content => dom}/base/crashtests/493281-1.html (100%)
 rename {content => dom}/base/crashtests/493281-2.html (100%)
 rename {content => dom}/base/crashtests/494810-1.html (100%)
 rename {content => dom}/base/crashtests/509536-1.html (100%)
 rename {content => dom}/base/crashtests/522516-1.html (100%)
 rename {content => dom}/base/crashtests/529670.html (100%)
 rename {content => dom}/base/crashtests/535926-1.html (100%)
 rename {content => dom}/base/crashtests/543645.html (100%)
 rename {content => dom}/base/crashtests/551631-1.html (100%)
 rename {content => dom}/base/crashtests/552651.html (100%)
 rename {content => dom}/base/crashtests/552651.xml (100%)
 rename {content => dom}/base/crashtests/554230-1.xhtml (100%)
 rename {content => dom}/base/crashtests/558973.html (100%)
 rename {content => dom}/base/crashtests/561981-1-iframe.xhtml (100%)
 rename {content => dom}/base/crashtests/561981-1.html (100%)
 rename {content => dom}/base/crashtests/561981-2-iframe.xhtml (100%)
 rename {content => dom}/base/crashtests/561981-2.html (100%)
 rename {content => dom}/base/crashtests/564079-1.html (100%)
 rename {content => dom}/base/crashtests/564114.html (100%)
 rename {content => dom}/base/crashtests/565125-1.html (100%)
 rename {content => dom}/base/crashtests/575462.svg (100%)
 rename {content => dom}/base/crashtests/582601.html (100%)
 rename {content => dom}/base/crashtests/590395-1.html (100%)
 rename {content => dom}/base/crashtests/593302-1.html (100%)
 rename {content => dom}/base/crashtests/593302-2.html (100%)
 rename {content => dom}/base/crashtests/595606-1.html (100%)
 rename {content => dom}/base/crashtests/595606-2.html (100%)
 rename {content => dom}/base/crashtests/604262-1.html (100%)
 rename {content => dom}/base/crashtests/605672-1.svg (100%)
 rename {content => dom}/base/crashtests/606729-1.html (100%)
 rename {content => dom}/base/crashtests/610571-1.html (100%)
 rename {content => dom}/base/crashtests/628599-1.html (100%)
 rename {content => dom}/base/crashtests/637214-1.svg (100%)
 rename {content => dom}/base/crashtests/637214-2.svg (100%)
 rename {content => dom}/base/crashtests/642022-1.html (100%)
 rename {content => dom}/base/crashtests/646184.html (100%)
 rename {content => dom}/base/crashtests/658845-1.svg (100%)
 rename {content => dom}/base/crashtests/667336-1.html (100%)
 rename {content => dom}/base/crashtests/679459.html (100%)
 rename {content => dom}/base/crashtests/679689-1.html (100%)
 rename {content => dom}/base/crashtests/682463.html (100%)
 rename {content => dom}/base/crashtests/693212.xhtml (100%)
 rename {content => dom}/base/crashtests/698974-1.html (100%)
 rename {content => dom}/base/crashtests/700090-1.html (100%)
 rename {content => dom}/base/crashtests/700090-2.html (100%)
 rename {content => dom}/base/crashtests/700512-worker.js (100%)
 rename {content => dom}/base/crashtests/700512.html (100%)
 rename {content => dom}/base/crashtests/709384.html (100%)
 rename {content => dom}/base/crashtests/709954.html (100%)
 rename {content => dom}/base/crashtests/713417-2.html (100%)
 rename {content => dom}/base/crashtests/713417.html (100%)
 rename {content => dom}/base/crashtests/715056.html (100%)
 rename {content => dom}/base/crashtests/741163-1.html (100%)
 rename {content => dom}/base/crashtests/752226-1.html (100%)
 rename {content => dom}/base/crashtests/752226-2.html (100%)
 rename {content => dom}/base/crashtests/766426.html (100%)
 rename {content => dom}/base/crashtests/771639.html (100%)
 rename {content => dom}/base/crashtests/786854.html (100%)
 rename {content => dom}/base/crashtests/815043.html (100%)
 rename {content => dom}/base/crashtests/815276.html (100%)
 rename {content => dom}/base/crashtests/815477.html (100%)
 rename {content => dom}/base/crashtests/815500.html (100%)
 rename {content => dom}/base/crashtests/816253.html (100%)
 rename {content => dom}/base/crashtests/819014.html (100%)
 rename {content => dom}/base/crashtests/822691.html (100%)
 rename {content => dom}/base/crashtests/822723.html (100%)
 rename {content => dom}/base/crashtests/824719.html (100%)
 rename {content => dom}/base/crashtests/827190.html (100%)
 rename {content => dom}/base/crashtests/828054.html (100%)
 rename {content => dom}/base/crashtests/828903-iframe.html (100%)
 rename {content => dom}/base/crashtests/828903.html (100%)
 rename {content => dom}/base/crashtests/829428.html (100%)
 rename {content => dom}/base/crashtests/830098.html (100%)
 rename {content => dom}/base/crashtests/831287.html (100%)
 rename {content => dom}/base/crashtests/832644.html (100%)
 rename {content => dom}/base/crashtests/836890.html (100%)
 rename {content => dom}/base/crashtests/838489-1.html (100%)
 rename {content => dom}/base/crashtests/838489-2.html (100%)
 rename {content => dom}/base/crashtests/841205.html (100%)
 rename {content => dom}/base/crashtests/844404.html (100%)
 rename {content => dom}/base/crashtests/845093-1.html (100%)
 rename {content => dom}/base/crashtests/845093-2.html (100%)
 rename {content => dom}/base/crashtests/847127.html (100%)
 rename {content => dom}/base/crashtests/849601.html (100%)
 rename {content => dom}/base/crashtests/849727.html (100%)
 rename {content => dom}/base/crashtests/849732.html (100%)
 rename {content => dom}/base/crashtests/851353-1.html (100%)
 rename {content => dom}/base/crashtests/863950.html (100%)
 rename {content => dom}/base/crashtests/864448.html (100%)
 rename {content => dom}/base/crashtests/930250.html (100%)
 rename {content => dom}/base/crashtests/942979.html (100%)
 rename {content => dom}/base/crashtests/978646.html (100%)
 rename {content => dom}/base/crashtests/xhr_abortinprogress.html (100%)
 rename {content => dom}/base/crashtests/xhr_empty_datauri.html (100%)
 rename {content => dom}/base/crashtests/xhr_html_nullresponse.html (100%)
 rename {content/base/src => dom/base}/messageWakeupService.js (100%)
 rename {content/base/src => dom/base}/messageWakeupService.manifest (100%)
 rename {content/base/src => dom/base}/mozAutoDocUpdate.h (100%)
 rename {content/base/public => dom/base}/mozFlushType.h (100%)
 rename {content/base/src => dom/base}/nsAtomListUtils.cpp (100%)
 rename {content/base/src => dom/base}/nsAtomListUtils.h (100%)
 rename {content/base/src => dom/base}/nsAttrAndChildArray.cpp (100%)
 rename {content/base/src => dom/base}/nsAttrAndChildArray.h (100%)
 rename {content/base/src => dom/base}/nsAttrName.h (100%)
 rename {content/base/src => dom/base}/nsAttrValue.cpp (100%)
 rename {content/base/src => dom/base}/nsAttrValue.h (100%)
 rename {content/base/src => dom/base}/nsAttrValueInlines.h (100%)
 rename {content/base/src => dom/base}/nsAttrValueOrString.cpp (100%)
 rename {content/base/src => dom/base}/nsAttrValueOrString.h (100%)
 rename {content/base/src => dom/base}/nsCCUncollectableMarker.cpp (100%)
 rename {content/base/src => dom/base}/nsCCUncollectableMarker.h (100%)
 rename {content/base/src => dom/base}/nsCSPContext.cpp (100%)
 rename {content/base/src => dom/base}/nsCSPContext.h (100%)
 rename {content/base/src => dom/base}/nsCSPParser.cpp (100%)
 rename {content/base/src => dom/base}/nsCSPParser.h (100%)
 rename {content/base/src => dom/base}/nsCSPService.cpp (100%)
 rename {content/base/src => dom/base}/nsCSPService.h (100%)
 rename {content/base/src => dom/base}/nsCSPUtils.cpp (100%)
 rename {content/base/src => dom/base}/nsCSPUtils.h (100%)
 rename {content/base/public => dom/base}/nsCaseTreatment.h (100%)
 rename {content/base/src => dom/base}/nsContentAreaDragDrop.cpp (100%)
 rename {content/base/src => dom/base}/nsContentAreaDragDrop.h (100%)
 rename {content/base/public => dom/base}/nsContentCID.h (100%)
 rename {content/base/public => dom/base}/nsContentCreatorFunctions.h (100%)
 rename {content/base/src => dom/base}/nsContentIterator.cpp (100%)
 rename {content/base/src => dom/base}/nsContentList.cpp (100%)
 rename {content/base/src => dom/base}/nsContentList.h (100%)
 rename {content/base/src => dom/base}/nsContentListDeclarations.h (100%)
 rename {content/base/src => dom/base}/nsContentPolicy.cpp (100%)
 rename {content/base/src => dom/base}/nsContentPolicy.h (100%)
 rename {content/base/public => dom/base}/nsContentPolicyUtils.h (100%)
 rename {content/base/src => dom/base}/nsContentSink.cpp (100%)
 rename {content/base/src => dom/base}/nsContentSink.h (100%)
 rename {content/base/public => dom/base}/nsContentTypeParser.h (100%)
 rename {content/base/src => dom/base}/nsContentUtils.cpp (100%)
 rename {content/base/public => dom/base}/nsContentUtils.h (100%)
 rename {content/base/src => dom/base}/nsCopySupport.cpp (100%)
 rename {content/base/public => dom/base}/nsCopySupport.h (100%)
 rename {content/base/src => dom/base}/nsCrossSiteListenerProxy.cpp (100%)
 rename {content/base/src => dom/base}/nsCrossSiteListenerProxy.h (100%)
 rename {content/base/src => dom/base}/nsDOMAttributeMap.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMAttributeMap.h (100%)
 rename {content/base/src => dom/base}/nsDOMCaretPosition.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMCaretPosition.h (100%)
 rename {content/base/src => dom/base}/nsDOMDataChannel.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMDataChannel.h (100%)
 rename {content/base/src => dom/base}/nsDOMDataChannelDeclarations.h (100%)
 rename {content/base/src => dom/base}/nsDOMFileReader.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMFileReader.h (100%)
 rename {content/base/src => dom/base}/nsDOMMutationObserver.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMMutationObserver.h (100%)
 rename {content/base/src => dom/base}/nsDOMSerializer.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMSerializer.h (100%)
 rename {content/base/src => dom/base}/nsDOMSettableTokenList.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMSettableTokenList.h (100%)
 rename {content/base/src => dom/base}/nsDOMTokenList.cpp (100%)
 rename {content/base/src => dom/base}/nsDOMTokenList.h (100%)
 rename {content/base/src => dom/base}/nsDataDocumentContentPolicy.cpp (100%)
 rename {content/base/src => dom/base}/nsDataDocumentContentPolicy.h (100%)
 rename {content/base/public => dom/base}/nsDeprecatedOperationList.h (100%)
 rename {content/base/public => dom/base}/nsDocElementCreatedNotificationRunner.h (100%)
 rename {content/base/src => dom/base}/nsDocument.cpp (100%)
 rename {content/base/src => dom/base}/nsDocument.h (100%)
 rename {content/base/src => dom/base}/nsDocumentEncoder.cpp (100%)
 rename {content/base/src => dom/base}/nsElementFrameLoaderOwner.cpp (100%)
 rename {content/base/src => dom/base}/nsElementFrameLoaderOwner.h (100%)
 rename {content/base/src => dom/base}/nsFormData.cpp (100%)
 rename {content/base/src => dom/base}/nsFormData.h (100%)
 rename {content/base/src => dom/base}/nsFrameLoader.cpp (100%)
 rename {content/base/src => dom/base}/nsFrameLoader.h (100%)
 rename {content/base/src => dom/base}/nsFrameMessageManager.cpp (100%)
 rename {content/base/src => dom/base}/nsFrameMessageManager.h (100%)
 rename {content/base/src => dom/base}/nsGenConImageContent.cpp (100%)
 rename {content/base/src => dom/base}/nsGenericDOMDataNode.cpp (100%)
 rename {content/base/src => dom/base}/nsGenericDOMDataNode.h (100%)
 rename {content/base/src => dom/base}/nsGkAtomList.h (100%)
 rename {content/base/src => dom/base}/nsGkAtoms.cpp (100%)
 rename {content/base/src => dom/base}/nsGkAtoms.h (100%)
 rename {content/base/src => dom/base}/nsHTMLContentSerializer.cpp (100%)
 rename {content/base/src => dom/base}/nsHTMLContentSerializer.h (100%)
 rename {content/base/src => dom/base}/nsHostObjectProtocolHandler.cpp (100%)
 rename {content/base/public => dom/base}/nsHostObjectProtocolHandler.h (100%)
 rename {content/base/src => dom/base}/nsHostObjectURI.cpp (100%)
 rename {content/base/src => dom/base}/nsHostObjectURI.h (100%)
 rename {content/base/public => dom/base}/nsIAttribute.h (100%)
 rename {content/base/public => dom/base}/nsIContent.h (100%)
 rename {content/base/public => dom/base}/nsIContentInlines.h (100%)
 rename {content/base/public => dom/base}/nsIContentIterator.h (100%)
 rename {content/base/public => dom/base}/nsIContentPolicy.idl (100%)
 rename {content/base/public => dom/base}/nsIContentSecurityPolicy.idl (100%)
 rename {content/base/public => dom/base}/nsIContentSerializer.h (100%)
 rename {content/base/public => dom/base}/nsIDOMDataChannel.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMFile.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMFileList.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMFileReader.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMFormData.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMParser.idl (100%)
 rename {content/base/public => dom/base}/nsIDOMSerializer.idl (100%)
 rename {content/base/public => dom/base}/nsIDocument.h (100%)
 rename {content/base/public => dom/base}/nsIDocumentEncoder.idl (100%)
 rename {content/base/public => dom/base}/nsIDocumentInlines.h (100%)
 rename {content/base/public => dom/base}/nsIDocumentObserver.h (100%)
 rename {content/base/public => dom/base}/nsIDroppedLinkHandler.idl (100%)
 rename {content/base/public => dom/base}/nsIFrameLoader.idl (100%)
 rename {content/base/public => dom/base}/nsIImageLoadingContent.idl (100%)
 rename {content/base/public => dom/base}/nsIMessageManager.idl (100%)
 rename {content/base/public => dom/base}/nsIMutationObserver.h (100%)
 rename {content/base/src => dom/base}/nsINode.cpp (100%)
 rename {content/base/public => dom/base}/nsINode.h (100%)
 rename {content/base/public => dom/base}/nsINodeList.h (100%)
 rename {content/base/public => dom/base}/nsIObjectLoadingContent.idl (100%)
 rename {content/base/public => dom/base}/nsIScriptElement.h (100%)
 rename {content/base/public => dom/base}/nsIScriptLoaderObserver.idl (100%)
 rename {content/base/public => dom/base}/nsISelection.idl (100%)
 rename {content/base/public => dom/base}/nsISelectionController.idl (100%)
 rename {content/base/public => dom/base}/nsISelectionDisplay.idl (100%)
 rename {content/base/public => dom/base}/nsISelectionListener.idl (100%)
 rename {content/base/public => dom/base}/nsISelectionPrivate.idl (100%)
 rename {content/base/public => dom/base}/nsIStyleSheetLinkingElement.h (100%)
 rename {content/base/public => dom/base}/nsIXMLHttpRequest.idl (100%)
 rename {content/base/src => dom/base}/nsImageLoadingContent.cpp (100%)
 rename {content/base/src => dom/base}/nsImageLoadingContent.h (100%)
 rename {content/base/src => dom/base}/nsInProcessTabChildGlobal.cpp (100%)
 rename {content/base/src => dom/base}/nsInProcessTabChildGlobal.h (100%)
 rename {content/base/src => dom/base}/nsLineBreaker.cpp (100%)
 rename {content/base/public => dom/base}/nsLineBreaker.h (100%)
 rename {content/base/src => dom/base}/nsMappedAttributeElement.cpp (100%)
 rename {content/base/src => dom/base}/nsMappedAttributeElement.h (100%)
 rename {content/base/src => dom/base}/nsMappedAttributes.cpp (100%)
 rename {content/base/src => dom/base}/nsMappedAttributes.h (100%)
 rename {content/base/src => dom/base}/nsMixedContentBlocker.cpp (100%)
 rename {content/base/src => dom/base}/nsMixedContentBlocker.h (100%)
 rename {content/base/src => dom/base}/nsNameSpaceManager.cpp (100%)
 rename {content/base/public => dom/base}/nsNameSpaceManager.h (100%)
 rename {content/base/src => dom/base}/nsNoDataProtocolContentPolicy.cpp (100%)
 rename {content/base/src => dom/base}/nsNoDataProtocolContentPolicy.h (100%)
 rename {content/base/src => dom/base}/nsNodeInfoManager.cpp (100%)
 rename {content/base/src => dom/base}/nsNodeInfoManager.h (100%)
 rename {content/base/src => dom/base}/nsNodeUtils.cpp (100%)
 rename {content/base/src => dom/base}/nsNodeUtils.h (100%)
 rename {content/base/src => dom/base}/nsObjectLoadingContent.cpp (100%)
 rename {content/base/src => dom/base}/nsObjectLoadingContent.h (100%)
 rename {content/base/src => dom/base}/nsPlainTextSerializer.cpp (100%)
 rename {content/base/src => dom/base}/nsPlainTextSerializer.h (100%)
 rename {content/base/src => dom/base}/nsPropertyTable.cpp (100%)
 rename {content/base/src => dom/base}/nsPropertyTable.h (100%)
 rename {content/base/src => dom/base}/nsRange.cpp (100%)
 rename {content/base/src => dom/base}/nsRange.h (100%)
 rename {content/base/src => dom/base}/nsReferencedElement.cpp (100%)
 rename {content/base/public => dom/base}/nsReferencedElement.h (100%)
 rename {content/base/src => dom/base}/nsSandboxFlags.h (100%)
 rename {content/base/src => dom/base}/nsScriptElement.cpp (100%)
 rename {content/base/src => dom/base}/nsScriptElement.h (100%)
 rename {content/base/src => dom/base}/nsScriptLoader.cpp (100%)
 rename {content/base/src => dom/base}/nsScriptLoader.h (100%)
 rename {content/base/src => dom/base}/nsStubDocumentObserver.cpp (100%)
 rename {content/base/src => dom/base}/nsStubDocumentObserver.h (100%)
 rename {content/base/src => dom/base}/nsStubMutationObserver.cpp (100%)
 rename {content/base/src => dom/base}/nsStubMutationObserver.h (100%)
 rename {content/base/src => dom/base}/nsStyleLinkElement.cpp (100%)
 rename {content/base/src => dom/base}/nsStyleLinkElement.h (100%)
 rename {content/base/src => dom/base}/nsStyledElement.cpp (100%)
 rename {content/base/src => dom/base}/nsStyledElement.h (100%)
 rename {content/base/src => dom/base}/nsSyncLoadService.cpp (100%)
 rename {content/base/src => dom/base}/nsSyncLoadService.h (100%)
 rename {content/base/src => dom/base}/nsTextFragment.cpp (100%)
 rename {content/base/src => dom/base}/nsTextFragment.h (100%)
 rename {content/base/src => dom/base}/nsTextFragmentImpl.h (100%)
 rename {content/base/src => dom/base}/nsTextFragmentSSE2.cpp (100%)
 rename {content/base/src => dom/base}/nsTextNode.cpp (100%)
 rename {content/base/src => dom/base}/nsTextNode.h (100%)
 rename {content/base/src => dom/base}/nsTraversal.cpp (100%)
 rename {content/base/src => dom/base}/nsTraversal.h (100%)
 rename {content/base/src => dom/base}/nsTreeSanitizer.cpp (100%)
 rename {content/base/public => dom/base}/nsTreeSanitizer.h (100%)
 rename {content/base/src => dom/base}/nsViewportInfo.cpp (100%)
 rename {content/base/public => dom/base}/nsViewportInfo.h (100%)
 rename {content/base/src => dom/base}/nsXHTMLContentSerializer.cpp (100%)
 rename {content/base/src => dom/base}/nsXHTMLContentSerializer.h (100%)
 rename {content/base/src => dom/base}/nsXMLContentSerializer.cpp (100%)
 rename {content/base/src => dom/base}/nsXMLContentSerializer.h (100%)
 rename {content/base/src => dom/base}/nsXMLHttpRequest.cpp (100%)
 rename {content/base/src => dom/base}/nsXMLHttpRequest.h (100%)
 rename {content/base/src => dom/base}/nsXMLNameSpaceMap.cpp (100%)
 rename {content/base/public => dom/base}/nsXMLNameSpaceMap.h (100%)
 rename {content => dom}/base/test/345339_iframe.html (100%)
 rename {content => dom}/base/test/Ahem.ttf (100%)
 rename {content => dom}/base/test/TestCSPParser.cpp (99%)
 rename {content => dom}/base/test/TestGetURL.cpp (100%)
 rename {content => dom}/base/test/TestNativeXMLHttpRequest.cpp (100%)
 rename {content => dom}/base/test/TestPlainTextSerializer.cpp (100%)
 rename {content => dom}/base/test/accesscontrol.resource (100%)
 rename {content => dom}/base/test/accesscontrol.resource^headers^ (100%)
 rename {content => dom}/base/test/badContentType.eventsource (100%)
 rename {content => dom}/base/test/badContentType.eventsource^headers^ (100%)
 rename {content => dom}/base/test/badHTTPResponseCode.eventsource (100%)
 rename {content => dom}/base/test/badHTTPResponseCode.eventsource^headers^ (100%)
 rename {content => dom}/base/test/badMessageEvent.eventsource (100%)
 rename {content => dom}/base/test/badMessageEvent.eventsource^headers^ (100%)
 rename {content => dom}/base/test/badMessageEvent2.eventsource (100%)
 rename {content => dom}/base/test/badMessageEvent2.eventsource^headers^ (100%)
 rename {content => dom}/base/test/browser.ini (100%)
 rename {content => dom}/base/test/browser_bug1058164.js (100%)
 rename {content => dom}/base/test/browser_bug593387.js (90%)
 rename {content => dom}/base/test/browser_bug902350.js (96%)
 rename {content => dom}/base/test/browser_state_notifications.js (100%)
 rename {content => dom}/base/test/bug282547.sjs (100%)
 rename {content => dom}/base/test/bug298064-subframe.html (100%)
 rename {content => dom}/base/test/bug313646.txt (100%)
 rename {content => dom}/base/test/bug382113_object.html (100%)
 rename {content => dom}/base/test/bug419132.html (100%)
 rename {content => dom}/base/test/bug426308-redirect.sjs (100%)
 rename {content => dom}/base/test/bug435425.sjs (100%)
 rename {content => dom}/base/test/bug435425_redirect.sjs (100%)
 rename {content => dom}/base/test/bug444322.js (100%)
 rename {content => dom}/base/test/bug444322.txt (100%)
 rename {content => dom}/base/test/bug444546.sjs (100%)
 rename {content => dom}/base/test/bug455629-helper.svg (100%)
 rename {content => dom}/base/test/bug457746.sjs (100%)
 rename {content => dom}/base/test/bug461735-post-redirect.js (100%)
 create mode 100644 dom/base/test/bug461735-redirect1.sjs
 create mode 100644 dom/base/test/bug461735-redirect2.sjs
 rename {content => dom}/base/test/bug466080.sjs (100%)
 rename {content => dom}/base/test/bug466409-empty.css (100%)
 rename {content => dom}/base/test/bug466409-page.html (100%)
 rename {content => dom}/base/test/bug475156.sjs (100%)
 rename {content => dom}/base/test/bug482935.sjs (100%)
 rename {content => dom}/base/test/bug540854.sjs (100%)
 rename {content => dom}/base/test/bug578096LoadChromeScript.js (100%)
 rename {content => dom}/base/test/bug638112-response.txt (100%)
 rename {content => dom}/base/test/bug638112.sjs (90%)
 rename {content => dom}/base/test/bug682592-subframe-ref.html (100%)
 rename {content => dom}/base/test/bug682592-subframe.html (100%)
 rename {content => dom}/base/test/bug696301-script-1.js (100%)
 rename {content => dom}/base/test/bug696301-script-1.js^headers^ (100%)
 rename {content => dom}/base/test/bug696301-script-2.js (100%)
 rename {content => dom}/base/test/bug803225_test_mailto.html (100%)
 rename {content => dom}/base/test/bug819051.sjs (100%)
 rename {content => dom}/base/test/chrome/blockNoPlugins.xml (100%)
 rename {content => dom}/base/test/chrome/blockPluginHard.xml (100%)
 rename {content => dom}/base/test/chrome/bug421622-referer.sjs (100%)
 rename {content => dom}/base/test/chrome/chrome.ini (100%)
 rename {content => dom}/base/test/chrome/cpows_child.js (100%)
 rename {content => dom}/base/test/chrome/cpows_parent.xul (99%)
 rename {content => dom}/base/test/chrome/file_bug391728.html (100%)
 rename {content => dom}/base/test/chrome/file_bug391728_2.html (100%)
 rename {content => dom}/base/test/chrome/file_bug549682.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug616841.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug816340.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812-1.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812-2.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812-3.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812-4.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812-5.xul (100%)
 rename {content => dom}/base/test/chrome/file_bug990812.xul (100%)
 rename {content => dom}/base/test/chrome/fileconstructor_file.png (100%)
 rename {content => dom}/base/test/chrome/frame_bug814638.xul (100%)
 rename {content => dom}/base/test/chrome/host_bug814638.xul (100%)
 rename {content => dom}/base/test/chrome/mochitest.ini (100%)
 rename {content => dom}/base/test/chrome/nochrome_bug765993.html (100%)
 rename {content => dom}/base/test/chrome/nochrome_bug765993.js (100%)
 rename {content => dom}/base/test/chrome/nochrome_bug765993.js^headers^ (100%)
 rename {content => dom}/base/test/chrome/test_bug1063837.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug206691.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug339494.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug357450.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug380418.html (100%)
 rename {content => dom}/base/test/chrome/test_bug380418.html^headers^ (100%)
 rename {content => dom}/base/test/chrome/test_bug383430.html (100%)
 rename {content => dom}/base/test/chrome/test_bug391728.html (100%)
 rename {content => dom}/base/test/chrome/test_bug421622.xul (92%)
 rename {content => dom}/base/test/chrome/test_bug429785.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug430050.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug467123.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug549682.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug571390.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug574596.html (100%)
 rename {content => dom}/base/test/chrome/test_bug599295.html (100%)
 rename {content => dom}/base/test/chrome/test_bug616841.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug635835.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug650776.html (100%)
 rename {content => dom}/base/test/chrome/test_bug650784.html (100%)
 rename {content => dom}/base/test/chrome/test_bug682305.html (100%)
 rename {content => dom}/base/test/chrome/test_bug683852.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug750096.html (100%)
 rename {content => dom}/base/test/chrome/test_bug752226-3.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug752226-4.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug765993.html (86%)
 rename {content => dom}/base/test/chrome/test_bug780199.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug780529.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug800386.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug814638.xul (95%)
 rename {content => dom}/base/test/chrome/test_bug816340.xul (100%)
 rename {content => dom}/base/test/chrome/test_bug914381.html (100%)
 rename {content => dom}/base/test/chrome/test_bug990812.xul (100%)
 rename {content => dom}/base/test/chrome/test_cpows.xul (100%)
 rename {content => dom}/base/test/chrome/test_document_register.xul (100%)
 rename {content => dom}/base/test/chrome/test_domparsing.xul (100%)
 rename {content => dom}/base/test/chrome/test_fileconstructor.xul (95%)
 rename {content => dom}/base/test/chrome/test_fileconstructor_tempfile.xul (100%)
 rename {content => dom}/base/test/chrome/test_title.xul (100%)
 rename {content => dom}/base/test/chrome/title_window.xul (100%)
 rename {content => dom}/base/test/copypaste.js (100%)
 rename {content => dom}/base/test/csp/chrome.ini (100%)
 rename {content => dom}/base/test/csp/file_CSP.css (82%)
 rename {content => dom}/base/test/csp/file_CSP.sjs (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug663567.xsl (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug663567_allows.xml (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug663567_allows.xml^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug663567_blocks.xml (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug802872.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug802872.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug802872.js (88%)
 rename {content => dom}/base/test/csp/file_CSP_bug802872.sjs (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug885433_allows.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug885433_allows.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug885433_blocks.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug885433_blocks.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug888172.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug888172.sjs (94%)
 rename {content => dom}/base/test/csp/file_CSP_bug909029_none.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug909029_none.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug909029_star.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug909029_star.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug910139.sjs (94%)
 rename {content => dom}/base/test/csp/file_CSP_bug910139.xml (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug910139.xsl (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug941404.html (72%)
 rename {content => dom}/base/test/csp/file_CSP_bug941404_xhr.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_bug941404_xhr.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main.js (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main_allowed.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_evalscript_main_allowed.js (100%)
 rename {content => dom}/base/test/csp/file_CSP_frameancestors.sjs (100%)
 rename {content => dom}/base/test/csp/file_CSP_frameancestors_main.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_frameancestors_main.js (92%)
 rename {content => dom}/base/test/csp/file_CSP_inlinescript_main.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinescript_main.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinescript_main_allowed.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinestyle_main.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinestyle_main.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinestyle_main_allowed.html (100%)
 rename {content => dom}/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_main.html (62%)
 rename {content => dom}/base/test/csp/file_CSP_main.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_CSP_main.js (59%)
 rename {content => dom}/base/test/csp/file_base-uri.html (100%)
 create mode 100644 dom/base/test/csp/file_bug836922_npolicies.html
 create mode 100644 dom/base/test/csp/file_bug836922_npolicies.html^headers^
 rename {content => dom}/base/test/csp/file_bug836922_npolicies_ro_violation.sjs (100%)
 rename {content => dom}/base/test/csp/file_bug836922_npolicies_violation.sjs (100%)
 create mode 100644 dom/base/test/csp/file_bug886164.html
 rename {content => dom}/base/test/csp/file_bug886164.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_bug886164_2.html (53%)
 rename {content => dom}/base/test/csp/file_bug886164_2.html^headers^ (100%)
 create mode 100644 dom/base/test/csp/file_bug886164_3.html
 rename {content => dom}/base/test/csp/file_bug886164_3.html^headers^ (100%)
 create mode 100644 dom/base/test/csp/file_bug886164_4.html
 rename {content => dom}/base/test/csp/file_bug886164_4.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_bug886164_5.html (62%)
 rename {content => dom}/base/test/csp/file_bug886164_5.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_bug886164_6.html (83%)
 rename {content => dom}/base/test/csp/file_bug886164_6.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_connect-src.html (100%)
 rename {content => dom}/base/test/csp/file_csp_bug768029.html (60%)
 rename {content => dom}/base/test/csp/file_csp_bug768029.sjs (100%)
 rename {content => dom}/base/test/csp/file_csp_bug773891.html (60%)
 rename {content => dom}/base/test/csp/file_csp_bug773891.sjs (100%)
 rename {content => dom}/base/test/csp/file_csp_invalid_source_expression.html (75%)
 rename {content => dom}/base/test/csp/file_csp_path_matching.html (62%)
 rename {content => dom}/base/test/csp/file_csp_path_matching.js (100%)
 rename {content => dom}/base/test/csp/file_csp_path_matching_redirect.html (61%)
 rename {content => dom}/base/test/csp/file_csp_path_matching_redirect_server.sjs (77%)
 rename {content => dom}/base/test/csp/file_csp_redirects_main.html (93%)
 rename {content => dom}/base/test/csp/file_csp_redirects_page.sjs (97%)
 rename {content => dom}/base/test/csp/file_csp_redirects_resource.sjs (97%)
 rename {content => dom}/base/test/csp/file_csp_report.html (100%)
 rename {content => dom}/base/test/csp/file_csp_testserver.sjs (100%)
 rename {content => dom}/base/test/csp/file_hash_source.html (100%)
 rename {content => dom}/base/test/csp/file_hash_source.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_leading_wildcard.html (54%)
 rename {content => dom}/base/test/csp/file_multi_policy_injection_bypass.html (61%)
 rename {content => dom}/base/test/csp/file_multi_policy_injection_bypass.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_multi_policy_injection_bypass_2.html (61%)
 rename {content => dom}/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_nonce_source.html (85%)
 rename {content => dom}/base/test/csp/file_nonce_source.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_policyuri_regression_from_multipolicy.html (100%)
 create mode 100644 dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
 rename {content => dom}/base/test/csp/file_policyuri_regression_from_multipolicy_policy (100%)
 rename {content => dom}/base/test/csp/file_redirect_content.sjs (95%)
 rename {content => dom}/base/test/csp/file_redirect_report.sjs (100%)
 rename {content => dom}/base/test/csp/file_report_uri_missing_in_report_only_header.html (100%)
 rename {content => dom}/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_self_none_as_hostname_confusion.html (100%)
 rename {content => dom}/base/test/csp/file_self_none_as_hostname_confusion.html^headers^ (100%)
 rename {content => dom}/base/test/csp/file_subframe_run_js_if_allowed.html (100%)
 rename {content => dom}/base/test/csp/file_subframe_run_js_if_allowed.html^headers^ (100%)
 rename {content => dom}/base/test/csp/mochitest.ini (100%)
 rename {content => dom}/base/test/csp/test_301_redirect.html (100%)
 rename {content => dom}/base/test/csp/test_302_redirect.html (100%)
 rename {content => dom}/base/test/csp/test_303_redirect.html (100%)
 rename {content => dom}/base/test/csp/test_307_redirect.html (100%)
 rename {content => dom}/base/test/csp/test_CSP.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug663567.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug802872.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug885433.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug888172.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug909029.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug910139.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_bug941404.html (98%)
 rename {content => dom}/base/test/csp/test_CSP_evalscript.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_frameancestors.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_inlinescript.html (100%)
 rename {content => dom}/base/test/csp/test_CSP_inlinestyle.html (100%)
 rename {content => dom}/base/test/csp/test_base-uri.html (92%)
 rename {content => dom}/base/test/csp/test_bug836922_npolicies.html (99%)
 rename {content => dom}/base/test/csp/test_bug886164.html (99%)
 rename {content => dom}/base/test/csp/test_bug949549.html (100%)
 rename {content => dom}/base/test/csp/test_connect-src.html (97%)
 rename {content => dom}/base/test/csp/test_csp_bug768029.html (96%)
 rename {content => dom}/base/test/csp/test_csp_bug773891.html (97%)
 rename {content => dom}/base/test/csp/test_csp_invalid_source_expression.html (94%)
 rename {content => dom}/base/test/csp/test_csp_path_matching.html (63%)
 rename {content => dom}/base/test/csp/test_csp_path_matching_redirect.html (88%)
 rename {content => dom}/base/test/csp/test_csp_redirects.html (99%)
 rename {content => dom}/base/test/csp/test_csp_report.html (94%)
 rename {content => dom}/base/test/csp/test_hash_source.html (100%)
 rename {content => dom}/base/test/csp/test_leading_wildcard.html (97%)
 rename {content => dom}/base/test/csp/test_multi_policy_injection_bypass.html (98%)
 rename {content => dom}/base/test/csp/test_nonce_source.html (100%)
 rename {content => dom}/base/test/csp/test_policyuri_regression_from_multipolicy.html (100%)
 rename {content => dom}/base/test/csp/test_report_uri_missing_in_report_only_header.html (100%)
 rename {content => dom}/base/test/csp/test_self_none_as_hostname_confusion.html (100%)
 rename {content => dom}/base/test/csp/test_subframe_run_js_if_allowed.html (100%)
 rename {content => dom}/base/test/delayedServerEvents.sjs (100%)
 rename {content => dom}/base/test/eventsource.resource (100%)
 rename {content => dom}/base/test/eventsource.resource^headers^ (100%)
 rename {content => dom}/base/test/eventsource_redirect.resource (100%)
 rename {content => dom}/base/test/eventsource_redirect.resource^headers^ (100%)
 rename {content => dom}/base/test/eventsource_redirect_to.resource (100%)
 rename {content => dom}/base/test/eventsource_redirect_to.resource^headers^ (100%)
 rename {content => dom}/base/test/fake_plugin.tst (100%)
 rename {content => dom}/base/test/file_CrossSiteXHR_cache_server.sjs (89%)
 rename {content => dom}/base/test/file_CrossSiteXHR_inner.html (100%)
 rename {content => dom}/base/test/file_CrossSiteXHR_inner.jar (100%)
 rename {content => dom}/base/test/file_CrossSiteXHR_inner_data.sjs (100%)
 rename {content => dom}/base/test/file_CrossSiteXHR_server.sjs (98%)
 rename {content => dom}/base/test/file_XHRDocURI.html (100%)
 rename {content => dom}/base/test/file_XHRDocURI.html^headers^ (100%)
 rename {content => dom}/base/test/file_XHRDocURI.sjs (100%)
 rename {content => dom}/base/test/file_XHRDocURI.text (100%)
 rename {content => dom}/base/test/file_XHRDocURI.text^headers^ (100%)
 rename {content => dom}/base/test/file_XHRDocURI.xml (100%)
 rename {content => dom}/base/test/file_XHRDocURI.xml^headers^ (100%)
 rename {content => dom}/base/test/file_XHRResponseURL.js (66%)
 rename {content => dom}/base/test/file_XHRResponseURL.sjs (100%)
 rename {content => dom}/base/test/file_XHRResponseURL.text (100%)
 rename {content => dom}/base/test/file_XHRResponseURL.text^headers^ (100%)
 rename {content => dom}/base/test/file_XHRResponseURL_nocors.text (100%)
 rename {content => dom}/base/test/file_XHRSendData.sjs (100%)
 rename {content => dom}/base/test/file_XHRSendData_doc.xml (100%)
 rename {content => dom}/base/test/file_XHRSendData_doc.xml^headers^ (100%)
 rename {content => dom}/base/test/file_XHR_anon.sjs (100%)
 rename {content => dom}/base/test/file_XHR_binary1.bin (100%)
 rename {content => dom}/base/test/file_XHR_binary1.bin^headers^ (100%)
 rename {content => dom}/base/test/file_XHR_binary2.bin (100%)
 rename {content => dom}/base/test/file_XHR_fail1.txt (100%)
 create mode 100644 dom/base/test/file_XHR_fail1.txt^headers^
 rename {content => dom}/base/test/file_XHR_fail1b.txt (100%)
 rename {content => dom}/base/test/file_XHR_header.sjs (100%)
 rename {content => dom}/base/test/file_XHR_pass1.xml (100%)
 rename {content => dom}/base/test/file_XHR_pass2.txt (100%)
 rename {content => dom}/base/test/file_XHR_pass3.txt (100%)
 rename {content => dom}/base/test/file_XHR_pass3.txt^headers^ (100%)
 rename {content => dom}/base/test/file_XHR_system_redirect.html (100%)
 rename {content => dom}/base/test/file_XHR_system_redirect.html^headers^ (100%)
 rename {content => dom}/base/test/file_XHR_timeout.sjs (100%)
 rename {content => dom}/base/test/file_base_xbl.xml (100%)
 rename {content => dom}/base/test/file_bug1008126_worker.js (93%)
 rename {content => dom}/base/test/file_bug1011748_OK.sjs (100%)
 rename {content => dom}/base/test/file_bug1011748_redirect.sjs (100%)
 rename {content => dom}/base/test/file_bug28293.sjs (100%)
 rename {content => dom}/base/test/file_bug326337.xml (100%)
 rename {content => dom}/base/test/file_bug326337_inner.html (100%)
 rename {content => dom}/base/test/file_bug326337_outer.html (66%)
 rename {content => dom}/base/test/file_bug416317.xhtml (100%)
 rename {content => dom}/base/test/file_bug426646-1.html (100%)
 rename {content => dom}/base/test/file_bug426646-2.html (100%)
 rename {content => dom}/base/test/file_bug428847-1.xhtml (100%)
 rename {content => dom}/base/test/file_bug428847-2.xhtml (100%)
 rename {content => dom}/base/test/file_bug498897.css (100%)
 rename {content => dom}/base/test/file_bug498897.html (100%)
 rename {content => dom}/base/test/file_bug498897.html^headers^ (100%)
 rename {content => dom}/base/test/file_bug503473-frame.sjs (100%)
 rename {content => dom}/base/test/file_bug503481.sjs (100%)
 rename {content => dom}/base/test/file_bug503481b_inner.html (100%)
 rename {content => dom}/base/test/file_bug541937.html (100%)
 rename {content => dom}/base/test/file_bug541937.xhtml (100%)
 rename {content => dom}/base/test/file_bug557892.html (100%)
 rename {content => dom}/base/test/file_bug562137.txt (100%)
 rename {content => dom}/base/test/file_bug590812-ref.xhtml (100%)
 rename {content => dom}/base/test/file_bug590812.xml (100%)
 rename {content => dom}/base/test/file_bug590870.html (100%)
 rename {content => dom}/base/test/file_bug601803a.html (77%)
 rename {content => dom}/base/test/file_bug601803b.html (100%)
 rename {content => dom}/base/test/file_bug604660-1.xml (100%)
 rename {content => dom}/base/test/file_bug604660-2.xsl (100%)
 rename {content => dom}/base/test/file_bug604660-3.js (100%)
 rename {content => dom}/base/test/file_bug604660-4.js (100%)
 rename {content => dom}/base/test/file_bug604660-5.xml (100%)
 rename {content => dom}/base/test/file_bug604660-6.xsl (100%)
 rename {content => dom}/base/test/file_bug622088.sjs (100%)
 rename {content => dom}/base/test/file_bug622088_inner.html (100%)
 rename {content => dom}/base/test/file_bug675121.sjs (100%)
 rename {content => dom}/base/test/file_bug687859-16.js (100%)
 rename {content => dom}/base/test/file_bug687859-16.js^headers^ (100%)
 rename {content => dom}/base/test/file_bug687859-bom.js (100%)
 rename {content => dom}/base/test/file_bug687859-bom.js^headers^ (100%)
 rename {content => dom}/base/test/file_bug687859-charset.js (100%)
 rename {content => dom}/base/test/file_bug687859-http.js (100%)
 rename {content => dom}/base/test/file_bug687859-http.js^headers^ (100%)
 rename {content => dom}/base/test/file_bug687859-inherit.js (100%)
 rename {content => dom}/base/test/file_bug692434.xml (100%)
 rename {content => dom}/base/test/file_bug707142_baseline.json (100%)
 rename {content => dom}/base/test/file_bug707142_bom.json (100%)
 rename {content => dom}/base/test/file_bug707142_utf-16.json (100%)
 rename {content => dom}/base/test/file_bug708620-2.html (100%)
 rename {content => dom}/base/test/file_bug708620.html (100%)
 rename {content => dom}/base/test/file_bug782342.txt (100%)
 rename {content => dom}/base/test/file_bug787778.sjs (100%)
 rename {content => dom}/base/test/file_bug804395.jar (100%)
 rename {content => dom}/base/test/file_bug869432.eventsource (100%)
 rename {content => dom}/base/test/file_bug869432.eventsource^headers^ (100%)
 rename {content => dom}/base/test/file_bug902350.html (70%)
 rename {content => dom}/base/test/file_bug902350_frame.html (100%)
 rename {content => dom}/base/test/file_bug907892.html (100%)
 rename {content => dom}/base/test/file_bug945152.jar (100%)
 rename {content => dom}/base/test/file_bug945152_worker.js (89%)
 rename {content => dom}/base/test/file_general_document.html (100%)
 rename {content => dom}/base/test/file_html_in_xhr.html (100%)
 rename {content => dom}/base/test/file_html_in_xhr.sjs (100%)
 rename {content => dom}/base/test/file_html_in_xhr2.html (100%)
 rename {content => dom}/base/test/file_html_in_xhr3.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_bodyonly.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_format.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_linebreak.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_links.html (96%)
 rename {content => dom}/base/test/file_htmlserializer_1_nested_body.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_no_body.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_noflag.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_noformatpre.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_raw.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_sibling_body.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_sibling_body_only_body.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_1_wrap.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_2.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_2_basic.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_2_enthtml.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_2_entw3c.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_2_latin1.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_ipv6.html (100%)
 rename {content => dom}/base/test/file_htmlserializer_ipv6_out.html (100%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation.html (86%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation_blankTarget.html (85%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation_grandchild.html (83%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation_innermost.html (78%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation_secure.html (86%)
 rename {content => dom}/base/test/file_mixed_content_frameNavigation_secure_grandchild.html (85%)
 rename {content => dom}/base/test/file_mixed_content_main.html (99%)
 rename {content => dom}/base/test/file_mixed_content_main_bug803225.html (96%)
 rename {content => dom}/base/test/file_mixed_content_main_bug803225_websocket_wsh.py (100%)
 rename {content => dom}/base/test/file_mixed_content_server.sjs (100%)
 rename {content => dom}/base/test/file_mozfiledataurl_audio.ogg (100%)
 rename {content => dom}/base/test/file_mozfiledataurl_doc.html (100%)
 rename {content => dom}/base/test/file_mozfiledataurl_img.jpg (100%)
 rename {content => dom}/base/test/file_mozfiledataurl_inner.html (100%)
 rename {content => dom}/base/test/file_mozfiledataurl_text.txt (100%)
 rename {content => dom}/base/test/file_restrictedEventSource.sjs (100%)
 rename {content => dom}/base/test/file_websocket_basic_wsh.py (100%)
 rename {content => dom}/base/test/file_websocket_hello_wsh.py (100%)
 rename {content => dom}/base/test/file_websocket_http_resource.txt (100%)
 rename {content => dom}/base/test/file_websocket_wsh.py (100%)
 create mode 100644 dom/base/test/file_x-frame-options_main.html
 rename {content => dom}/base/test/file_x-frame-options_page.sjs (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_bodyonly.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_format.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_linebreak.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_links.xhtml (97%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_nested_body.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_no_body.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_noflag.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_noformatpre.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_raw.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_sibling_body.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_1_wrap.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_2.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_2_basic.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_2_enthtml.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_2_entw3c.xhtml (100%)
 rename {content => dom}/base/test/file_xhtmlserializer_2_latin1.xhtml (100%)
 rename {content => dom}/base/test/fileutils.js (100%)
 rename {content => dom}/base/test/forRemoval.resource (100%)
 rename {content => dom}/base/test/forRemoval.resource^headers^ (100%)
 rename {content => dom}/base/test/formReset.html (100%)
 rename {content => dom}/base/test/invalid_accesscontrol.resource (100%)
 rename {content => dom}/base/test/invalid_accesscontrol.resource^headers^ (100%)
 rename {content => dom}/base/test/mochitest-child-permissions.ini (100%)
 rename {content => dom}/base/test/moz.build (100%)
 rename {content => dom}/base/test/mutationobserver_dialog.html (100%)
 rename {content => dom}/base/test/progressserver.sjs (90%)
 rename {content => dom}/base/test/reftest/mixed-bmp-png.ico (100%)
 rename {content => dom}/base/test/reftest/reftest.list (100%)
 rename {content => dom}/base/test/reftest/test_bug920877-ref.html (100%)
 rename {content => dom}/base/test/reftest/test_bug920877.html (100%)
 rename {content => dom}/base/test/responseIdentical.sjs (100%)
 rename {content => dom}/base/test/script-1_bug597345.sjs (100%)
 rename {content => dom}/base/test/script-2_bug597345.js (100%)
 rename {content => dom}/base/test/script_bug602838.sjs (100%)
 rename {content => dom}/base/test/send_gzip_content.sjs (100%)
 rename {content => dom}/base/test/somedatas.resource (100%)
 rename {content => dom}/base/test/somedatas.resource^headers^ (100%)
 rename {content => dom}/base/test/test_CrossSiteXHR.html (99%)
 rename {content => dom}/base/test/test_CrossSiteXHR_cache.html (98%)
 rename {content => dom}/base/test/test_CrossSiteXHR_origin.html (92%)
 rename {content => dom}/base/test/test_DOMException.html (100%)
 rename {content => dom}/base/test/test_EventSource_redirects.html (92%)
 rename {content => dom}/base/test/test_NodeIterator_basics_filters.xhtml (100%)
 rename {content => dom}/base/test/test_NodeIterator_mutations_1.xhtml (100%)
 rename {content => dom}/base/test/test_NodeIterator_mutations_2.html (100%)
 rename {content => dom}/base/test/test_NodeIterator_mutations_3.html (100%)
 rename {content => dom}/base/test/test_XHR.html (99%)
 rename {content => dom}/base/test/test_XHRDocURI.html (71%)
 rename {content => dom}/base/test/test_XHRResponseURL.html (100%)
 rename {content => dom}/base/test/test_XHRSendData.html (100%)
 rename {content => dom}/base/test/test_XHR_anon.html (98%)
 rename {content => dom}/base/test/test_XHR_header.html (100%)
 rename {content => dom}/base/test/test_XHR_onuploadprogress.html (100%)
 rename {content => dom}/base/test/test_XHR_parameters.html (100%)
 rename {content => dom}/base/test/test_XHR_system.html (94%)
 rename {content => dom}/base/test/test_XHR_timeout.html (100%)
 rename {content => dom}/base/test/test_XHR_timeout.js (100%)
 rename {content => dom}/base/test/test_base.xhtml (58%)
 rename {content => dom}/base/test/test_blobconstructor.html (100%)
 rename {content => dom}/base/test/test_bug1008126.html (100%)
 rename {content => dom}/base/test/test_bug1011748.html (100%)
 rename {content => dom}/base/test/test_bug1025933.html (100%)
 rename {content => dom}/base/test/test_bug1057176.html (100%)
 rename {content => dom}/base/test/test_bug1081686.html (86%)
 rename {content => dom}/base/test/test_bug166235.html (100%)
 rename {content => dom}/base/test/test_bug199959.html (100%)
 rename {content => dom}/base/test/test_bug218236.html (100%)
 rename {content => dom}/base/test/test_bug218277.html (100%)
 rename {content => dom}/base/test/test_bug238409.html (100%)
 rename {content => dom}/base/test/test_bug254337.html (100%)
 rename {content => dom}/base/test/test_bug270145.xhtml (100%)
 rename {content => dom}/base/test/test_bug276037-1.html (100%)
 rename {content => dom}/base/test/test_bug276037-2.xhtml (100%)
 rename {content => dom}/base/test/test_bug282547.html (96%)
 rename {content => dom}/base/test/test_bug28293.html (100%)
 rename {content => dom}/base/test/test_bug28293.xhtml (100%)
 rename {content => dom}/base/test/test_bug298064.html (100%)
 rename {content => dom}/base/test/test_bug300992.html (100%)
 rename {content => dom}/base/test/test_bug311681.xml (100%)
 rename {content => dom}/base/test/test_bug313646.html (97%)
 rename {content => dom}/base/test/test_bug320799.html (100%)
 rename {content => dom}/base/test/test_bug322317.html (100%)
 rename {content => dom}/base/test/test_bug326337.html (100%)
 rename {content => dom}/base/test/test_bug330925.xhtml (100%)
 rename {content => dom}/base/test/test_bug331959.html (100%)
 rename {content => dom}/base/test/test_bug333198.html (100%)
 rename {content => dom}/base/test/test_bug333673.html (100%)
 rename {content => dom}/base/test/test_bug337631.html (100%)
 rename {content => dom}/base/test/test_bug338541.xhtml (100%)
 rename {content => dom}/base/test/test_bug338583.html (95%)
 rename {content => dom}/base/test/test_bug338679.html (100%)
 rename {content => dom}/base/test/test_bug339494.html (100%)
 rename {content => dom}/base/test/test_bug339494.xhtml (100%)
 rename {content => dom}/base/test/test_bug340571.html (100%)
 rename {content => dom}/base/test/test_bug343596.html (100%)
 rename {content => dom}/base/test/test_bug345339.html (96%)
 rename {content => dom}/base/test/test_bug346485.html (100%)
 rename {content => dom}/base/test/test_bug352728.html (100%)
 rename {content => dom}/base/test/test_bug352728.xhtml (100%)
 rename {content => dom}/base/test/test_bug353334.html (100%)
 rename {content => dom}/base/test/test_bug355026.html (100%)
 rename {content => dom}/base/test/test_bug357450.html (100%)
 rename {content => dom}/base/test/test_bug357450.js (100%)
 rename {content => dom}/base/test/test_bug357450.xhtml (100%)
 rename {content => dom}/base/test/test_bug357450_svg.xhtml (100%)
 rename {content => dom}/base/test/test_bug357509.html (100%)
 rename {content => dom}/base/test/test_bug358660.html (100%)
 rename {content => dom}/base/test/test_bug362391.xhtml (100%)
 rename {content => dom}/base/test/test_bug364092.xhtml (100%)
 rename {content => dom}/base/test/test_bug364413.xhtml (100%)
 rename {content => dom}/base/test/test_bug366944.html (100%)
 rename {content => dom}/base/test/test_bug366946.html (100%)
 rename {content => dom}/base/test/test_bug367164.html (100%)
 rename {content => dom}/base/test/test_bug368972.html (100%)
 rename {content => dom}/base/test/test_bug371576-2.html (100%)
 rename {content => dom}/base/test/test_bug371576-3.html (100%)
 rename {content => dom}/base/test/test_bug371576-4.html (100%)
 rename {content => dom}/base/test/test_bug371576-5.html (100%)
 rename {content => dom}/base/test/test_bug372086.html (100%)
 rename {content => dom}/base/test/test_bug372964-2.html (100%)
 rename {content => dom}/base/test/test_bug372964.html (100%)
 rename {content => dom}/base/test/test_bug373181.xhtml (100%)
 rename {content => dom}/base/test/test_bug375314.html (100%)
 rename {content => dom}/base/test/test_bug378969.html (100%)
 rename {content => dom}/base/test/test_bug380418.html (100%)
 rename {content => dom}/base/test/test_bug380418.html^headers^ (100%)
 rename {content => dom}/base/test/test_bug382113.html (100%)
 rename {content => dom}/base/test/test_bug382871.html (100%)
 rename {content => dom}/base/test/test_bug384003.xhtml (100%)
 rename {content => dom}/base/test/test_bug390219.html (100%)
 rename {content => dom}/base/test/test_bug390735.html (100%)
 rename {content => dom}/base/test/test_bug392318.html (100%)
 rename {content => dom}/base/test/test_bug392511.html (100%)
 rename {content => dom}/base/test/test_bug393968.html (100%)
 rename {content => dom}/base/test/test_bug395915.html (100%)
 rename {content => dom}/base/test/test_bug397234.html (100%)
 rename {content => dom}/base/test/test_bug398243.html (94%)
 rename {content => dom}/base/test/test_bug401662.html (100%)
 rename {content => dom}/base/test/test_bug402150.html (100%)
 rename {content => dom}/base/test/test_bug402150.html^headers^ (100%)
 rename {content => dom}/base/test/test_bug403841.html (100%)
 rename {content => dom}/base/test/test_bug403852.html (100%)
 rename {content => dom}/base/test/test_bug403868.xml (100%)
 rename {content => dom}/base/test/test_bug405182.html (100%)
 rename {content => dom}/base/test/test_bug409380.html (100%)
 rename {content => dom}/base/test/test_bug410229.html (100%)
 rename {content => dom}/base/test/test_bug413974.html (100%)
 rename {content => dom}/base/test/test_bug414190.html (100%)
 rename {content => dom}/base/test/test_bug415860.html (100%)
 rename {content => dom}/base/test/test_bug416317-1.html (100%)
 rename {content => dom}/base/test/test_bug416317-2.html (100%)
 rename {content => dom}/base/test/test_bug416383.html (100%)
 rename {content => dom}/base/test/test_bug417255.html (100%)
 rename {content => dom}/base/test/test_bug417384.html (100%)
 rename {content => dom}/base/test/test_bug418214.html (100%)
 rename {content => dom}/base/test/test_bug419132.html (100%)
 rename {content => dom}/base/test/test_bug419527.xhtml (100%)
 rename {content => dom}/base/test/test_bug420609.xhtml (100%)
 rename {content => dom}/base/test/test_bug420700.html (100%)
 rename {content => dom}/base/test/test_bug421602.html (100%)
 rename {content => dom}/base/test/test_bug422403-1.html (100%)
 rename {content => dom}/base/test/test_bug422403-2.xhtml (100%)
 rename {content => dom}/base/test/test_bug422537.html (100%)
 rename {content => dom}/base/test/test_bug424212.html (100%)
 rename {content => dom}/base/test/test_bug424359-1.html (100%)
 rename {content => dom}/base/test/test_bug424359-2.html (100%)
 rename {content => dom}/base/test/test_bug425013.html (100%)
 rename {content => dom}/base/test/test_bug426308.html (92%)
 rename {content => dom}/base/test/test_bug426646.html (100%)
 rename {content => dom}/base/test/test_bug428847.html (100%)
 rename {content => dom}/base/test/test_bug429157.html (100%)
 rename {content => dom}/base/test/test_bug431082.html (100%)
 rename {content => dom}/base/test/test_bug431701.html (100%)
 rename {content => dom}/base/test/test_bug431833.html (100%)
 rename {content => dom}/base/test/test_bug433533.html (100%)
 rename {content => dom}/base/test/test_bug433662.html (100%)
 rename {content => dom}/base/test/test_bug435425.html (100%)
 rename {content => dom}/base/test/test_bug438519.html (100%)
 rename {content => dom}/base/test/test_bug444030.xhtml (100%)
 rename {content => dom}/base/test/test_bug444322.html (100%)
 rename {content => dom}/base/test/test_bug444546.html (100%)
 rename {content => dom}/base/test/test_bug444722.html (100%)
 rename {content => dom}/base/test/test_bug448993.html (100%)
 rename {content => dom}/base/test/test_bug450160.html (100%)
 rename {content => dom}/base/test/test_bug451376.html (100%)
 rename {content => dom}/base/test/test_bug453521.html (100%)
 rename {content => dom}/base/test/test_bug453736.html (100%)
 rename {content => dom}/base/test/test_bug454325.html (100%)
 rename {content => dom}/base/test/test_bug454326.html (100%)
 rename {content => dom}/base/test/test_bug455472.html (100%)
 rename {content => dom}/base/test/test_bug455629.html (90%)
 rename {content => dom}/base/test/test_bug456262.html (100%)
 rename {content => dom}/base/test/test_bug457746.html (100%)
 rename {content => dom}/base/test/test_bug459424.html (100%)
 rename {content => dom}/base/test/test_bug461555.html (100%)
 rename {content => dom}/base/test/test_bug461735.html (90%)
 rename {content => dom}/base/test/test_bug465767.html (100%)
 rename {content => dom}/base/test/test_bug466080.html (84%)
 rename {content => dom}/base/test/test_bug466409.html (100%)
 rename {content => dom}/base/test/test_bug466751.xhtml (100%)
 rename {content => dom}/base/test/test_bug469020.html (100%)
 rename {content => dom}/base/test/test_bug469304.html (100%)
 rename {content => dom}/base/test/test_bug473162-1.html (100%)
 rename {content => dom}/base/test/test_bug473162-2.html (100%)
 rename {content => dom}/base/test/test_bug475156.html (99%)
 rename {content => dom}/base/test/test_bug482935.html (100%)
 rename {content => dom}/base/test/test_bug484396.html (100%)
 rename {content => dom}/base/test/test_bug493881.html (100%)
 rename {content => dom}/base/test/test_bug493881.js (100%)
 rename {content => dom}/base/test/test_bug498240.html (100%)
 rename {content => dom}/base/test/test_bug498433.html (100%)
 rename {content => dom}/base/test/test_bug498897.html (100%)
 rename {content => dom}/base/test/test_bug499656.html (100%)
 rename {content => dom}/base/test/test_bug499656.xhtml (100%)
 rename {content => dom}/base/test/test_bug500937.html (100%)
 rename {content => dom}/base/test/test_bug503473.html (100%)
 rename {content => dom}/base/test/test_bug503481.html (100%)
 rename {content => dom}/base/test/test_bug503481b.html (100%)
 rename {content => dom}/base/test/test_bug505783.html (100%)
 rename {content => dom}/base/test/test_bug51034.html (100%)
 rename {content => dom}/base/test/test_bug513194.html (100%)
 rename {content => dom}/base/test/test_bug5141.html (100%)
 rename {content => dom}/base/test/test_bug514487.html (100%)
 rename {content => dom}/base/test/test_bug515401.html (98%)
 rename {content => dom}/base/test/test_bug518104.html (100%)
 rename {content => dom}/base/test/test_bug527896.html (100%)
 rename {content => dom}/base/test/test_bug540854.html (100%)
 rename {content => dom}/base/test/test_bug541937.html (100%)
 rename {content => dom}/base/test/test_bug544642.html (100%)
 rename {content => dom}/base/test/test_bug545644.html (100%)
 rename {content => dom}/base/test/test_bug545644.xhtml (100%)
 rename {content => dom}/base/test/test_bug548463.html (100%)
 rename {content => dom}/base/test/test_bug553896.xhtml (100%)
 rename {content => dom}/base/test/test_bug557892.html (100%)
 rename {content => dom}/base/test/test_bug558726.html (100%)
 rename {content => dom}/base/test/test_bug559526.html (100%)
 rename {content => dom}/base/test/test_bug560780.html (100%)
 rename {content => dom}/base/test/test_bug562137.html (100%)
 rename {content => dom}/base/test/test_bug562169-1.html (100%)
 rename {content => dom}/base/test/test_bug562169-2.html (100%)
 rename {content => dom}/base/test/test_bug562652.html (100%)
 rename {content => dom}/base/test/test_bug564047.html (100%)
 rename {content => dom}/base/test/test_bug564863.xhtml (100%)
 rename {content => dom}/base/test/test_bug567350.html (100%)
 rename {content => dom}/base/test/test_bug578096.html (100%)
 rename {content => dom}/base/test/test_bug585978.html (100%)
 rename {content => dom}/base/test/test_bug587931.html (100%)
 rename {content => dom}/base/test/test_bug588990.html (100%)
 rename {content => dom}/base/test/test_bug590812.html (92%)
 rename {content => dom}/base/test/test_bug590870.html (91%)
 rename {content => dom}/base/test/test_bug592366.html (100%)
 rename {content => dom}/base/test/test_bug592829.html (100%)
 rename {content => dom}/base/test/test_bug597345.html (100%)
 rename {content => dom}/base/test/test_bug599588.html (100%)
 rename {content => dom}/base/test/test_bug601803.html (95%)
 rename {content => dom}/base/test/test_bug602838.html (100%)
 rename {content => dom}/base/test/test_bug604592.html (100%)
 rename {content => dom}/base/test/test_bug604660.html (100%)
 rename {content => dom}/base/test/test_bug605982.html (100%)
 rename {content => dom}/base/test/test_bug606729.html (100%)
 rename {content => dom}/base/test/test_bug614058.html (100%)
 rename {content => dom}/base/test/test_bug614583.html (100%)
 rename {content => dom}/base/test/test_bug622088.html (100%)
 rename {content => dom}/base/test/test_bug622117.html (100%)
 rename {content => dom}/base/test/test_bug622246.html (100%)
 rename {content => dom}/base/test/test_bug625722.html (100%)
 rename {content => dom}/base/test/test_bug626262.html (100%)
 rename {content => dom}/base/test/test_bug628938.html (100%)
 rename {content => dom}/base/test/test_bug631615.html (100%)
 rename {content => dom}/base/test/test_bug638112.html (100%)
 rename {content => dom}/base/test/test_bug647518.html (100%)
 rename {content => dom}/base/test/test_bug650001.html (100%)
 rename {content => dom}/base/test/test_bug656283.html (100%)
 rename {content => dom}/base/test/test_bug664916.html (100%)
 rename {content => dom}/base/test/test_bug666604.html (100%)
 rename {content => dom}/base/test/test_bug675121.html (100%)
 rename {content => dom}/base/test/test_bug675166.html (100%)
 rename {content => dom}/base/test/test_bug682463.html (100%)
 rename {content => dom}/base/test/test_bug682554.html (100%)
 rename {content => dom}/base/test/test_bug682592.html (100%)
 rename {content => dom}/base/test/test_bug684671.html (100%)
 rename {content => dom}/base/test/test_bug685798.html (100%)
 rename {content => dom}/base/test/test_bug686449.xhtml (100%)
 rename {content => dom}/base/test/test_bug687859.html (100%)
 rename {content => dom}/base/test/test_bug690056.html (100%)
 rename {content => dom}/base/test/test_bug692434.html (100%)
 rename {content => dom}/base/test/test_bug693615.html (100%)
 rename {content => dom}/base/test/test_bug693875.html (100%)
 rename {content => dom}/base/test/test_bug694754.xhtml (100%)
 rename {content => dom}/base/test/test_bug696301-1.html (84%)
 rename {content => dom}/base/test/test_bug696301-2.html (84%)
 rename {content => dom}/base/test/test_bug698381.html (100%)
 rename {content => dom}/base/test/test_bug698384.html (100%)
 rename {content => dom}/base/test/test_bug704063.html (100%)
 rename {content => dom}/base/test/test_bug707142.html (100%)
 rename {content => dom}/base/test/test_bug708620.html (100%)
 rename {content => dom}/base/test/test_bug711047.html (100%)
 rename {content => dom}/base/test/test_bug711180.html (100%)
 rename {content => dom}/base/test/test_bug719533.html (100%)
 rename {content => dom}/base/test/test_bug726364.html (100%)
 rename {content => dom}/base/test/test_bug737087.html (100%)
 rename {content => dom}/base/test/test_bug737565.html (100%)
 rename {content => dom}/base/test/test_bug737612.html (100%)
 rename {content => dom}/base/test/test_bug738108.html (100%)
 rename {content => dom}/base/test/test_bug744830.html (100%)
 rename {content => dom}/base/test/test_bug749367.html (100%)
 rename {content => dom}/base/test/test_bug753278.html (100%)
 rename {content => dom}/base/test/test_bug761120.html (100%)
 rename {content => dom}/base/test/test_bug782342.html (100%)
 rename {content => dom}/base/test/test_bug787778.html (100%)
 rename {content => dom}/base/test/test_bug789856.html (100%)
 rename {content => dom}/base/test/test_bug804395.html (84%)
 rename {content => dom}/base/test/test_bug809003.html (100%)
 rename {content => dom}/base/test/test_bug810494.html (100%)
 rename {content => dom}/base/test/test_bug811701.html (100%)
 rename {content => dom}/base/test/test_bug811701.xhtml (100%)
 rename {content => dom}/base/test/test_bug813919.html (100%)
 rename {content => dom}/base/test/test_bug814576.html (100%)
 rename {content => dom}/base/test/test_bug819051.html (95%)
 rename {content => dom}/base/test/test_bug820909.html (100%)
 rename {content => dom}/base/test/test_bug827160.html (100%)
 rename {content => dom}/base/test/test_bug840098.html (100%)
 rename {content => dom}/base/test/test_bug864595.html (100%)
 rename {content => dom}/base/test/test_bug868999.html (100%)
 rename {content => dom}/base/test/test_bug869000.html (100%)
 rename {content => dom}/base/test/test_bug869002.html (100%)
 rename {content => dom}/base/test/test_bug869006.html (100%)
 rename {content => dom}/base/test/test_bug876282.html (100%)
 rename {content => dom}/base/test/test_bug890580.html (100%)
 rename {content => dom}/base/test/test_bug891952.html (100%)
 rename {content => dom}/base/test/test_bug894874.html (100%)
 rename {content => dom}/base/test/test_bug895239.html (100%)
 rename {content => dom}/base/test/test_bug895974.html (100%)
 rename {content => dom}/base/test/test_bug902847.html (100%)
 rename {content => dom}/base/test/test_bug907892.html (88%)
 rename {content => dom}/base/test/test_bug922681.html (100%)
 rename {content => dom}/base/test/test_bug927196.html (100%)
 rename {content => dom}/base/test/test_bug945152.html (100%)
 rename {content => dom}/base/test/test_bug982153.html (100%)
 rename {content => dom}/base/test/test_caretPositionFromPoint.html (100%)
 rename {content => dom}/base/test/test_child_process_shutdown_message.html (100%)
 rename {content => dom}/base/test/test_classList.html (100%)
 rename {content => dom}/base/test/test_copyimage.html (100%)
 rename {content => dom}/base/test/test_copypaste.html (100%)
 rename {content => dom}/base/test/test_copypaste.xhtml (100%)
 rename {content => dom}/base/test/test_copypaste.xul (100%)
 rename {content => dom}/base/test/test_createHTMLDocument.html (100%)
 rename {content => dom}/base/test/test_declare_stylesheet_obsolete.html (100%)
 rename {content => dom}/base/test/test_document_constructor.html (100%)
 rename {content => dom}/base/test/test_domparser_null_char.html (100%)
 rename {content => dom}/base/test/test_domparsing.html (100%)
 rename {content => dom}/base/test/test_element.matches.html (100%)
 rename {content => dom}/base/test/test_elementTraversal.html (100%)
 rename {content => dom}/base/test/test_element_closest.html (100%)
 rename {content => dom}/base/test/test_encodeToStringWithMaxLength.html (100%)
 rename {content => dom}/base/test/test_file_from_blob.html (100%)
 rename {content => dom}/base/test/test_fileapi.html (100%)
 rename {content => dom}/base/test/test_fileapi_slice.html (100%)
 rename {content => dom}/base/test/test_getElementById.html (100%)
 rename {content => dom}/base/test/test_html_colors_quirks.html (100%)
 rename {content => dom}/base/test/test_html_colors_standards.html (100%)
 rename {content => dom}/base/test/test_html_in_xhr.html (100%)
 rename {content => dom}/base/test/test_htmlcopyencoder.html (100%)
 rename {content => dom}/base/test/test_htmlcopyencoder.xhtml (100%)
 rename {content => dom}/base/test/test_ipc_messagemanager_blob.html (100%)
 rename {content => dom}/base/test/test_messagemanager_assertpermission.html (100%)
 rename {content => dom}/base/test/test_messagemanager_principal.html (100%)
 rename {content => dom}/base/test/test_messagemanager_send_principal.html (100%)
 rename {content => dom}/base/test/test_meta_viewport0.html (100%)
 rename {content => dom}/base/test/test_meta_viewport1.html (100%)
 rename {content => dom}/base/test/test_meta_viewport2.html (100%)
 rename {content => dom}/base/test/test_meta_viewport3.html (100%)
 rename {content => dom}/base/test/test_meta_viewport4.html (100%)
 rename {content => dom}/base/test/test_meta_viewport5.html (100%)
 rename {content => dom}/base/test/test_meta_viewport6.html (100%)
 rename {content => dom}/base/test/test_mixed_content_blocker.html (98%)
 rename {content => dom}/base/test/test_mixed_content_blocker_bug803225.html (95%)
 rename {content => dom}/base/test/test_mixed_content_blocker_frameNavigation.html (92%)
 rename {content => dom}/base/test/test_mozMatchesSelector.html (100%)
 rename {content => dom}/base/test/test_mozfiledataurl.html (98%)
 rename {content => dom}/base/test/test_mutationobservers.html (100%)
 rename {content => dom}/base/test/test_nodelist_holes.html (100%)
 rename {content => dom}/base/test/test_object.html (100%)
 rename {content => dom}/base/test/test_plugin_freezing.html (100%)
 rename {content => dom}/base/test/test_processing_instruction_update_stylesheet.xhtml (100%)
 rename {content => dom}/base/test/test_progress_events_for_gzip_data.html (100%)
 rename {content => dom}/base/test/test_range_bounds.html (100%)
 rename {content => dom}/base/test/test_reentrant_flush.html (100%)
 rename {content => dom}/base/test/test_sync_xhr_timer.xhtml (100%)
 rename {content => dom}/base/test/test_text_wholeText.html (100%)
 rename {content => dom}/base/test/test_textnode_normalize_in_selection.html (100%)
 rename {content => dom}/base/test/test_textnode_split_in_selection.html (100%)
 rename {content => dom}/base/test/test_title.html (100%)
 rename {content => dom}/base/test/test_treewalker_nextsibling.xml (100%)
 rename {content => dom}/base/test/test_user_select.html (100%)
 rename {content => dom}/base/test/test_viewport_scroll.html (100%)
 rename {content => dom}/base/test/test_viewsource_forbidden_in_object.html (100%)
 rename {content => dom}/base/test/test_w3element_traversal.html (100%)
 rename {content => dom}/base/test/test_w3element_traversal.xhtml (100%)
 rename {content => dom}/base/test/test_w3element_traversal_svg.html (100%)
 rename {content => dom}/base/test/test_warning_for_blocked_cross_site_request.html (90%)
 rename {content => dom}/base/test/test_websocket.html (86%)
 rename {content => dom}/base/test/test_websocket_basic.html (98%)
 rename {content => dom}/base/test/test_websocket_hello.html (91%)
 rename {content => dom}/base/test/test_x-frame-options.html (96%)
 rename {content => dom}/base/test/test_xbl_userdata.xhtml (100%)
 rename {content => dom}/base/test/test_xhr_abort_after_load.html (100%)
 rename {content => dom}/base/test/test_xhr_forbidden_headers.html (100%)
 rename {content => dom}/base/test/test_xhr_progressevents.html (100%)
 rename {content => dom}/base/test/test_xhr_send_readystate.html (100%)
 rename {content => dom}/base/test/test_xhr_withCredentials.html (100%)
 rename {content => dom}/base/test/unit/1_original.xml (100%)
 rename {content => dom}/base/test/unit/1_result.xml (100%)
 rename {content => dom}/base/test/unit/2_original.xml (100%)
 rename {content => dom}/base/test/unit/2_result_1.xml (100%)
 rename {content => dom}/base/test/unit/2_result_2.xml (100%)
 rename {content => dom}/base/test/unit/2_result_3.xml (100%)
 rename {content => dom}/base/test/unit/2_result_4.xml (100%)
 rename {content => dom}/base/test/unit/3_original.xml (100%)
 rename {content => dom}/base/test/unit/3_result.xml (100%)
 rename {content => dom}/base/test/unit/3_result_2.xml (100%)
 rename {content => dom}/base/test/unit/4_original.xml (100%)
 rename {content => dom}/base/test/unit/4_result_1.xml (100%)
 rename {content => dom}/base/test/unit/4_result_2.xml (100%)
 rename {content => dom}/base/test/unit/4_result_3.xml (100%)
 rename {content => dom}/base/test/unit/4_result_4.xml (100%)
 rename {content => dom}/base/test/unit/4_result_5.xml (100%)
 rename {content => dom}/base/test/unit/4_result_6.xml (100%)
 rename {content => dom}/base/test/unit/head_utilities.js (100%)
 rename {content => dom}/base/test/unit/test_bug553888.js (100%)
 rename {content => dom}/base/test/unit/test_bug737966.js (100%)
 rename {content => dom}/base/test/unit/test_cspreports.js (100%)
 rename {content => dom}/base/test/unit/test_error_codes.js (100%)
 rename {content => dom}/base/test/unit/test_thirdpartyutil.js (100%)
 rename {content => dom}/base/test/unit/test_xhr_document.js (100%)
 rename {content => dom}/base/test/unit/test_xhr_standalone.js (100%)
 rename {content => dom}/base/test/unit/test_xmlserializer.js (100%)
 rename {content => dom}/base/test/unit/xpcshell.ini (100%)
 rename {content => dom}/base/test/unit_ipc/test_bug553888_wrap.js (100%)
 rename {content => dom}/base/test/unit_ipc/test_xhr_document_ipc.js (100%)
 rename {content => dom}/base/test/unit_ipc/xpcshell.ini (100%)
 rename {content => dom}/base/test/variable_style_sheet.sjs (100%)
 rename {content => dom}/base/test/viewport_helpers.js (100%)
 rename {content => dom}/base/test/w3element_traversal.svg (100%)
 rename {content => dom}/base/test/websocket_hybi/file_binary-frames_wsh.py (100%)
 rename {content => dom}/base/test/websocket_hybi/file_check-binary-messages_wsh.py (100%)
 rename {content => dom}/base/test/websocket_hybi/mochitest.ini (100%)
 rename {content => dom}/base/test/websocket_hybi/test_receive-arraybuffer.html (95%)
 rename {content => dom}/base/test/websocket_hybi/test_receive-blob.html (96%)
 rename {content => dom}/base/test/websocket_hybi/test_send-arraybuffer.html (93%)
 rename {content => dom}/base/test/websocket_hybi/test_send-blob.html (95%)
 rename {content => dom}/base/test/wholeTexty-helper.xml (100%)

diff --git a/accessible/generic/moz.build b/accessible/generic/moz.build
index 3b393c650fb..f1a26038882 100644
--- a/accessible/generic/moz.build
+++ b/accessible/generic/moz.build
@@ -31,7 +31,7 @@ LOCAL_INCLUDES += [
     '/accessible/ipc',
     '/accessible/xpcom',
     '/accessible/xul',
-    '/content/base/src',
+    '/dom/base',
     '/layout/generic',
     '/layout/xul',
 ]
diff --git a/accessible/windows/msaa/moz.build b/accessible/windows/msaa/moz.build
index cc8cdfc8e45..35c35e303ef 100644
--- a/accessible/windows/msaa/moz.build
+++ b/accessible/windows/msaa/moz.build
@@ -53,7 +53,7 @@ LOCAL_INCLUDES += [
     '/accessible/windows/uia',
     '/accessible/xpcom',
     '/accessible/xul',
-    '/content/base/src',
+    '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index f66722ff8d1..06ad6c86320 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -139,7 +139,6 @@
 @BINPATH@/components/commandhandler.xpt
 @BINPATH@/components/commandlines.xpt
 @BINPATH@/components/composer.xpt
-@BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_xslt.xpt
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 732824f764f..0f5c59d7b31 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -184,7 +184,6 @@
 @BINPATH@/components/commandhandler.xpt
 @BINPATH@/components/commandlines.xpt
 @BINPATH@/components/composer.xpt
-@BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_geckomediaplugins.xpt
diff --git a/browser/metro/base/content/library/SelectionPrototype.js b/browser/metro/base/content/library/SelectionPrototype.js
index 86a38b5077d..4cd71546507 100644
--- a/browser/metro/base/content/library/SelectionPrototype.js
+++ b/browser/metro/base/content/library/SelectionPrototype.js
@@ -22,11 +22,11 @@ dump("### SelectionPrototype.js loaded\n");
 
 /*
   http://mxr.mozilla.org/mozilla-central/source/docshell/base/nsIDocShell.idl
-  http://mxr.mozilla.org/mozilla-central/source/content/base/public/nsISelectionDisplay.idl
-  http://mxr.mozilla.org/mozilla-central/source/content/base/public/nsISelectionListener.idl
-  http://mxr.mozilla.org/mozilla-central/source/content/base/public/nsISelectionPrivate.idl
-  http://mxr.mozilla.org/mozilla-central/source/content/base/public/nsISelectionController.idl
-  http://mxr.mozilla.org/mozilla-central/source/content/base/public/nsISelection.idl
+  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionDisplay.idl
+  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionListener.idl
+  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionPrivate.idl
+  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelectionController.idl
+  http://mxr.mozilla.org/mozilla-central/source/dom/base/nsISelection.idl
   http://mxr.mozilla.org/mozilla-central/source/dom/interfaces/core/nsIDOMDocument.idl#372
     rangeCount
     getRangeAt
diff --git a/content/base/crashtests/crashtests.list b/content/base/crashtests/crashtests.list
deleted file mode 100644
index 5b9ff5a9890..00000000000
--- a/content/base/crashtests/crashtests.list
+++ /dev/null
@@ -1,155 +0,0 @@
-load 43040-1.html
-load 116848-1.html
-load 149320-1.html
-load 205225-1.html
-load 231475-1.html
-load 293388-1.html
-load 308120-1.xul
-load 324871-1.html
-load 325730-1.html
-load 326618-1.html
-load 326646-1.html
-load 326778-1.xul
-load 326865-1.html
-load 327694.html
-load 330925-1.xhtml
-load 336381-1.xhtml
-load 336715-1.xhtml
-load 338391-1.xhtml
-load 340733-1.html
-load 343730-1.xhtml
-load 343850-1.xhtml
-load 343889-1.html
-load 344434-1.xhtml
-load 348049-1.xhtml
-load 344882-1.html
-load 345837-1.xhtml
-load 349355-1.html
-load 354645-1.xul
-load 360599-1.html
-load 366200-1.xhtml
-load 371466-1.xhtml
-load 377360-1.xhtml
-load 377960-1.html
-load 377960-2.html
-load 384663-1.html
-load 386000-1.html
-load 386794-1.html
-load 387460-1.html
-load 395469-1.xhtml
-load 395469-2.xhtml
-skip load 399712-1.html # sporadically times out (bug 473680)
-load 398088-1.xul
-load 400763-1.html
-load 401993-1.html
-load 407818.html
-load 410860-1.xml
-load 411882-1.xhtml
-load 416734-1.html
-load 418928-1.html
-load 420620-1.html
-load 424276-1.html
-load 426987-1.html
-load 443538-1.svg
-load 448615-1.html
-load 450383-1.html
-load 450385-1.html
-skip load 458637-1.html # sporadically times out (bug 473680)
-load 467392.html
-load 472593-1.html
-load 474041-1.svg
-load 483818-1.html
-load 493281-1.html
-load 493281-2.html
-load 490760-1.xhtml
-load 494810-1.html
-load 509536-1.html
-load 522516-1.html
-load 529670.html
-load 535926-1.html
-load 543645.html
-load 551631-1.html
-load 554230-1.xhtml
-load 552651.html
-load 558973.html
-load 561981-1.html
-load 561981-2.html
-load 564079-1.html 
-load 564114.html
-load 565125-1.html
-load 582601.html
-load 575462.svg
-load 590395-1.html
-load 595606-1.html
-load 595606-2.html
-load 605672-1.svg
-load 606729-1.html
-load 593302-1.html
-load 593302-2.html
-load 610571-1.html
-load 604262-1.html
-load 628599-1.html
-load 637214-1.svg
-load 637214-2.svg
-load 642022-1.html
-load 646184.html
-load 658845-1.svg
-load 667336-1.html
-load 679459.html
-load 679689-1.html
-load 682463.html
-load 693212.xhtml
-load 698974-1.html
-load 700090-1.html
-load 700090-2.html
-load 700512.html
-load xhr_html_nullresponse.html
-load 709384.html
-load 709954.html
-load 713417.html
-load 713417-2.html
-load 715056.html
-load 741163-1.html
-load 766426.html
-load 771639.html
-load 752226-1.html
-load 752226-2.html
-HTTP(..) load xhr_abortinprogress.html
-load 786854.html
-load xhr_empty_datauri.html
-load 815043.html
-load 815276.html
-load 815477.html
-load 815500.html
-load 816253.html
-load 819014.html
-load 822691.html
-load 822723.html
-load 824719.html
-load 827190.html
-load 828054.html
-load 828903.html
-load 829428.html
-load 830098.html
-load 831287.html
-load 832644.html
-load 836890.html
-skip-if(browserIsRemote) load 838489-1.html # <keygen> broken in e10s (bug 582297)
-skip-if(browserIsRemote) load 838489-2.html # <keygen> broken in e10s (bug 582297)
-load 841205.html
-load 844404.html
-load 847127.html
-load 845093-1.html
-load 845093-2.html
-load 849727.html
-load 849732.html
-load 849601.html
-skip-if(Android) load 851353-1.html
-load 863950.html
-load 864448.html
-load 930250.html
-load 942979.html
-load 978646.html
-load 1026714.html
-pref(dom.webcomponents.enabled,true) load 1027461-1.html
-pref(dom.webcomponents.enabled,true) load 1024428-1.html
diff --git a/content/base/moz.build b/content/base/moz.build
deleted file mode 100644
index 92950f53728..00000000000
--- a/content/base/moz.build
+++ /dev/null
@@ -1,8 +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 += ['public', 'src']
-TEST_DIRS += ['test']
diff --git a/content/base/public/moz.build b/content/base/public/moz.build
deleted file mode 100644
index c0dad7074ca..00000000000
--- a/content/base/public/moz.build
+++ /dev/null
@@ -1,81 +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/.
-
-XPIDL_SOURCES += [
-    'nsIContentPolicy.idl',
-    'nsIContentSecurityPolicy.idl',
-    'nsIDocumentEncoder.idl',
-    'nsIDOMDataChannel.idl',
-    'nsIDOMFile.idl',
-    'nsIDOMFileList.idl',
-    'nsIDOMFileReader.idl',
-    'nsIDOMFormData.idl',
-    'nsIDOMParser.idl',
-    'nsIDOMSerializer.idl',
-    'nsIDroppedLinkHandler.idl',
-    'nsIFrameLoader.idl',
-    'nsIImageLoadingContent.idl',
-    'nsIMessageManager.idl',
-    'nsIObjectLoadingContent.idl',
-    'nsIScriptLoaderObserver.idl',
-    'nsISelection.idl',
-    'nsISelectionController.idl',
-    'nsISelectionDisplay.idl',
-    'nsISelectionListener.idl',
-    'nsISelectionPrivate.idl',
-    'nsIXMLHttpRequest.idl',
-]
-
-XPIDL_MODULE = 'content_base'
-
-EXPORTS += [
-    'HTMLSplitOnSpacesTokenizer.h',
-    'mozFlushType.h',
-    'nsCaseTreatment.h',
-    'nsContentCID.h',
-    'nsContentCreatorFunctions.h',
-    'nsContentPolicyUtils.h',
-    'nsContentTypeParser.h',
-    'nsContentUtils.h',
-    'nsCopySupport.h',
-    'nsDeprecatedOperationList.h',
-    'nsDocElementCreatedNotificationRunner.h',
-    'nsHostObjectProtocolHandler.h',
-    'nsIAttribute.h',
-    'nsIContent.h',
-    'nsIContentInlines.h',
-    'nsIContentIterator.h',
-    'nsIContentSerializer.h',
-    'nsIDocument.h',
-    'nsIDocumentInlines.h',
-    'nsIDocumentObserver.h',
-    'nsIMutationObserver.h',
-    'nsINode.h',
-    'nsINodeList.h',
-    'nsIScriptElement.h',
-    'nsIStyleSheetLinkingElement.h',
-    'nsLineBreaker.h',
-    'nsNameSpaceManager.h',
-    'nsReferencedElement.h',
-    'nsTreeSanitizer.h',
-    'nsViewportInfo.h',
-    'nsXMLNameSpaceMap.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'BlobSet.h',
-    'DirectionalityUtils.h',
-    'Element.h',
-    'ElementInlines.h',
-    'File.h',
-    'FragmentOrElement.h',
-    'FromParser.h',
-]
-
-EXPORTS.mozilla += [
-    'CORSMode.h',
-]
-
diff --git a/content/base/src/moz.build b/content/base/src/moz.build
deleted file mode 100644
index 24daca5c77c..00000000000
--- a/content/base/src/moz.build
+++ /dev/null
@@ -1,232 +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/.
-
-EXPORTS += [
-    'AutocompleteFieldList.h',
-    'mozAutoDocUpdate.h',
-    'nsAtomListUtils.h',
-    'nsAttrAndChildArray.h',
-    'nsAttrName.h',
-    'nsAttrValue.h',
-    'nsAttrValueInlines.h',
-    'nsContentList.h',
-    'nsContentListDeclarations.h',
-    'nsContentSink.h',
-    'nsCrossSiteListenerProxy.h',
-    'nsDOMAttributeMap.h',
-    'nsElementFrameLoaderOwner.h',
-    'nsFrameMessageManager.h',
-    'nsGenericDOMDataNode.h',
-    'nsGkAtomList.h',
-    'nsGkAtoms.h',
-    'nsImageLoadingContent.h',
-    'nsMappedAttributeElement.h',
-    'nsNodeInfoManager.h',
-    'nsNodeUtils.h',
-    'nsPropertyTable.h',
-    'nsRange.h',
-    'nsSandboxFlags.h',
-    'nsScriptLoader.h',
-    'nsStubDocumentObserver.h',
-    'nsStubMutationObserver.h',
-    'nsStyledElement.h',
-    'nsTextFragment.h',
-    'nsTraversal.h',
-]
-
-if CONFIG['MOZ_WEBRTC']:
-    EXPORTS += [
-        'nsDOMDataChannel.h',
-        'nsDOMDataChannelDeclarations.h',
-    ]
-    UNIFIED_SOURCES += [
-        'nsDOMDataChannel.cpp',
-    ]
-    LOCAL_INCLUDES += [
-        '/netwerk/sctp/datachannel',
-    ]
-
-# Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
-# nsTextFragment.cpp
-if CONFIG['INTEL_ARCHITECTURE']:
-    SOURCES += ['nsTextFragmentSSE2.cpp']
-    SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-
-EXPORTS.mozilla += [
-    'FeedWriterEnabled.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'Attr.h',
-    'ChildIterator.h',
-    'Comment.h',
-    'DocumentFragment.h',
-    'DocumentType.h',
-    'DOMImplementation.h',
-    'DOMMatrix.h',
-    'DOMParser.h',
-    'DOMPoint.h',
-    'DOMQuad.h',
-    'DOMRect.h',
-    'DOMStringList.h',
-    'EventSource.h',
-    'ImportManager.h',
-    'Link.h',
-    'NodeIterator.h',
-    'ResponsiveImageSelector.h',
-    'ShadowRoot.h',
-    'StyleSheetList.h',
-    'Text.h',
-    'TreeWalker.h',
-    'WebSocket.h',
-]
-
-UNIFIED_SOURCES += [
-    'Attr.cpp',
-    'ChildIterator.cpp',
-    'Comment.cpp',
-    'DirectionalityUtils.cpp',
-    'DocumentFragment.cpp',
-    'DocumentType.cpp',
-    'DOMImplementation.cpp',
-    'DOMMatrix.cpp',
-    'DOMParser.cpp',
-    'DOMPoint.cpp',
-    'DOMQuad.cpp',
-    'DOMRect.cpp',
-    'DOMStringList.cpp',
-    'Element.cpp',
-    'EventSource.cpp',
-    'File.cpp',
-    'FileIOObject.cpp',
-    'FragmentOrElement.cpp',
-    'ImportManager.cpp',
-    'Link.cpp',
-    'MultipartFileImpl.cpp',
-    'NodeIterator.cpp',
-    'nsAtomListUtils.cpp',
-    'nsAttrAndChildArray.cpp',
-    'nsAttrValue.cpp',
-    'nsAttrValueOrString.cpp',
-    'nsCCUncollectableMarker.cpp',
-    'nsContentAreaDragDrop.cpp',
-    'nsContentIterator.cpp',
-    'nsContentList.cpp',
-    'nsContentPolicy.cpp',
-    'nsContentSink.cpp',
-    'nsCopySupport.cpp',
-    'nsCrossSiteListenerProxy.cpp',
-    'nsCSPContext.cpp',
-    'nsCSPParser.cpp',
-    'nsCSPService.cpp',
-    'nsCSPUtils.cpp',
-    'nsDataDocumentContentPolicy.cpp',
-    'nsDocument.cpp',
-    'nsDocumentEncoder.cpp',
-    'nsDOMAttributeMap.cpp',
-    'nsDOMCaretPosition.cpp',
-    'nsDOMFileReader.cpp',
-    'nsDOMMutationObserver.cpp',
-    'nsDOMSerializer.cpp',
-    'nsDOMSettableTokenList.cpp',
-    'nsDOMTokenList.cpp',
-    'nsElementFrameLoaderOwner.cpp',
-    'nsFormData.cpp',
-    'nsFrameLoader.cpp',
-    'nsFrameMessageManager.cpp',
-    'nsGenConImageContent.cpp',
-    'nsGenericDOMDataNode.cpp',
-    'nsGkAtoms.cpp',
-    'nsHostObjectProtocolHandler.cpp',
-    'nsHostObjectURI.cpp',
-    'nsHTMLContentSerializer.cpp',
-    'nsINode.cpp',
-    'nsInProcessTabChildGlobal.cpp',
-    'nsLineBreaker.cpp',
-    'nsMappedAttributeElement.cpp',
-    'nsMappedAttributes.cpp',
-    'nsMixedContentBlocker.cpp',
-    'nsNameSpaceManager.cpp',
-    'nsNoDataProtocolContentPolicy.cpp',
-    'nsNodeInfoManager.cpp',
-    'nsNodeUtils.cpp',
-    'nsPlainTextSerializer.cpp',
-    'nsPropertyTable.cpp',
-    'nsRange.cpp',
-    'nsReferencedElement.cpp',
-    'nsScriptElement.cpp',
-    'nsScriptLoader.cpp',
-    'nsStubDocumentObserver.cpp',
-    'nsStubMutationObserver.cpp',
-    'nsStyledElement.cpp',
-    'nsStyleLinkElement.cpp',
-    'nsSyncLoadService.cpp',
-    'nsTextFragment.cpp',
-    'nsTextNode.cpp',
-    'nsTraversal.cpp',
-    'nsTreeSanitizer.cpp',
-    'nsViewportInfo.cpp',
-    'nsXHTMLContentSerializer.cpp',
-    'nsXMLContentSerializer.cpp',
-    'nsXMLHttpRequest.cpp',
-    'nsXMLNameSpaceMap.cpp',
-    'ResponsiveImageSelector.cpp',
-    'ShadowRoot.cpp',
-    'StyleSheetList.cpp',
-    'Text.cpp',
-    'ThirdPartyUtil.cpp',
-    'TreeWalker.cpp',
-    'WebSocket.cpp',
-]
-
-SOURCES += [
-    'nsImageLoadingContent.cpp',
-]
-
-# These files cannot be built in unified mode because of OS X headers.
-SOURCES += [
-    'nsContentUtils.cpp',
-    'nsObjectLoadingContent.cpp',
-]
-
-EXTRA_COMPONENTS += [
-    'contentAreaDropListener.js',
-    'contentAreaDropListener.manifest',
-    'messageWakeupService.js',
-    'messageWakeupService.manifest',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/caps',
-    '/docshell/base',
-    '/dom/base',
-    '/dom/html',
-    '/dom/ipc',
-    '/dom/svg',
-    '/dom/workers',
-    '/dom/xbl',
-    '/dom/xml',
-    '/dom/xslt/xpath',
-    '/dom/xul',
-    '/image/src',
-    '/js/ipc',
-    '/js/xpconnect/src',
-    '/js/xpconnect/wrappers',
-    '/layout/base',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/svg',
-    '/layout/xul',
-    '/netwerk/base/src',
-    '/xpcom/ds',
-]
diff --git a/content/base/test/bug461735-redirect1.sjs b/content/base/test/bug461735-redirect1.sjs
deleted file mode 100644
index a3f007880a4..00000000000
--- a/content/base/test/bug461735-redirect1.sjs
+++ /dev/null
@@ -1,4 +0,0 @@
-function handleRequest(request, response) {
-  response.setStatusLine(null, 302, "Found");
-  response.setHeader("Location", "http://example.com/tests/content/base/test/bug461735-post-redirect.js", false);
-}
diff --git a/content/base/test/bug461735-redirect2.sjs b/content/base/test/bug461735-redirect2.sjs
deleted file mode 100644
index d6c99378727..00000000000
--- a/content/base/test/bug461735-redirect2.sjs
+++ /dev/null
@@ -1,4 +0,0 @@
-function handleRequest(request, response) {
-  response.setStatusLine(null, 302, "Found");
-  response.setHeader("Location", "http://mochi.test:8888/tests/content/base/test/bug461735-post-redirect.js", false);
-}
diff --git a/content/base/test/chrome.ini b/content/base/test/chrome.ini
deleted file mode 100644
index 4f9c6eecad8..00000000000
--- a/content/base/test/chrome.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-
-[test_bug357450.js]
-[test_copypaste.xul]
-[test_messagemanager_principal.html]
-[test_messagemanager_send_principal.html]
-skip-if = buildapp == 'mulet'
diff --git a/content/base/test/csp/file_bug836922_npolicies.html b/content/base/test/csp/file_bug836922_npolicies.html
deleted file mode 100644
index 2a705b35539..00000000000
--- a/content/base/test/csp/file_bug836922_npolicies.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-  <head>
-    <link rel='stylesheet' type='text/css'
-          href='/tests/content/base/test/csp/file_CSP.sjs?testid=css_self&type=text/css' />
-    <link rel='stylesheet' type='text/css'
-          href='http://example.com/tests/content/base/test/csp/file_CSP.sjs?testid=css_examplecom&type=text/css' />
-
-  </head>
-  <body>
-    <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img_self&type=img/png"> </img>
-    <img src="http://example.com/tests/content/base/test/csp/file_CSP.sjs?testid=img_examplecom&type=img/png"> </img>
-    <script src='/tests/content/base/test/csp/file_CSP.sjs?testid=script_self&type=text/javascript'></script>
-
-  </body>
-</html>
diff --git a/content/base/test/csp/file_bug836922_npolicies.html^headers^ b/content/base/test/csp/file_bug836922_npolicies.html^headers^
deleted file mode 100644
index b328f447fda..00000000000
--- a/content/base/test/csp/file_bug836922_npolicies.html^headers^
+++ /dev/null
@@ -1,2 +0,0 @@
-content-security-policy: default-src 'self'; img-src 'none'; report-uri http://mochi.test:8888/tests/content/base/test/csp/file_bug836922_npolicies_violation.sjs
-content-security-policy-report-only: default-src *; img-src 'self'; script-src 'none'; report-uri http://mochi.test:8888/tests/content/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
diff --git a/content/base/test/csp/file_bug886164.html b/content/base/test/csp/file_bug886164.html
deleted file mode 100644
index e47c2bc5da5..00000000000
--- a/content/base/test/csp/file_bug886164.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head> <meta charset="utf-8"> </head>
-  <body>
-    <!-- sandbox="allow-same-origin" -->
-    <!-- Content-Security-Policy: default-src 'self' -->
-
-    <!-- these should be stopped by CSP -->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
-
-    <!-- these should load ok -->
-    <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img_good&type=img/png" />
-    <script src='/tests/content/base/test/csp/file_CSP.sjs?testid=scripta_bad&type=text/javascript'></script>
-
-  </body>
-</html>
diff --git a/content/base/test/csp/file_bug886164_3.html b/content/base/test/csp/file_bug886164_3.html
deleted file mode 100644
index 7cefd6569c8..00000000000
--- a/content/base/test/csp/file_bug886164_3.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head> <meta charset="utf-8"> </head>
-  <body>
-    <!-- sandbox -->
-    <!-- Content-Security-Policy: default-src 'none' -->
-
-    <!-- these should be stopped by CSP -->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img3_bad&type=img/png"> </img>
-    <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img3a_bad&type=img/png" />
-
-  </body>
-</html>
diff --git a/content/base/test/csp/file_bug886164_4.html b/content/base/test/csp/file_bug886164_4.html
deleted file mode 100644
index 146c6ba01fc..00000000000
--- a/content/base/test/csp/file_bug886164_4.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head> <meta charset="utf-8"> </head>
-  <body>
-    <!-- sandbox -->
-    <!-- Content-Security-Policy: default-src 'none' -->
-
-    <!-- these should be stopped by CSP -->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img4_bad&type=img/png"> </img>
-    <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img4a_bad&type=img/png" />
-
-  </body>
-</html>
diff --git a/content/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ b/content/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
deleted file mode 100644
index 4b4dcecaec5..00000000000
--- a/content/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
+++ /dev/null
@@ -1 +0,0 @@
-content-security-policy-report-only: policy-uri /tests/content/base/test/csp/file_CSP_policyuri_regression_from_multipolicy_policy
diff --git a/content/base/test/file_XHR_fail1.txt^headers^ b/content/base/test/file_XHR_fail1.txt^headers^
deleted file mode 100644
index 74d6d705997..00000000000
--- a/content/base/test/file_XHR_fail1.txt^headers^
+++ /dev/null
@@ -1,2 +0,0 @@
-HTTP 301 Moved Permanently
-Location: http://example.com/tests/content/base/test/file_XHR_pass2.txt
diff --git a/content/base/test/file_x-frame-options_main.html b/content/base/test/file_x-frame-options_main.html
deleted file mode 100644
index e6d7fec80e3..00000000000
--- a/content/base/test/file_x-frame-options_main.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<title>X-Frame-Options tests</title>
-<script type="text/javascript">
-// This frame loading means all subframes have either loaded or errored out.  We
-// can now tell the test harness to check each subframe for the expected result.
-window.addEventListener('load', parent.testFramesLoaded, false);
-</script>
-</head>
-<body>
-
-<iframe id="control1" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=control1"></iframe><br>
-<iframe id="control2" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=control2"></iframe><br>
-<iframe id="deny" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny"></iframe><br>
-<iframe id="sameorigin1" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin1&xfo=sameorigin"></iframe><br>
-<iframe id="sameorigin2" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin2&xfo=sameorigin"></iframe><br>
-<iframe id="sameorigin5" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin5&xfo=sameorigin2"></iframe><br>
-<iframe id="sameorigin6" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin6&xfo=sameorigin2"></iframe><br>
-<iframe id="sameorigin7" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin7&xfo=sameorigin3"></iframe><br>
-<iframe id="sameorigin8" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin8&xfo=sameorigin3"></iframe><br>
-<iframe id="mixedpolicy" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=mixedpolicy&xfo=mixedpolicy"></iframe><br>
-<iframe id="allow-from-allow" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=allow-from-allow&xfo=afa"></iframe><br>
-<iframe id="allow-from-deny" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=allow-from-deny&xfo=afd"></iframe><br>
-<iframe id="sameorigin-multipart" src="http://example.com/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin-multipart&xfo=sameorigin&multipart=1"></iframe><br>
-<iframe id="sameorigin-multipart2" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin-multipart2&xfo=sameorigin&multipart=1"></iframe><br>
-
-<!-- added for bug 836132 -->
-<script type="text/javascript">
-
-  function addFrame(test, xfo) {
-    var baseurl = "http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs";
-    var ifr = "<iframe id='" + test + "'" + "src='" + baseurl + "?testid=" + test + "&xfo=" + xfo + "' style='border:2px solid red;'></iframe>";
-    document.write(ifr);
-  }
-
-  addFrame("allow-from-allow-1", "afa1");
-  for (var i = 1; i<=14; i++)
-    addFrame("allow-from-deny-"+i, "afd"+i);
-
-</script>
-
-
-</body>
-</html>
diff --git a/content/base/test/mochitest.ini b/content/base/test/mochitest.ini
deleted file mode 100644
index 0be52e1067a..00000000000
--- a/content/base/test/mochitest.ini
+++ /dev/null
@@ -1,666 +0,0 @@
-[DEFAULT]
-support-files =
-  345339_iframe.html
-  Ahem.ttf
-  accesscontrol.resource
-  accesscontrol.resource^headers^
-  badContentType.eventsource
-  badContentType.eventsource^headers^
-  badHTTPResponseCode.eventsource
-  badHTTPResponseCode.eventsource^headers^
-  badMessageEvent.eventsource
-  badMessageEvent.eventsource^headers^
-  badMessageEvent2.eventsource
-  badMessageEvent2.eventsource^headers^
-  bug282547.sjs
-  bug298064-subframe.html
-  bug313646.txt
-  bug382113_object.html
-  bug419132.html
-  bug426308-redirect.sjs
-  bug435425.sjs
-  bug435425_redirect.sjs
-  bug444322.js
-  bug444322.txt
-  bug455629-helper.svg
-  bug457746.sjs
-  bug461735-post-redirect.js
-  bug461735-redirect1.sjs
-  bug461735-redirect2.sjs
-  bug466080.sjs
-  bug466409-empty.css
-  bug466409-page.html
-  bug475156.sjs
-  bug482935.sjs
-  bug540854.sjs
-  bug578096LoadChromeScript.js
-  bug638112-response.txt
-  bug638112.sjs
-  bug682592-subframe-ref.html
-  bug682592-subframe.html
-  bug696301-script-1.js
-  bug696301-script-1.js^headers^
-  bug696301-script-2.js
-  bug803225_test_mailto.html
-  bug819051.sjs
-  copypaste.js
-  delayedServerEvents.sjs
-  eventsource.resource
-  eventsource.resource^headers^
-  eventsource_redirect.resource
-  eventsource_redirect.resource^headers^
-  eventsource_redirect_to.resource
-  eventsource_redirect_to.resource^headers^
-  file_CrossSiteXHR_cache_server.sjs
-  file_CrossSiteXHR_inner.html
-  file_CrossSiteXHR_inner.jar
-  file_CrossSiteXHR_inner_data.sjs
-  file_CrossSiteXHR_server.sjs
-  file_XHRDocURI.text
-  file_XHRDocURI.text^headers^
-  file_XHRDocURI.xml
-  file_XHRDocURI.xml^headers^
-  file_XHRDocURI.html
-  file_XHRDocURI.html^headers^
-  file_XHRDocURI.sjs
-  file_XHRResponseURL.js
-  file_XHRResponseURL.sjs
-  file_XHRResponseURL.text
-  file_XHRResponseURL.text^headers^
-  file_XHRResponseURL_nocors.text
-  file_XHRSendData.sjs
-  file_XHRSendData_doc.xml
-  file_XHRSendData_doc.xml^headers^
-  file_XHR_anon.sjs
-  file_XHR_binary1.bin
-  file_XHR_binary1.bin^headers^
-  file_XHR_binary2.bin
-  file_XHR_fail1.txt
-  file_XHR_fail1.txt^headers^
-  file_XHR_header.sjs
-  file_XHR_pass1.xml
-  file_XHR_pass2.txt
-  file_XHR_pass3.txt
-  file_XHR_pass3.txt^headers^
-  file_XHR_system_redirect.html
-  file_XHR_system_redirect.html^headers^
-  file_XHR_timeout.sjs
-  file_base_xbl.xml
-  file_bug28293.sjs
-  file_bug326337.xml
-  file_bug326337_inner.html
-  file_bug326337_outer.html
-  file_bug416317.xhtml
-  file_bug426646-1.html
-  file_bug426646-2.html
-  file_bug428847-1.xhtml
-  file_bug428847-2.xhtml
-  file_bug498897.css
-  file_bug498897.html
-  file_bug498897.html^headers^
-  file_bug503481.sjs
-  file_bug503481b_inner.html
-  file_bug541937.html
-  file_bug541937.xhtml
-  file_bug557892.html
-  file_bug562137.txt
-  file_bug590812-ref.xhtml
-  file_bug590812.xml
-  file_bug590870.html
-  file_bug601803a.html
-  file_bug601803b.html
-  file_bug604660-1.xml
-  file_bug604660-2.xsl
-  file_bug604660-3.js
-  file_bug604660-4.js
-  file_bug604660-5.xml
-  file_bug604660-6.xsl
-  file_bug622088.sjs
-  file_bug622088_inner.html
-  file_bug675121.sjs
-  file_bug687859-16.js
-  file_bug687859-16.js^headers^
-  file_bug687859-bom.js
-  file_bug687859-bom.js^headers^
-  file_bug687859-charset.js
-  file_bug687859-http.js
-  file_bug687859-http.js^headers^
-  file_bug687859-inherit.js
-  file_bug692434.xml
-  file_bug707142_baseline.json
-  file_bug707142_bom.json
-  file_bug707142_utf-16.json
-  file_bug708620-2.html
-  file_bug708620.html
-  file_bug782342.txt
-  file_bug787778.sjs
-  file_bug804395.jar
-  file_bug869432.eventsource
-  file_bug869432.eventsource^headers^
-  file_bug902350.html
-  file_bug902350_frame.html
-  file_bug907892.html
-  file_bug945152.jar
-  file_bug945152_worker.js
-  file_bug1008126_worker.js
-  file_general_document.html
-  file_html_in_xhr.html
-  file_html_in_xhr.sjs
-  file_html_in_xhr2.html
-  file_html_in_xhr3.html
-  file_htmlserializer_1.html
-  file_htmlserializer_1_bodyonly.html
-  file_htmlserializer_1_format.html
-  file_htmlserializer_1_linebreak.html
-  file_htmlserializer_1_links.html
-  file_htmlserializer_1_nested_body.html
-  file_htmlserializer_1_no_body.html
-  file_htmlserializer_1_noflag.html
-  file_htmlserializer_1_noformatpre.html
-  file_htmlserializer_1_raw.html
-  file_htmlserializer_1_sibling_body.html
-  file_htmlserializer_1_sibling_body_only_body.html
-  file_htmlserializer_1_wrap.html
-  file_htmlserializer_2.html
-  file_htmlserializer_2_basic.html
-  file_htmlserializer_2_enthtml.html
-  file_htmlserializer_2_entw3c.html
-  file_htmlserializer_2_latin1.html
-  file_htmlserializer_ipv6.html
-  file_htmlserializer_ipv6_out.html
-  file_mixed_content_frameNavigation.html
-  file_mixed_content_frameNavigation_blankTarget.html
-  file_mixed_content_frameNavigation_grandchild.html
-  file_mixed_content_frameNavigation_innermost.html
-  file_mixed_content_frameNavigation_secure.html
-  file_mixed_content_frameNavigation_secure_grandchild.html
-  file_mixed_content_main.html
-  file_mixed_content_main_bug803225.html
-  file_mixed_content_main_bug803225_websocket_wsh.py
-  file_mixed_content_server.sjs
-  file_mozfiledataurl_audio.ogg
-  file_mozfiledataurl_doc.html
-  file_mozfiledataurl_img.jpg
-  file_mozfiledataurl_inner.html
-  file_mozfiledataurl_text.txt
-  file_restrictedEventSource.sjs
-  file_websocket_basic_wsh.py
-  file_websocket_hello_wsh.py
-  file_websocket_http_resource.txt
-  file_websocket_wsh.py
-  file_x-frame-options_main.html
-  file_x-frame-options_page.sjs
-  file_xhtmlserializer_1.xhtml
-  file_xhtmlserializer_1_bodyonly.xhtml
-  file_xhtmlserializer_1_format.xhtml
-  file_xhtmlserializer_1_linebreak.xhtml
-  file_xhtmlserializer_1_links.xhtml
-  file_xhtmlserializer_1_nested_body.xhtml
-  file_xhtmlserializer_1_no_body.xhtml
-  file_xhtmlserializer_1_noflag.xhtml
-  file_xhtmlserializer_1_noformatpre.xhtml
-  file_xhtmlserializer_1_raw.xhtml
-  file_xhtmlserializer_1_sibling_body.xhtml
-  file_xhtmlserializer_1_sibling_body_only_body.xhtml
-  file_xhtmlserializer_1_wrap.xhtml
-  file_xhtmlserializer_2.xhtml
-  file_xhtmlserializer_2_basic.xhtml
-  file_xhtmlserializer_2_enthtml.xhtml
-  file_xhtmlserializer_2_entw3c.xhtml
-  file_xhtmlserializer_2_latin1.xhtml
-  fileutils.js
-  forRemoval.resource
-  forRemoval.resource^headers^
-  formReset.html
-  invalid_accesscontrol.resource
-  invalid_accesscontrol.resource^headers^
-  mutationobserver_dialog.html
-  progressserver.sjs
-  responseIdentical.sjs
-  script-1_bug597345.sjs
-  script-2_bug597345.js
-  script_bug602838.sjs
-  send_gzip_content.sjs
-  somedatas.resource
-  somedatas.resource^headers^
-  variable_style_sheet.sjs
-  viewport_helpers.js
-  w3element_traversal.svg
-  wholeTexty-helper.xml
-
-[test_CrossSiteXHR.html]
-[test_CrossSiteXHR_cache.html]
-[test_CrossSiteXHR_origin.html]
-skip-if = buildapp == 'b2g' || e10s # last test fails to trigger onload on e10s/b2g
-[test_DOMException.html]
-[test_EventSource_redirects.html]
-[test_NodeIterator_basics_filters.xhtml]
-[test_NodeIterator_mutations_1.xhtml]
-[test_NodeIterator_mutations_2.html]
-[test_NodeIterator_mutations_3.html]
-[test_XHR.html]
-[test_XHRDocURI.html]
-[test_XHRResponseURL.html]
-[test_XHRSendData.html]
-skip-if = buildapp == 'b2g' || e10s # b2g(seems to stall) b2g-debug(seems to stall) b2g-desktop(seems to stall)
-[test_XHR_anon.html]
-[test_XHR_header.html]
-[test_XHR_onuploadprogress.html]
-[test_XHR_parameters.html]
-skip-if = buildapp == 'b2g' # b2g(86 total, 4 failing - testing mozAnon - got false, expected true) b2g-debug(86 total, 4 failing - testing mozAnon - got false, expected true) b2g-desktop(86 total, 4 failing - testing mozAnon - got false, expected true)
-[test_XHR_system.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(12 total, 2 failing - .mozSystem == true - got false, expected true + ) b2g-desktop(12 total, 2 failing - .mozSystem == true - got false, expected true + )
-[test_XHR_timeout.html]
-skip-if = buildapp == 'b2g' # b2g(flaky on B2G, bug 960743) b2g-debug(flaky on B2G, bug 960743) b2g-desktop(flaky on B2G, bug 960743)
-[test_XHR_timeout.js]
-[test_base.xhtml]
-[test_blobconstructor.html]
-[test_bug166235.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
-[test_bug199959.html]
-[test_bug218236.html]
-[test_bug218277.html]
-[test_bug238409.html]
-[test_bug254337.html]
-[test_bug270145.xhtml]
-[test_bug276037-1.html]
-[test_bug276037-2.xhtml]
-[test_bug282547.html]
-skip-if = e10s
-[test_bug28293.html]
-[test_bug28293.xhtml]
-[test_bug298064.html]
-[test_bug300992.html]
-[test_bug311681.xml]
-[test_bug313646.html]
-[test_bug320799.html]
-[test_bug322317.html]
-[test_bug326337.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
-[test_bug330925.xhtml]
-[test_bug331959.html]
-[test_bug333198.html]
-[test_bug333673.html]
-[test_bug337631.html]
-[test_bug338541.xhtml]
-[test_bug338583.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(43 total - bug 901343, specialpowers.wrap issue createsystemxhr)
-[test_bug338679.html]
-[test_bug339494.html]
-[test_bug339494.xhtml]
-[test_bug340571.html]
-[test_bug343596.html]
-[test_bug345339.html]
-skip-if = e10s # Bug 1081453 - shutdown leaks with e10s and WebIDL dom::File
-[test_bug346485.html]
-[test_bug352728.html]
-[test_bug352728.xhtml]
-[test_bug353334.html]
-[test_bug355026.html]
-[test_bug357450.html]
-[test_bug357450.js]
-[test_bug357450.xhtml]
-[test_bug357450_svg.xhtml]
-[test_bug357509.html]
-[test_bug358660.html]
-[test_bug362391.xhtml]
-[test_bug364092.xhtml]
-[test_bug364413.xhtml]
-[test_bug366944.html]
-[test_bug366946.html]
-[test_bug367164.html]
-[test_bug368972.html]
-[test_bug371576-2.html]
-[test_bug371576-3.html]
-[test_bug371576-4.html]
-[test_bug371576-5.html]
-[test_bug372086.html]
-[test_bug372964-2.html]
-[test_bug372964.html]
-[test_bug373181.xhtml]
-[test_bug375314.html]
-[test_bug378969.html]
-[test_bug380418.html]
-[test_bug380418.html^headers^]
-[test_bug382113.html]
-[test_bug382871.html]
-[test_bug384003.xhtml]
-[test_bug390219.html]
-[test_bug390735.html]
-[test_bug392318.html]
-[test_bug392511.html]
-[test_bug393968.html]
-[test_bug395915.html]
-[test_bug397234.html]
-[test_bug398243.html]
-[test_bug401662.html]
-[test_bug402150.html]
-[test_bug402150.html^headers^]
-[test_bug403841.html]
-[test_bug403852.html]
-skip-if = e10s
-[test_bug403868.xml]
-[test_bug405182.html]
-[test_bug409380.html]
-[test_bug410229.html]
-[test_bug413974.html]
-[test_bug414190.html]
-[test_bug415860.html]
-[test_bug416317-1.html]
-[test_bug416317-2.html]
-[test_bug416383.html]
-[test_bug417255.html]
-[test_bug417384.html]
-[test_bug418214.html]
-[test_bug419132.html]
-[test_bug419527.xhtml]
-[test_bug420609.xhtml]
-[test_bug420700.html]
-[test_bug421602.html]
-[test_bug422403-1.html]
-skip-if = buildapp == 'b2g' # b2g(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-debug(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-desktop(bug 901343, specialpowers.wrap issue [nsIChannel.open])
-[test_bug422403-2.xhtml]
-skip-if = buildapp == 'b2g'
-[test_bug422537.html]
-[test_bug424212.html]
-[test_bug424359-1.html]
-skip-if = buildapp == 'b2g'
-[test_bug424359-2.html]
-skip-if = buildapp == 'b2g'
-[test_bug425013.html]
-[test_bug426308.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk')
-[test_bug426646.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
-[test_bug428847.html]
-[test_bug429157.html]
-[test_bug431082.html]
-[test_bug431701.html]
-[test_bug431833.html]
-[test_bug433533.html]
-[test_bug433662.html]
-[test_bug435425.html]
-[test_bug438519.html]
-[test_bug444030.xhtml]
-[test_bug444322.html]
-[test_bug444722.html]
-[test_bug448993.html]
-[test_bug450160.html]
-[test_bug451376.html]
-[test_bug453521.html]
-[test_bug453736.html]
-[test_bug454325.html]
-[test_bug454326.html]
-[test_bug455472.html]
-[test_bug455629.html]
-[test_bug456262.html]
-[test_bug457746.html]
-[test_bug459424.html]
-[test_bug461555.html]
-[test_bug461735.html]
-[test_bug465767.html]
-[test_bug466080.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(bug 901356, also fails on android) b2g-debug(bug 901356, also fails on android) b2g-desktop(bug 901356, also fails on android)
-[test_bug466409.html]
-skip-if = buildapp == 'b2g'
-[test_bug466751.xhtml]
-[test_bug469020.html]
-[test_bug469304.html]
-[test_bug473162-1.html]
-[test_bug473162-2.html]
-[test_bug475156.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762 # b2g(36 total - bug 902611) b2g-debug(36 total - bug 902611) b2g-desktop(36 total - bug 902611)
-[test_bug482935.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 855762
-[test_bug484396.html]
-[test_bug493881.html]
-[test_bug493881.js]
-[test_bug498240.html]
-[test_bug498433.html]
-skip-if = buildapp == 'b2g'
-[test_bug498897.html]
-[test_bug499656.html]
-[test_bug499656.xhtml]
-[test_bug500937.html]
-[test_bug503481.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug503481b.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug505783.html]
-skip-if = toolkit == 'android' #TIMED_OUT
-[test_bug51034.html]
-[test_bug513194.html]
-[test_bug5141.html]
-[test_bug514487.html]
-[test_bug515401.html]
-[test_bug518104.html]
-[test_bug527896.html]
-[test_bug540854.html]
-[test_bug541937.html]
-[test_bug544642.html]
-[test_bug545644.html]
-[test_bug545644.xhtml]
-[test_bug548463.html]
-[test_bug553896.xhtml]
-[test_bug557892.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
-[test_bug558726.html]
-[test_bug559526.html]
-[test_bug560780.html]
-[test_bug562137.html]
-[test_bug562169-1.html]
-[test_bug562169-2.html]
-[test_bug562652.html]
-[test_bug564047.html]
-[test_bug564863.xhtml]
-[test_bug567350.html]
-[test_bug578096.html]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s # b2g-debug(debug-only failure; crash) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
-[test_bug585978.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only timeout
-[test_bug587931.html]
-[test_bug588990.html]
-[test_bug590812.html]
-skip-if = toolkit == 'android' #bug 687032
-[test_bug590870.html]
-[test_bug592366.html]
-[test_bug592829.html]
-[test_bug597345.html]
-[test_bug599588.html]
-[test_bug601803.html]
-[test_bug602838.html]
-[test_bug604592.html]
-[test_bug604660.html]
-[test_bug605982.html]
-[test_bug606729.html]
-[test_bug614058.html]
-[test_bug614583.html]
-[test_bug622088.html]
-[test_bug622117.html]
-[test_bug622246.html]
-[test_bug625722.html]
-[test_bug626262.html]
-[test_bug628938.html]
-[test_bug631615.html]
-[test_bug638112.html]
-[test_bug647518.html]
-[test_bug650001.html]
-[test_bug656283.html]
-[test_bug664916.html]
-[test_bug666604.html]
-skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
-[test_bug675121.html]
-skip-if = buildapp == 'b2g' # b2g(bug 901378) b2g-debug(bug 901378) b2g-desktop(bug 901378)
-[test_bug675166.html]
-[test_bug682463.html]
-[test_bug682554.html]
-[test_bug682592.html]
-skip-if = buildapp == 'b2g'
-[test_bug684671.html]
-[test_bug685798.html]
-[test_bug686449.xhtml]
-[test_bug687859.html]
-[test_bug690056.html]
-[test_bug692434.html]
-[test_bug693615.html]
-[test_bug693875.html]
-[test_bug694754.xhtml]
-[test_bug696301-1.html]
-[test_bug696301-2.html]
-[test_bug698381.html]
-[test_bug698384.html]
-[test_bug704063.html]
-[test_bug707142.html]
-[test_bug708620.html]
-[test_bug711047.html]
-[test_bug711180.html]
-[test_bug719533.html]
-[test_bug726364.html]
-[test_bug737087.html]
-[test_bug737565.html]
-[test_bug737612.html]
-[test_bug738108.html]
-[test_bug744830.html]
-[test_bug749367.html]
-[test_bug753278.html]
-[test_bug761120.html]
-[test_bug782342.html]
-[test_bug787778.html]
-[test_bug789856.html]
-[test_bug804395.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 901343, specialpowers.wrap issue createsystemxhr
-[test_bug809003.html]
-[test_bug810494.html]
-[test_bug811701.html]
-[test_bug811701.xhtml]
-[test_bug813919.html]
-[test_bug814576.html]
-[test_bug819051.html]
-[test_bug820909.html]
-[test_bug827160.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #needs plugin support # b2g(needs plugin support) b2g-debug(debug-only failure) b2g-desktop(needs plugin support)
-[test_bug840098.html]
-[test_bug864595.html]
-[test_bug868999.html]
-[test_bug869000.html]
-[test_bug869002.html]
-[test_bug869006.html]
-[test_bug876282.html]
-[test_bug890580.html]
-[test_bug891952.html]
-[test_bug894874.html]
-[test_bug895239.html]
-[test_bug895974.html]
-[test_bug902847.html]
-[test_bug907892.html]
-[test_bug922681.html]
-[test_bug927196.html]
-[test_bug945152.html]
-run-if = os == 'linux'
-[test_bug982153.html]
-[test_bug1008126.html]
-run-if = os == 'linux'
-[test_bug1057176.html]
-[test_caretPositionFromPoint.html]
-[test_classList.html]
-# This test fails on the Mac for some reason
-[test_copyimage.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit != 'gtk2' && toolkit != 'gtk3' && toolkit != 'windows' || e10s #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
-[test_copypaste.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 904183 # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
-[test_copypaste.xhtml]
-skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183) b2g-debug(bug 904183) b2g-desktop(bug 904183)
-[test_createHTMLDocument.html]
-[test_declare_stylesheet_obsolete.html]
-[test_document_constructor.html]
-[test_domparser_null_char.html]
-[test_domparsing.html]
-[test_elementTraversal.html]
-[test_element_closest.html]
-[test_encodeToStringWithMaxLength.html]
-[test_fileapi.html]
-skip-if = e10s
-[test_fileapi_slice.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 775227
-[test_getElementById.html]
-[test_html_colors_quirks.html]
-[test_html_colors_standards.html]
-[test_html_in_xhr.html]
-[test_htmlcopyencoder.html]
-[test_htmlcopyencoder.xhtml]
-[test_ipc_messagemanager_blob.html]
-skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 936226
-[test_meta_viewport0.html]
-[test_meta_viewport1.html]
-[test_meta_viewport2.html]
-[test_meta_viewport3.html]
-[test_meta_viewport4.html]
-[test_meta_viewport5.html]
-[test_meta_viewport6.html]
-[test_mixed_content_blocker.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_bug803225.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mixed_content_blocker_frameNavigation.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
-[test_mozfiledataurl.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
-[test_mozMatchesSelector.html]
-[test_mutationobservers.html]
-skip-if = buildapp == 'b2g' || e10s # b2g(bug 901385, showmodaldialog) b2g-debug(bug 901385, showmodaldialog) b2g-desktop(bug 901385, showmodaldialog)
-[test_nodelist_holes.html]
-[test_object.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support)
-[test_plugin_freezing.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #CLICK_TO_PLAY
-[test_processing_instruction_update_stylesheet.xhtml]
-[test_progress_events_for_gzip_data.html]
-[test_range_bounds.html]
-skip-if = toolkit == 'android' || e10s
-[test_reentrant_flush.html]
-skip-if = toolkit == 'android' || e10s #RANDOM
-[test_sync_xhr_timer.xhtml]
-skip-if = toolkit == 'android' || e10s #RANDOM
-[test_text_wholeText.html]
-[test_textnode_normalize_in_selection.html]
-[test_textnode_split_in_selection.html]
-[test_title.html]
-[test_treewalker_nextsibling.xml]
-[test_viewport_scroll.html]
-[test_viewsource_forbidden_in_object.html]
-[test_w3element_traversal.html]
-[test_w3element_traversal.xhtml]
-[test_w3element_traversal_svg.html]
-[test_websocket.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
-[test_websocket_basic.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
-[test_websocket_hello.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
-[test_x-frame-options.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(observerservice issue) b2g-debug(observerservice issue) b2g-desktop(observerservice issue)
-[test_xbl_userdata.xhtml]
-[test_xhr_abort_after_load.html]
-skip-if = toolkit == 'android'
-[test_xhr_forbidden_headers.html]
-[test_xhr_progressevents.html]
-skip-if = toolkit == 'android'
-[test_xhr_send_readystate.html]
-[test_xhr_withCredentials.html]
-[test_file_from_blob.html]
-[test_warning_for_blocked_cross_site_request.html]
-[test_bug444546.html]
-disabled = Disabled for now. Mochitest isn't reliable enough for these.
-support-files = bug444546.sjs
-[test_bug503473.html]
-disabled = Disabled due to making the harness time out
-support-files = file_bug503473-frame.sjs
-[test_bug1011748.html]
-skip-if = buildapp == 'b2g' || e10s
-support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs
-[test_bug1025933.html]
-[test_element.matches.html]
-[test_user_select.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
-[test_bug1081686.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
diff --git a/content/moz.build b/content/moz.build
index 9c238a6ebec..42f90bccf1d 100644
--- a/content/moz.build
+++ b/content/moz.build
@@ -4,8 +4,4 @@
 # 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 += [
-    'base',
-]
-
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/content/test/reftest/reftest.list b/content/test/reftest/reftest.list
index f292a87f41f..e6ea61ab5b0 100644
--- a/content/test/reftest/reftest.list
+++ b/content/test/reftest/reftest.list
@@ -1,5 +1,3 @@
-include ../../base/test/reftest/reftest.list # bug 920877
-
 == bug453105.html bug453105-ref.html
 == optiontext.html optiontext-ref.html
 == bug456008.xhtml bug456008-ref.html
diff --git a/docshell/base/moz.build b/docshell/base/moz.build
index da64fe8221b..0dad5e242ac 100644
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -73,7 +73,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../shistory/src',
-    '/content/base/src',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
diff --git a/content/base/src/Attr.cpp b/dom/base/Attr.cpp
similarity index 100%
rename from content/base/src/Attr.cpp
rename to dom/base/Attr.cpp
diff --git a/content/base/src/Attr.h b/dom/base/Attr.h
similarity index 100%
rename from content/base/src/Attr.h
rename to dom/base/Attr.h
diff --git a/content/base/src/AutocompleteFieldList.h b/dom/base/AutocompleteFieldList.h
similarity index 100%
rename from content/base/src/AutocompleteFieldList.h
rename to dom/base/AutocompleteFieldList.h
diff --git a/content/base/public/BlobSet.h b/dom/base/BlobSet.h
similarity index 100%
rename from content/base/public/BlobSet.h
rename to dom/base/BlobSet.h
diff --git a/content/base/public/CORSMode.h b/dom/base/CORSMode.h
similarity index 100%
rename from content/base/public/CORSMode.h
rename to dom/base/CORSMode.h
diff --git a/content/base/src/ChildIterator.cpp b/dom/base/ChildIterator.cpp
similarity index 100%
rename from content/base/src/ChildIterator.cpp
rename to dom/base/ChildIterator.cpp
diff --git a/content/base/src/ChildIterator.h b/dom/base/ChildIterator.h
similarity index 100%
rename from content/base/src/ChildIterator.h
rename to dom/base/ChildIterator.h
diff --git a/content/base/src/Comment.cpp b/dom/base/Comment.cpp
similarity index 100%
rename from content/base/src/Comment.cpp
rename to dom/base/Comment.cpp
diff --git a/content/base/src/Comment.h b/dom/base/Comment.h
similarity index 100%
rename from content/base/src/Comment.h
rename to dom/base/Comment.h
diff --git a/content/base/src/DOMImplementation.cpp b/dom/base/DOMImplementation.cpp
similarity index 100%
rename from content/base/src/DOMImplementation.cpp
rename to dom/base/DOMImplementation.cpp
diff --git a/content/base/src/DOMImplementation.h b/dom/base/DOMImplementation.h
similarity index 100%
rename from content/base/src/DOMImplementation.h
rename to dom/base/DOMImplementation.h
diff --git a/content/base/src/DOMMatrix.cpp b/dom/base/DOMMatrix.cpp
similarity index 100%
rename from content/base/src/DOMMatrix.cpp
rename to dom/base/DOMMatrix.cpp
diff --git a/content/base/src/DOMMatrix.h b/dom/base/DOMMatrix.h
similarity index 100%
rename from content/base/src/DOMMatrix.h
rename to dom/base/DOMMatrix.h
diff --git a/content/base/src/DOMParser.cpp b/dom/base/DOMParser.cpp
similarity index 100%
rename from content/base/src/DOMParser.cpp
rename to dom/base/DOMParser.cpp
diff --git a/content/base/src/DOMParser.h b/dom/base/DOMParser.h
similarity index 100%
rename from content/base/src/DOMParser.h
rename to dom/base/DOMParser.h
diff --git a/content/base/src/DOMPoint.cpp b/dom/base/DOMPoint.cpp
similarity index 100%
rename from content/base/src/DOMPoint.cpp
rename to dom/base/DOMPoint.cpp
diff --git a/content/base/src/DOMPoint.h b/dom/base/DOMPoint.h
similarity index 100%
rename from content/base/src/DOMPoint.h
rename to dom/base/DOMPoint.h
diff --git a/content/base/src/DOMQuad.cpp b/dom/base/DOMQuad.cpp
similarity index 100%
rename from content/base/src/DOMQuad.cpp
rename to dom/base/DOMQuad.cpp
diff --git a/content/base/src/DOMQuad.h b/dom/base/DOMQuad.h
similarity index 100%
rename from content/base/src/DOMQuad.h
rename to dom/base/DOMQuad.h
diff --git a/content/base/src/DOMRect.cpp b/dom/base/DOMRect.cpp
similarity index 100%
rename from content/base/src/DOMRect.cpp
rename to dom/base/DOMRect.cpp
diff --git a/content/base/src/DOMRect.h b/dom/base/DOMRect.h
similarity index 100%
rename from content/base/src/DOMRect.h
rename to dom/base/DOMRect.h
diff --git a/content/base/src/DOMStringList.cpp b/dom/base/DOMStringList.cpp
similarity index 100%
rename from content/base/src/DOMStringList.cpp
rename to dom/base/DOMStringList.cpp
diff --git a/content/base/src/DOMStringList.h b/dom/base/DOMStringList.h
similarity index 100%
rename from content/base/src/DOMStringList.h
rename to dom/base/DOMStringList.h
diff --git a/content/base/src/DirectionalityUtils.cpp b/dom/base/DirectionalityUtils.cpp
similarity index 100%
rename from content/base/src/DirectionalityUtils.cpp
rename to dom/base/DirectionalityUtils.cpp
diff --git a/content/base/public/DirectionalityUtils.h b/dom/base/DirectionalityUtils.h
similarity index 100%
rename from content/base/public/DirectionalityUtils.h
rename to dom/base/DirectionalityUtils.h
diff --git a/content/base/src/DocumentFragment.cpp b/dom/base/DocumentFragment.cpp
similarity index 100%
rename from content/base/src/DocumentFragment.cpp
rename to dom/base/DocumentFragment.cpp
diff --git a/content/base/src/DocumentFragment.h b/dom/base/DocumentFragment.h
similarity index 100%
rename from content/base/src/DocumentFragment.h
rename to dom/base/DocumentFragment.h
diff --git a/content/base/src/DocumentType.cpp b/dom/base/DocumentType.cpp
similarity index 100%
rename from content/base/src/DocumentType.cpp
rename to dom/base/DocumentType.cpp
diff --git a/content/base/src/DocumentType.h b/dom/base/DocumentType.h
similarity index 100%
rename from content/base/src/DocumentType.h
rename to dom/base/DocumentType.h
diff --git a/content/base/src/Element.cpp b/dom/base/Element.cpp
similarity index 100%
rename from content/base/src/Element.cpp
rename to dom/base/Element.cpp
diff --git a/content/base/public/Element.h b/dom/base/Element.h
similarity index 100%
rename from content/base/public/Element.h
rename to dom/base/Element.h
diff --git a/content/base/public/ElementInlines.h b/dom/base/ElementInlines.h
similarity index 100%
rename from content/base/public/ElementInlines.h
rename to dom/base/ElementInlines.h
diff --git a/content/base/src/EventSource.cpp b/dom/base/EventSource.cpp
similarity index 100%
rename from content/base/src/EventSource.cpp
rename to dom/base/EventSource.cpp
diff --git a/content/base/src/EventSource.h b/dom/base/EventSource.h
similarity index 100%
rename from content/base/src/EventSource.h
rename to dom/base/EventSource.h
diff --git a/content/base/src/FeedWriterEnabled.h b/dom/base/FeedWriterEnabled.h
similarity index 100%
rename from content/base/src/FeedWriterEnabled.h
rename to dom/base/FeedWriterEnabled.h
diff --git a/content/base/src/File.cpp b/dom/base/File.cpp
similarity index 100%
rename from content/base/src/File.cpp
rename to dom/base/File.cpp
diff --git a/content/base/public/File.h b/dom/base/File.h
similarity index 100%
rename from content/base/public/File.h
rename to dom/base/File.h
diff --git a/content/base/src/FileIOObject.cpp b/dom/base/FileIOObject.cpp
similarity index 100%
rename from content/base/src/FileIOObject.cpp
rename to dom/base/FileIOObject.cpp
diff --git a/content/base/src/FileIOObject.h b/dom/base/FileIOObject.h
similarity index 100%
rename from content/base/src/FileIOObject.h
rename to dom/base/FileIOObject.h
diff --git a/content/base/src/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp
similarity index 100%
rename from content/base/src/FragmentOrElement.cpp
rename to dom/base/FragmentOrElement.cpp
diff --git a/content/base/public/FragmentOrElement.h b/dom/base/FragmentOrElement.h
similarity index 100%
rename from content/base/public/FragmentOrElement.h
rename to dom/base/FragmentOrElement.h
diff --git a/content/base/public/FromParser.h b/dom/base/FromParser.h
similarity index 100%
rename from content/base/public/FromParser.h
rename to dom/base/FromParser.h
diff --git a/content/base/public/HTMLSplitOnSpacesTokenizer.h b/dom/base/HTMLSplitOnSpacesTokenizer.h
similarity index 100%
rename from content/base/public/HTMLSplitOnSpacesTokenizer.h
rename to dom/base/HTMLSplitOnSpacesTokenizer.h
diff --git a/content/base/src/ImportManager.cpp b/dom/base/ImportManager.cpp
similarity index 100%
rename from content/base/src/ImportManager.cpp
rename to dom/base/ImportManager.cpp
diff --git a/content/base/src/ImportManager.h b/dom/base/ImportManager.h
similarity index 100%
rename from content/base/src/ImportManager.h
rename to dom/base/ImportManager.h
diff --git a/content/base/src/Link.cpp b/dom/base/Link.cpp
similarity index 100%
rename from content/base/src/Link.cpp
rename to dom/base/Link.cpp
diff --git a/content/base/src/Link.h b/dom/base/Link.h
similarity index 100%
rename from content/base/src/Link.h
rename to dom/base/Link.h
diff --git a/content/base/src/MultipartFileImpl.cpp b/dom/base/MultipartFileImpl.cpp
similarity index 100%
rename from content/base/src/MultipartFileImpl.cpp
rename to dom/base/MultipartFileImpl.cpp
diff --git a/content/base/src/MultipartFileImpl.h b/dom/base/MultipartFileImpl.h
similarity index 100%
rename from content/base/src/MultipartFileImpl.h
rename to dom/base/MultipartFileImpl.h
diff --git a/content/base/src/NodeIterator.cpp b/dom/base/NodeIterator.cpp
similarity index 100%
rename from content/base/src/NodeIterator.cpp
rename to dom/base/NodeIterator.cpp
diff --git a/content/base/src/NodeIterator.h b/dom/base/NodeIterator.h
similarity index 100%
rename from content/base/src/NodeIterator.h
rename to dom/base/NodeIterator.h
diff --git a/content/base/src/ResponsiveImageSelector.cpp b/dom/base/ResponsiveImageSelector.cpp
similarity index 100%
rename from content/base/src/ResponsiveImageSelector.cpp
rename to dom/base/ResponsiveImageSelector.cpp
diff --git a/content/base/src/ResponsiveImageSelector.h b/dom/base/ResponsiveImageSelector.h
similarity index 100%
rename from content/base/src/ResponsiveImageSelector.h
rename to dom/base/ResponsiveImageSelector.h
diff --git a/content/base/src/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp
similarity index 100%
rename from content/base/src/ShadowRoot.cpp
rename to dom/base/ShadowRoot.cpp
diff --git a/content/base/src/ShadowRoot.h b/dom/base/ShadowRoot.h
similarity index 100%
rename from content/base/src/ShadowRoot.h
rename to dom/base/ShadowRoot.h
diff --git a/content/base/src/StyleSheetList.cpp b/dom/base/StyleSheetList.cpp
similarity index 100%
rename from content/base/src/StyleSheetList.cpp
rename to dom/base/StyleSheetList.cpp
diff --git a/content/base/src/StyleSheetList.h b/dom/base/StyleSheetList.h
similarity index 100%
rename from content/base/src/StyleSheetList.h
rename to dom/base/StyleSheetList.h
diff --git a/content/base/src/Text.cpp b/dom/base/Text.cpp
similarity index 100%
rename from content/base/src/Text.cpp
rename to dom/base/Text.cpp
diff --git a/content/base/src/Text.h b/dom/base/Text.h
similarity index 100%
rename from content/base/src/Text.h
rename to dom/base/Text.h
diff --git a/content/base/src/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp
similarity index 100%
rename from content/base/src/ThirdPartyUtil.cpp
rename to dom/base/ThirdPartyUtil.cpp
diff --git a/content/base/src/ThirdPartyUtil.h b/dom/base/ThirdPartyUtil.h
similarity index 100%
rename from content/base/src/ThirdPartyUtil.h
rename to dom/base/ThirdPartyUtil.h
diff --git a/content/base/src/TreeWalker.cpp b/dom/base/TreeWalker.cpp
similarity index 100%
rename from content/base/src/TreeWalker.cpp
rename to dom/base/TreeWalker.cpp
diff --git a/content/base/src/TreeWalker.h b/dom/base/TreeWalker.h
similarity index 100%
rename from content/base/src/TreeWalker.h
rename to dom/base/TreeWalker.h
diff --git a/content/base/src/WebSocket.cpp b/dom/base/WebSocket.cpp
similarity index 100%
rename from content/base/src/WebSocket.cpp
rename to dom/base/WebSocket.cpp
diff --git a/content/base/src/WebSocket.h b/dom/base/WebSocket.h
similarity index 100%
rename from content/base/src/WebSocket.h
rename to dom/base/WebSocket.h
diff --git a/content/base/src/contentAreaDropListener.js b/dom/base/contentAreaDropListener.js
similarity index 100%
rename from content/base/src/contentAreaDropListener.js
rename to dom/base/contentAreaDropListener.js
diff --git a/content/base/src/contentAreaDropListener.manifest b/dom/base/contentAreaDropListener.manifest
similarity index 100%
rename from content/base/src/contentAreaDropListener.manifest
rename to dom/base/contentAreaDropListener.manifest
diff --git a/content/base/crashtests/1024428-1.html b/dom/base/crashtests/1024428-1.html
similarity index 100%
rename from content/base/crashtests/1024428-1.html
rename to dom/base/crashtests/1024428-1.html
diff --git a/content/base/crashtests/1026714.html b/dom/base/crashtests/1026714.html
similarity index 100%
rename from content/base/crashtests/1026714.html
rename to dom/base/crashtests/1026714.html
diff --git a/content/base/crashtests/1027461-1.html b/dom/base/crashtests/1027461-1.html
similarity index 100%
rename from content/base/crashtests/1027461-1.html
rename to dom/base/crashtests/1027461-1.html
diff --git a/content/base/crashtests/1027461-inner.xul b/dom/base/crashtests/1027461-inner.xul
similarity index 100%
rename from content/base/crashtests/1027461-inner.xul
rename to dom/base/crashtests/1027461-inner.xul
diff --git a/content/base/crashtests/116848-1.html b/dom/base/crashtests/116848-1.html
similarity index 100%
rename from content/base/crashtests/116848-1.html
rename to dom/base/crashtests/116848-1.html
diff --git a/content/base/crashtests/149320-1.html b/dom/base/crashtests/149320-1.html
similarity index 100%
rename from content/base/crashtests/149320-1.html
rename to dom/base/crashtests/149320-1.html
diff --git a/content/base/crashtests/205225-1.html b/dom/base/crashtests/205225-1.html
similarity index 100%
rename from content/base/crashtests/205225-1.html
rename to dom/base/crashtests/205225-1.html
diff --git a/content/base/crashtests/231475-1.html b/dom/base/crashtests/231475-1.html
similarity index 100%
rename from content/base/crashtests/231475-1.html
rename to dom/base/crashtests/231475-1.html
diff --git a/content/base/crashtests/293388-1.html b/dom/base/crashtests/293388-1.html
similarity index 100%
rename from content/base/crashtests/293388-1.html
rename to dom/base/crashtests/293388-1.html
diff --git a/content/base/crashtests/308120-1.xul b/dom/base/crashtests/308120-1.xul
similarity index 100%
rename from content/base/crashtests/308120-1.xul
rename to dom/base/crashtests/308120-1.xul
diff --git a/content/base/crashtests/324871-1.html b/dom/base/crashtests/324871-1.html
similarity index 100%
rename from content/base/crashtests/324871-1.html
rename to dom/base/crashtests/324871-1.html
diff --git a/content/base/crashtests/325730-1.html b/dom/base/crashtests/325730-1.html
similarity index 100%
rename from content/base/crashtests/325730-1.html
rename to dom/base/crashtests/325730-1.html
diff --git a/content/base/crashtests/326618-1.html b/dom/base/crashtests/326618-1.html
similarity index 100%
rename from content/base/crashtests/326618-1.html
rename to dom/base/crashtests/326618-1.html
diff --git a/content/base/crashtests/326646-1.html b/dom/base/crashtests/326646-1.html
similarity index 100%
rename from content/base/crashtests/326646-1.html
rename to dom/base/crashtests/326646-1.html
diff --git a/content/base/crashtests/326778-1.xul b/dom/base/crashtests/326778-1.xul
similarity index 100%
rename from content/base/crashtests/326778-1.xul
rename to dom/base/crashtests/326778-1.xul
diff --git a/content/base/crashtests/326865-1.html b/dom/base/crashtests/326865-1.html
similarity index 100%
rename from content/base/crashtests/326865-1.html
rename to dom/base/crashtests/326865-1.html
diff --git a/content/base/crashtests/327694.html b/dom/base/crashtests/327694.html
similarity index 100%
rename from content/base/crashtests/327694.html
rename to dom/base/crashtests/327694.html
diff --git a/content/base/crashtests/330925-1.xhtml b/dom/base/crashtests/330925-1.xhtml
similarity index 100%
rename from content/base/crashtests/330925-1.xhtml
rename to dom/base/crashtests/330925-1.xhtml
diff --git a/content/base/crashtests/336381-1.xhtml b/dom/base/crashtests/336381-1.xhtml
similarity index 100%
rename from content/base/crashtests/336381-1.xhtml
rename to dom/base/crashtests/336381-1.xhtml
diff --git a/content/base/crashtests/336715-1.xhtml b/dom/base/crashtests/336715-1.xhtml
similarity index 100%
rename from content/base/crashtests/336715-1.xhtml
rename to dom/base/crashtests/336715-1.xhtml
diff --git a/content/base/crashtests/338391-1.xhtml b/dom/base/crashtests/338391-1.xhtml
similarity index 100%
rename from content/base/crashtests/338391-1.xhtml
rename to dom/base/crashtests/338391-1.xhtml
diff --git a/content/base/crashtests/340733-1.html b/dom/base/crashtests/340733-1.html
similarity index 100%
rename from content/base/crashtests/340733-1.html
rename to dom/base/crashtests/340733-1.html
diff --git a/content/base/crashtests/343730-1.xhtml b/dom/base/crashtests/343730-1.xhtml
similarity index 100%
rename from content/base/crashtests/343730-1.xhtml
rename to dom/base/crashtests/343730-1.xhtml
diff --git a/content/base/crashtests/343850-1.xhtml b/dom/base/crashtests/343850-1.xhtml
similarity index 100%
rename from content/base/crashtests/343850-1.xhtml
rename to dom/base/crashtests/343850-1.xhtml
diff --git a/content/base/crashtests/343889-1.html b/dom/base/crashtests/343889-1.html
similarity index 100%
rename from content/base/crashtests/343889-1.html
rename to dom/base/crashtests/343889-1.html
diff --git a/content/base/crashtests/344434-1.xhtml b/dom/base/crashtests/344434-1.xhtml
similarity index 100%
rename from content/base/crashtests/344434-1.xhtml
rename to dom/base/crashtests/344434-1.xhtml
diff --git a/content/base/crashtests/344882-1.html b/dom/base/crashtests/344882-1.html
similarity index 100%
rename from content/base/crashtests/344882-1.html
rename to dom/base/crashtests/344882-1.html
diff --git a/content/base/crashtests/345837-1.xhtml b/dom/base/crashtests/345837-1.xhtml
similarity index 100%
rename from content/base/crashtests/345837-1.xhtml
rename to dom/base/crashtests/345837-1.xhtml
diff --git a/content/base/crashtests/348049-1.xhtml b/dom/base/crashtests/348049-1.xhtml
similarity index 100%
rename from content/base/crashtests/348049-1.xhtml
rename to dom/base/crashtests/348049-1.xhtml
diff --git a/content/base/crashtests/349355-1.html b/dom/base/crashtests/349355-1.html
similarity index 100%
rename from content/base/crashtests/349355-1.html
rename to dom/base/crashtests/349355-1.html
diff --git a/content/base/crashtests/354645-1.xul b/dom/base/crashtests/354645-1.xul
similarity index 100%
rename from content/base/crashtests/354645-1.xul
rename to dom/base/crashtests/354645-1.xul
diff --git a/content/base/crashtests/360599-1.html b/dom/base/crashtests/360599-1.html
similarity index 100%
rename from content/base/crashtests/360599-1.html
rename to dom/base/crashtests/360599-1.html
diff --git a/content/base/crashtests/366200-1.xhtml b/dom/base/crashtests/366200-1.xhtml
similarity index 100%
rename from content/base/crashtests/366200-1.xhtml
rename to dom/base/crashtests/366200-1.xhtml
diff --git a/content/base/crashtests/371466-1.xhtml b/dom/base/crashtests/371466-1.xhtml
similarity index 100%
rename from content/base/crashtests/371466-1.xhtml
rename to dom/base/crashtests/371466-1.xhtml
diff --git a/content/base/crashtests/377360-1.xhtml b/dom/base/crashtests/377360-1.xhtml
similarity index 100%
rename from content/base/crashtests/377360-1.xhtml
rename to dom/base/crashtests/377360-1.xhtml
diff --git a/content/base/crashtests/377960-1.html b/dom/base/crashtests/377960-1.html
similarity index 100%
rename from content/base/crashtests/377960-1.html
rename to dom/base/crashtests/377960-1.html
diff --git a/content/base/crashtests/377960-2.html b/dom/base/crashtests/377960-2.html
similarity index 100%
rename from content/base/crashtests/377960-2.html
rename to dom/base/crashtests/377960-2.html
diff --git a/content/base/crashtests/384663-1-inner.xul b/dom/base/crashtests/384663-1-inner.xul
similarity index 100%
rename from content/base/crashtests/384663-1-inner.xul
rename to dom/base/crashtests/384663-1-inner.xul
diff --git a/content/base/crashtests/384663-1.html b/dom/base/crashtests/384663-1.html
similarity index 100%
rename from content/base/crashtests/384663-1.html
rename to dom/base/crashtests/384663-1.html
diff --git a/content/base/crashtests/386000-1.html b/dom/base/crashtests/386000-1.html
similarity index 100%
rename from content/base/crashtests/386000-1.html
rename to dom/base/crashtests/386000-1.html
diff --git a/content/base/crashtests/386794-1.html b/dom/base/crashtests/386794-1.html
similarity index 100%
rename from content/base/crashtests/386794-1.html
rename to dom/base/crashtests/386794-1.html
diff --git a/content/base/crashtests/387460-1-inner.xhtml b/dom/base/crashtests/387460-1-inner.xhtml
similarity index 100%
rename from content/base/crashtests/387460-1-inner.xhtml
rename to dom/base/crashtests/387460-1-inner.xhtml
diff --git a/content/base/crashtests/387460-1.html b/dom/base/crashtests/387460-1.html
similarity index 100%
rename from content/base/crashtests/387460-1.html
rename to dom/base/crashtests/387460-1.html
diff --git a/content/base/crashtests/395469-1.xhtml b/dom/base/crashtests/395469-1.xhtml
similarity index 100%
rename from content/base/crashtests/395469-1.xhtml
rename to dom/base/crashtests/395469-1.xhtml
diff --git a/content/base/crashtests/395469-2.xhtml b/dom/base/crashtests/395469-2.xhtml
similarity index 100%
rename from content/base/crashtests/395469-2.xhtml
rename to dom/base/crashtests/395469-2.xhtml
diff --git a/content/base/crashtests/398088-1.xul b/dom/base/crashtests/398088-1.xul
similarity index 100%
rename from content/base/crashtests/398088-1.xul
rename to dom/base/crashtests/398088-1.xul
diff --git a/content/base/crashtests/399712-1.html b/dom/base/crashtests/399712-1.html
similarity index 100%
rename from content/base/crashtests/399712-1.html
rename to dom/base/crashtests/399712-1.html
diff --git a/content/base/crashtests/400763-1.html b/dom/base/crashtests/400763-1.html
similarity index 100%
rename from content/base/crashtests/400763-1.html
rename to dom/base/crashtests/400763-1.html
diff --git a/content/base/crashtests/401993-1.html b/dom/base/crashtests/401993-1.html
similarity index 100%
rename from content/base/crashtests/401993-1.html
rename to dom/base/crashtests/401993-1.html
diff --git a/content/base/crashtests/401993-1.xml b/dom/base/crashtests/401993-1.xml
similarity index 100%
rename from content/base/crashtests/401993-1.xml
rename to dom/base/crashtests/401993-1.xml
diff --git a/content/base/crashtests/407818.html b/dom/base/crashtests/407818.html
similarity index 100%
rename from content/base/crashtests/407818.html
rename to dom/base/crashtests/407818.html
diff --git a/content/base/crashtests/410860-1.xml b/dom/base/crashtests/410860-1.xml
similarity index 100%
rename from content/base/crashtests/410860-1.xml
rename to dom/base/crashtests/410860-1.xml
diff --git a/content/base/crashtests/411882-1.xhtml b/dom/base/crashtests/411882-1.xhtml
similarity index 100%
rename from content/base/crashtests/411882-1.xhtml
rename to dom/base/crashtests/411882-1.xhtml
diff --git a/content/base/crashtests/416734-1.html b/dom/base/crashtests/416734-1.html
similarity index 100%
rename from content/base/crashtests/416734-1.html
rename to dom/base/crashtests/416734-1.html
diff --git a/content/base/crashtests/418928-1.html b/dom/base/crashtests/418928-1.html
similarity index 100%
rename from content/base/crashtests/418928-1.html
rename to dom/base/crashtests/418928-1.html
diff --git a/content/base/crashtests/420620-1.html b/dom/base/crashtests/420620-1.html
similarity index 100%
rename from content/base/crashtests/420620-1.html
rename to dom/base/crashtests/420620-1.html
diff --git a/content/base/crashtests/424276-1.html b/dom/base/crashtests/424276-1.html
similarity index 100%
rename from content/base/crashtests/424276-1.html
rename to dom/base/crashtests/424276-1.html
diff --git a/content/base/crashtests/426987-1.html b/dom/base/crashtests/426987-1.html
similarity index 100%
rename from content/base/crashtests/426987-1.html
rename to dom/base/crashtests/426987-1.html
diff --git a/content/base/crashtests/43040-1.html b/dom/base/crashtests/43040-1.html
similarity index 100%
rename from content/base/crashtests/43040-1.html
rename to dom/base/crashtests/43040-1.html
diff --git a/content/base/crashtests/443538-1.svg b/dom/base/crashtests/443538-1.svg
similarity index 100%
rename from content/base/crashtests/443538-1.svg
rename to dom/base/crashtests/443538-1.svg
diff --git a/content/base/crashtests/448615-1.html b/dom/base/crashtests/448615-1.html
similarity index 100%
rename from content/base/crashtests/448615-1.html
rename to dom/base/crashtests/448615-1.html
diff --git a/content/base/crashtests/450383-1.html b/dom/base/crashtests/450383-1.html
similarity index 100%
rename from content/base/crashtests/450383-1.html
rename to dom/base/crashtests/450383-1.html
diff --git a/content/base/crashtests/450385-1.html b/dom/base/crashtests/450385-1.html
similarity index 100%
rename from content/base/crashtests/450385-1.html
rename to dom/base/crashtests/450385-1.html
diff --git a/content/base/crashtests/458637-1-inner.xhtml b/dom/base/crashtests/458637-1-inner.xhtml
similarity index 100%
rename from content/base/crashtests/458637-1-inner.xhtml
rename to dom/base/crashtests/458637-1-inner.xhtml
diff --git a/content/base/crashtests/458637-1.html b/dom/base/crashtests/458637-1.html
similarity index 100%
rename from content/base/crashtests/458637-1.html
rename to dom/base/crashtests/458637-1.html
diff --git a/content/base/crashtests/467392.html b/dom/base/crashtests/467392.html
similarity index 100%
rename from content/base/crashtests/467392.html
rename to dom/base/crashtests/467392.html
diff --git a/content/base/crashtests/472593-1.html b/dom/base/crashtests/472593-1.html
similarity index 100%
rename from content/base/crashtests/472593-1.html
rename to dom/base/crashtests/472593-1.html
diff --git a/content/base/crashtests/474041-1.svg b/dom/base/crashtests/474041-1.svg
similarity index 100%
rename from content/base/crashtests/474041-1.svg
rename to dom/base/crashtests/474041-1.svg
diff --git a/content/base/crashtests/483818-1.html b/dom/base/crashtests/483818-1.html
similarity index 100%
rename from content/base/crashtests/483818-1.html
rename to dom/base/crashtests/483818-1.html
diff --git a/content/base/crashtests/490760-1.xhtml b/dom/base/crashtests/490760-1.xhtml
similarity index 100%
rename from content/base/crashtests/490760-1.xhtml
rename to dom/base/crashtests/490760-1.xhtml
diff --git a/content/base/crashtests/493281-1.html b/dom/base/crashtests/493281-1.html
similarity index 100%
rename from content/base/crashtests/493281-1.html
rename to dom/base/crashtests/493281-1.html
diff --git a/content/base/crashtests/493281-2.html b/dom/base/crashtests/493281-2.html
similarity index 100%
rename from content/base/crashtests/493281-2.html
rename to dom/base/crashtests/493281-2.html
diff --git a/content/base/crashtests/494810-1.html b/dom/base/crashtests/494810-1.html
similarity index 100%
rename from content/base/crashtests/494810-1.html
rename to dom/base/crashtests/494810-1.html
diff --git a/content/base/crashtests/509536-1.html b/dom/base/crashtests/509536-1.html
similarity index 100%
rename from content/base/crashtests/509536-1.html
rename to dom/base/crashtests/509536-1.html
diff --git a/content/base/crashtests/522516-1.html b/dom/base/crashtests/522516-1.html
similarity index 100%
rename from content/base/crashtests/522516-1.html
rename to dom/base/crashtests/522516-1.html
diff --git a/content/base/crashtests/529670.html b/dom/base/crashtests/529670.html
similarity index 100%
rename from content/base/crashtests/529670.html
rename to dom/base/crashtests/529670.html
diff --git a/content/base/crashtests/535926-1.html b/dom/base/crashtests/535926-1.html
similarity index 100%
rename from content/base/crashtests/535926-1.html
rename to dom/base/crashtests/535926-1.html
diff --git a/content/base/crashtests/543645.html b/dom/base/crashtests/543645.html
similarity index 100%
rename from content/base/crashtests/543645.html
rename to dom/base/crashtests/543645.html
diff --git a/content/base/crashtests/551631-1.html b/dom/base/crashtests/551631-1.html
similarity index 100%
rename from content/base/crashtests/551631-1.html
rename to dom/base/crashtests/551631-1.html
diff --git a/content/base/crashtests/552651.html b/dom/base/crashtests/552651.html
similarity index 100%
rename from content/base/crashtests/552651.html
rename to dom/base/crashtests/552651.html
diff --git a/content/base/crashtests/552651.xml b/dom/base/crashtests/552651.xml
similarity index 100%
rename from content/base/crashtests/552651.xml
rename to dom/base/crashtests/552651.xml
diff --git a/content/base/crashtests/554230-1.xhtml b/dom/base/crashtests/554230-1.xhtml
similarity index 100%
rename from content/base/crashtests/554230-1.xhtml
rename to dom/base/crashtests/554230-1.xhtml
diff --git a/content/base/crashtests/558973.html b/dom/base/crashtests/558973.html
similarity index 100%
rename from content/base/crashtests/558973.html
rename to dom/base/crashtests/558973.html
diff --git a/content/base/crashtests/561981-1-iframe.xhtml b/dom/base/crashtests/561981-1-iframe.xhtml
similarity index 100%
rename from content/base/crashtests/561981-1-iframe.xhtml
rename to dom/base/crashtests/561981-1-iframe.xhtml
diff --git a/content/base/crashtests/561981-1.html b/dom/base/crashtests/561981-1.html
similarity index 100%
rename from content/base/crashtests/561981-1.html
rename to dom/base/crashtests/561981-1.html
diff --git a/content/base/crashtests/561981-2-iframe.xhtml b/dom/base/crashtests/561981-2-iframe.xhtml
similarity index 100%
rename from content/base/crashtests/561981-2-iframe.xhtml
rename to dom/base/crashtests/561981-2-iframe.xhtml
diff --git a/content/base/crashtests/561981-2.html b/dom/base/crashtests/561981-2.html
similarity index 100%
rename from content/base/crashtests/561981-2.html
rename to dom/base/crashtests/561981-2.html
diff --git a/content/base/crashtests/564079-1.html b/dom/base/crashtests/564079-1.html
similarity index 100%
rename from content/base/crashtests/564079-1.html
rename to dom/base/crashtests/564079-1.html
diff --git a/content/base/crashtests/564114.html b/dom/base/crashtests/564114.html
similarity index 100%
rename from content/base/crashtests/564114.html
rename to dom/base/crashtests/564114.html
diff --git a/content/base/crashtests/565125-1.html b/dom/base/crashtests/565125-1.html
similarity index 100%
rename from content/base/crashtests/565125-1.html
rename to dom/base/crashtests/565125-1.html
diff --git a/content/base/crashtests/575462.svg b/dom/base/crashtests/575462.svg
similarity index 100%
rename from content/base/crashtests/575462.svg
rename to dom/base/crashtests/575462.svg
diff --git a/content/base/crashtests/582601.html b/dom/base/crashtests/582601.html
similarity index 100%
rename from content/base/crashtests/582601.html
rename to dom/base/crashtests/582601.html
diff --git a/content/base/crashtests/590395-1.html b/dom/base/crashtests/590395-1.html
similarity index 100%
rename from content/base/crashtests/590395-1.html
rename to dom/base/crashtests/590395-1.html
diff --git a/content/base/crashtests/593302-1.html b/dom/base/crashtests/593302-1.html
similarity index 100%
rename from content/base/crashtests/593302-1.html
rename to dom/base/crashtests/593302-1.html
diff --git a/content/base/crashtests/593302-2.html b/dom/base/crashtests/593302-2.html
similarity index 100%
rename from content/base/crashtests/593302-2.html
rename to dom/base/crashtests/593302-2.html
diff --git a/content/base/crashtests/595606-1.html b/dom/base/crashtests/595606-1.html
similarity index 100%
rename from content/base/crashtests/595606-1.html
rename to dom/base/crashtests/595606-1.html
diff --git a/content/base/crashtests/595606-2.html b/dom/base/crashtests/595606-2.html
similarity index 100%
rename from content/base/crashtests/595606-2.html
rename to dom/base/crashtests/595606-2.html
diff --git a/content/base/crashtests/604262-1.html b/dom/base/crashtests/604262-1.html
similarity index 100%
rename from content/base/crashtests/604262-1.html
rename to dom/base/crashtests/604262-1.html
diff --git a/content/base/crashtests/605672-1.svg b/dom/base/crashtests/605672-1.svg
similarity index 100%
rename from content/base/crashtests/605672-1.svg
rename to dom/base/crashtests/605672-1.svg
diff --git a/content/base/crashtests/606729-1.html b/dom/base/crashtests/606729-1.html
similarity index 100%
rename from content/base/crashtests/606729-1.html
rename to dom/base/crashtests/606729-1.html
diff --git a/content/base/crashtests/610571-1.html b/dom/base/crashtests/610571-1.html
similarity index 100%
rename from content/base/crashtests/610571-1.html
rename to dom/base/crashtests/610571-1.html
diff --git a/content/base/crashtests/628599-1.html b/dom/base/crashtests/628599-1.html
similarity index 100%
rename from content/base/crashtests/628599-1.html
rename to dom/base/crashtests/628599-1.html
diff --git a/content/base/crashtests/637214-1.svg b/dom/base/crashtests/637214-1.svg
similarity index 100%
rename from content/base/crashtests/637214-1.svg
rename to dom/base/crashtests/637214-1.svg
diff --git a/content/base/crashtests/637214-2.svg b/dom/base/crashtests/637214-2.svg
similarity index 100%
rename from content/base/crashtests/637214-2.svg
rename to dom/base/crashtests/637214-2.svg
diff --git a/content/base/crashtests/642022-1.html b/dom/base/crashtests/642022-1.html
similarity index 100%
rename from content/base/crashtests/642022-1.html
rename to dom/base/crashtests/642022-1.html
diff --git a/content/base/crashtests/646184.html b/dom/base/crashtests/646184.html
similarity index 100%
rename from content/base/crashtests/646184.html
rename to dom/base/crashtests/646184.html
diff --git a/content/base/crashtests/658845-1.svg b/dom/base/crashtests/658845-1.svg
similarity index 100%
rename from content/base/crashtests/658845-1.svg
rename to dom/base/crashtests/658845-1.svg
diff --git a/content/base/crashtests/667336-1.html b/dom/base/crashtests/667336-1.html
similarity index 100%
rename from content/base/crashtests/667336-1.html
rename to dom/base/crashtests/667336-1.html
diff --git a/content/base/crashtests/679459.html b/dom/base/crashtests/679459.html
similarity index 100%
rename from content/base/crashtests/679459.html
rename to dom/base/crashtests/679459.html
diff --git a/content/base/crashtests/679689-1.html b/dom/base/crashtests/679689-1.html
similarity index 100%
rename from content/base/crashtests/679689-1.html
rename to dom/base/crashtests/679689-1.html
diff --git a/content/base/crashtests/682463.html b/dom/base/crashtests/682463.html
similarity index 100%
rename from content/base/crashtests/682463.html
rename to dom/base/crashtests/682463.html
diff --git a/content/base/crashtests/693212.xhtml b/dom/base/crashtests/693212.xhtml
similarity index 100%
rename from content/base/crashtests/693212.xhtml
rename to dom/base/crashtests/693212.xhtml
diff --git a/content/base/crashtests/698974-1.html b/dom/base/crashtests/698974-1.html
similarity index 100%
rename from content/base/crashtests/698974-1.html
rename to dom/base/crashtests/698974-1.html
diff --git a/content/base/crashtests/700090-1.html b/dom/base/crashtests/700090-1.html
similarity index 100%
rename from content/base/crashtests/700090-1.html
rename to dom/base/crashtests/700090-1.html
diff --git a/content/base/crashtests/700090-2.html b/dom/base/crashtests/700090-2.html
similarity index 100%
rename from content/base/crashtests/700090-2.html
rename to dom/base/crashtests/700090-2.html
diff --git a/content/base/crashtests/700512-worker.js b/dom/base/crashtests/700512-worker.js
similarity index 100%
rename from content/base/crashtests/700512-worker.js
rename to dom/base/crashtests/700512-worker.js
diff --git a/content/base/crashtests/700512.html b/dom/base/crashtests/700512.html
similarity index 100%
rename from content/base/crashtests/700512.html
rename to dom/base/crashtests/700512.html
diff --git a/content/base/crashtests/709384.html b/dom/base/crashtests/709384.html
similarity index 100%
rename from content/base/crashtests/709384.html
rename to dom/base/crashtests/709384.html
diff --git a/content/base/crashtests/709954.html b/dom/base/crashtests/709954.html
similarity index 100%
rename from content/base/crashtests/709954.html
rename to dom/base/crashtests/709954.html
diff --git a/content/base/crashtests/713417-2.html b/dom/base/crashtests/713417-2.html
similarity index 100%
rename from content/base/crashtests/713417-2.html
rename to dom/base/crashtests/713417-2.html
diff --git a/content/base/crashtests/713417.html b/dom/base/crashtests/713417.html
similarity index 100%
rename from content/base/crashtests/713417.html
rename to dom/base/crashtests/713417.html
diff --git a/content/base/crashtests/715056.html b/dom/base/crashtests/715056.html
similarity index 100%
rename from content/base/crashtests/715056.html
rename to dom/base/crashtests/715056.html
diff --git a/content/base/crashtests/741163-1.html b/dom/base/crashtests/741163-1.html
similarity index 100%
rename from content/base/crashtests/741163-1.html
rename to dom/base/crashtests/741163-1.html
diff --git a/content/base/crashtests/752226-1.html b/dom/base/crashtests/752226-1.html
similarity index 100%
rename from content/base/crashtests/752226-1.html
rename to dom/base/crashtests/752226-1.html
diff --git a/content/base/crashtests/752226-2.html b/dom/base/crashtests/752226-2.html
similarity index 100%
rename from content/base/crashtests/752226-2.html
rename to dom/base/crashtests/752226-2.html
diff --git a/content/base/crashtests/766426.html b/dom/base/crashtests/766426.html
similarity index 100%
rename from content/base/crashtests/766426.html
rename to dom/base/crashtests/766426.html
diff --git a/content/base/crashtests/771639.html b/dom/base/crashtests/771639.html
similarity index 100%
rename from content/base/crashtests/771639.html
rename to dom/base/crashtests/771639.html
diff --git a/content/base/crashtests/786854.html b/dom/base/crashtests/786854.html
similarity index 100%
rename from content/base/crashtests/786854.html
rename to dom/base/crashtests/786854.html
diff --git a/content/base/crashtests/815043.html b/dom/base/crashtests/815043.html
similarity index 100%
rename from content/base/crashtests/815043.html
rename to dom/base/crashtests/815043.html
diff --git a/content/base/crashtests/815276.html b/dom/base/crashtests/815276.html
similarity index 100%
rename from content/base/crashtests/815276.html
rename to dom/base/crashtests/815276.html
diff --git a/content/base/crashtests/815477.html b/dom/base/crashtests/815477.html
similarity index 100%
rename from content/base/crashtests/815477.html
rename to dom/base/crashtests/815477.html
diff --git a/content/base/crashtests/815500.html b/dom/base/crashtests/815500.html
similarity index 100%
rename from content/base/crashtests/815500.html
rename to dom/base/crashtests/815500.html
diff --git a/content/base/crashtests/816253.html b/dom/base/crashtests/816253.html
similarity index 100%
rename from content/base/crashtests/816253.html
rename to dom/base/crashtests/816253.html
diff --git a/content/base/crashtests/819014.html b/dom/base/crashtests/819014.html
similarity index 100%
rename from content/base/crashtests/819014.html
rename to dom/base/crashtests/819014.html
diff --git a/content/base/crashtests/822691.html b/dom/base/crashtests/822691.html
similarity index 100%
rename from content/base/crashtests/822691.html
rename to dom/base/crashtests/822691.html
diff --git a/content/base/crashtests/822723.html b/dom/base/crashtests/822723.html
similarity index 100%
rename from content/base/crashtests/822723.html
rename to dom/base/crashtests/822723.html
diff --git a/content/base/crashtests/824719.html b/dom/base/crashtests/824719.html
similarity index 100%
rename from content/base/crashtests/824719.html
rename to dom/base/crashtests/824719.html
diff --git a/content/base/crashtests/827190.html b/dom/base/crashtests/827190.html
similarity index 100%
rename from content/base/crashtests/827190.html
rename to dom/base/crashtests/827190.html
diff --git a/content/base/crashtests/828054.html b/dom/base/crashtests/828054.html
similarity index 100%
rename from content/base/crashtests/828054.html
rename to dom/base/crashtests/828054.html
diff --git a/content/base/crashtests/828903-iframe.html b/dom/base/crashtests/828903-iframe.html
similarity index 100%
rename from content/base/crashtests/828903-iframe.html
rename to dom/base/crashtests/828903-iframe.html
diff --git a/content/base/crashtests/828903.html b/dom/base/crashtests/828903.html
similarity index 100%
rename from content/base/crashtests/828903.html
rename to dom/base/crashtests/828903.html
diff --git a/content/base/crashtests/829428.html b/dom/base/crashtests/829428.html
similarity index 100%
rename from content/base/crashtests/829428.html
rename to dom/base/crashtests/829428.html
diff --git a/content/base/crashtests/830098.html b/dom/base/crashtests/830098.html
similarity index 100%
rename from content/base/crashtests/830098.html
rename to dom/base/crashtests/830098.html
diff --git a/content/base/crashtests/831287.html b/dom/base/crashtests/831287.html
similarity index 100%
rename from content/base/crashtests/831287.html
rename to dom/base/crashtests/831287.html
diff --git a/content/base/crashtests/832644.html b/dom/base/crashtests/832644.html
similarity index 100%
rename from content/base/crashtests/832644.html
rename to dom/base/crashtests/832644.html
diff --git a/content/base/crashtests/836890.html b/dom/base/crashtests/836890.html
similarity index 100%
rename from content/base/crashtests/836890.html
rename to dom/base/crashtests/836890.html
diff --git a/content/base/crashtests/838489-1.html b/dom/base/crashtests/838489-1.html
similarity index 100%
rename from content/base/crashtests/838489-1.html
rename to dom/base/crashtests/838489-1.html
diff --git a/content/base/crashtests/838489-2.html b/dom/base/crashtests/838489-2.html
similarity index 100%
rename from content/base/crashtests/838489-2.html
rename to dom/base/crashtests/838489-2.html
diff --git a/content/base/crashtests/841205.html b/dom/base/crashtests/841205.html
similarity index 100%
rename from content/base/crashtests/841205.html
rename to dom/base/crashtests/841205.html
diff --git a/content/base/crashtests/844404.html b/dom/base/crashtests/844404.html
similarity index 100%
rename from content/base/crashtests/844404.html
rename to dom/base/crashtests/844404.html
diff --git a/content/base/crashtests/845093-1.html b/dom/base/crashtests/845093-1.html
similarity index 100%
rename from content/base/crashtests/845093-1.html
rename to dom/base/crashtests/845093-1.html
diff --git a/content/base/crashtests/845093-2.html b/dom/base/crashtests/845093-2.html
similarity index 100%
rename from content/base/crashtests/845093-2.html
rename to dom/base/crashtests/845093-2.html
diff --git a/content/base/crashtests/847127.html b/dom/base/crashtests/847127.html
similarity index 100%
rename from content/base/crashtests/847127.html
rename to dom/base/crashtests/847127.html
diff --git a/content/base/crashtests/849601.html b/dom/base/crashtests/849601.html
similarity index 100%
rename from content/base/crashtests/849601.html
rename to dom/base/crashtests/849601.html
diff --git a/content/base/crashtests/849727.html b/dom/base/crashtests/849727.html
similarity index 100%
rename from content/base/crashtests/849727.html
rename to dom/base/crashtests/849727.html
diff --git a/content/base/crashtests/849732.html b/dom/base/crashtests/849732.html
similarity index 100%
rename from content/base/crashtests/849732.html
rename to dom/base/crashtests/849732.html
diff --git a/content/base/crashtests/851353-1.html b/dom/base/crashtests/851353-1.html
similarity index 100%
rename from content/base/crashtests/851353-1.html
rename to dom/base/crashtests/851353-1.html
diff --git a/content/base/crashtests/863950.html b/dom/base/crashtests/863950.html
similarity index 100%
rename from content/base/crashtests/863950.html
rename to dom/base/crashtests/863950.html
diff --git a/content/base/crashtests/864448.html b/dom/base/crashtests/864448.html
similarity index 100%
rename from content/base/crashtests/864448.html
rename to dom/base/crashtests/864448.html
diff --git a/content/base/crashtests/930250.html b/dom/base/crashtests/930250.html
similarity index 100%
rename from content/base/crashtests/930250.html
rename to dom/base/crashtests/930250.html
diff --git a/content/base/crashtests/942979.html b/dom/base/crashtests/942979.html
similarity index 100%
rename from content/base/crashtests/942979.html
rename to dom/base/crashtests/942979.html
diff --git a/content/base/crashtests/978646.html b/dom/base/crashtests/978646.html
similarity index 100%
rename from content/base/crashtests/978646.html
rename to dom/base/crashtests/978646.html
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 90a177704b9..69b47c61197 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -1,47 +1,202 @@
 load 90613-1.html
+load 116848-1.html
+load 149320-1.html
+load 205225-1.html
+load 231475-1.html
 load 244933-1.html
 load 275912-1.html
+load 293388-1.html
+load 308120-1.xul
+load 324871-1.html
+load 325730-1.html
+load 326618-1.html
+load 326646-1.html
+load 326778-1.xul
+load 326865-1.html
 load 327571-1.html
+load 327694.html
 load 327695-1.html
 load 329481-1.xhtml
+load 330925-1.xhtml
+load 336381-1.xhtml
+load 336715-1.xhtml
+load 338391-1.xhtml
 load 338674-1.xhtml
+load 340733-1.html
+load 343730-1.xhtml
+load 343850-1.xhtml
+load 343889-1.html
+load 344434-1.xhtml
+load 344882-1.html
+load 345837-1.xhtml
 load 346381-1.html
+load 348049-1.xhtml
+load 349355-1.html
+load 354645-1.xul
 load 359432-1.xhtml
+load 360599-1.html
+load 366200-1.xhtml
 load 369219-1.xhtml
 load 369413-1.html
 load 371124-1.html
 load 371124-2.html
+load 371466-1.xhtml
 load 372554-1.html
 load 375399-1.html
+load 377360-1.xhtml
+load 377960-1.html
+load 377960-2.html
+load 384663-1.html
+load 386000-1.html
+load 386794-1.html
+load 387460-1.html
+load 395469-1.xhtml
+load 395469-2.xhtml
+load 398088-1.xul
+skip load 399712-1.html # sporadically times out (bug 473680)
+load 400763-1.html
+load 401993-1.html
 load 404869-1.xul
+load 407818.html
+load 410860-1.xml
+load 411882-1.xhtml
+load 416734-1.html
 load 417852-1.html
-load 462947.html
+load 418928-1.html
+load 420620-1.html
+load 424276-1.html
+load 426987-1.html
+load 43040-1.html
 load 439206-1.html
+load 443538-1.svg
+load 448615-1.html
+load 450383-1.html
+load 450385-1.html
+skip load 458637-1.html # sporadically times out (bug 473680)
+load 462947.html
+load 467392.html
+load 472593-1.html
 load 473284.xul
+load 474041-1.svg
 load 476526.html
+load 483818-1.html
+load 490760-1.xhtml
+load 493281-1.html
+load 493281-2.html
+load 494810-1.html
 load 499006-1.html
 load 499006-2.html
 load 502617.html
 load 504224.html
-load 603531.html
+load 509536-1.html
+load 522516-1.html
+load 529670.html
+load 535926-1.html
+load 543645.html
+load 551631-1.html
+load 552651.html
+load 554230-1.xhtml
+load 558973.html
+load 561981-1.html
+load 561981-2.html
+load 564079-1.html 
+load 564114.html
+load 565125-1.html
+load 575462.svg
+load 582601.html
+load 590395-1.html
+load 593302-1.html
+load 593302-2.html
+load 595606-1.html
+load 595606-2.html
 load 601247.html
+load 603531.html
+load 604262-1.html
+load 605672-1.svg
+load 606729-1.html
 load 609560-1.xhtml
+load 610571-1.html
 load 612018-1.html
+load 628599-1.html
 load 637116.html
+load 637214-1.svg
+load 637214-2.svg
+load 642022-1.html
+load 646184.html
+load 658845-1.svg
 load 666869.html
+load 667336-1.html
 load 675621-1.html
 load 677194.html
-load 693894.html
+load 679459.html
+load 679689-1.html
+load 682463.html
+load 693212.xhtml
 load 693811-1.html
 load 693811-2.html
 load 693811-3.html
+load 693894.html
 load 695867.html
 load 697643.html
+load 698974-1.html
+load 700090-1.html
+load 700090-2.html
+load 700512.html
 load 706283-1.html
 load 708405-1.html
+load 709384.html
+load 709954.html
+load 713417-2.html
+load 713417.html
+load 715056.html
+load 741163-1.html
 load 745495.html
+load 752226-1.html
+load 752226-2.html
+load 766426.html
+load 771639.html
+load 786854.html
+load 815043.html
+load 815276.html
+load 815477.html
+load 815500.html
+load 816253.html
+load 819014.html
+load 822691.html
+load 822723.html
+load 824719.html
+load 827190.html
+load 828054.html
+load 828903.html
+load 829428.html
+load 830098.html
+load 831287.html
+load 832644.html
+load 836890.html
+skip-if(browserIsRemote) load 838489-1.html # <keygen> broken in e10s (bug 582297)
+skip-if(browserIsRemote) load 838489-2.html # <keygen> broken in e10s (bug 582297)
+load 841205.html
+load 844404.html
+load 845093-1.html
+load 845093-2.html
+load 847127.html
+load 849601.html
+load 849727.html
+load 849732.html
+skip-if(Android) load 851353-1.html
+load 852381.html
+load 863950.html
+load 864448.html
 load 886213.html
 load 898906.html
-load 852381.html
+load 930250.html
+load 942979.html
 load 973401.html
+load 978646.html
+pref(dom.webcomponents.enabled,true) load 1027461-1.html
+pref(dom.webcomponents.enabled,true) load 1024428-1.html
+load 1026714.html
 pref(dom.webcomponents.enabled,true) load 1029710.html
+HTTP(..) load xhr_abortinprogress.html
+load xhr_empty_datauri.html
+load xhr_html_nullresponse.html
diff --git a/content/base/crashtests/xhr_abortinprogress.html b/dom/base/crashtests/xhr_abortinprogress.html
similarity index 100%
rename from content/base/crashtests/xhr_abortinprogress.html
rename to dom/base/crashtests/xhr_abortinprogress.html
diff --git a/content/base/crashtests/xhr_empty_datauri.html b/dom/base/crashtests/xhr_empty_datauri.html
similarity index 100%
rename from content/base/crashtests/xhr_empty_datauri.html
rename to dom/base/crashtests/xhr_empty_datauri.html
diff --git a/content/base/crashtests/xhr_html_nullresponse.html b/dom/base/crashtests/xhr_html_nullresponse.html
similarity index 100%
rename from content/base/crashtests/xhr_html_nullresponse.html
rename to dom/base/crashtests/xhr_html_nullresponse.html
diff --git a/content/base/src/messageWakeupService.js b/dom/base/messageWakeupService.js
similarity index 100%
rename from content/base/src/messageWakeupService.js
rename to dom/base/messageWakeupService.js
diff --git a/content/base/src/messageWakeupService.manifest b/dom/base/messageWakeupService.manifest
similarity index 100%
rename from content/base/src/messageWakeupService.manifest
rename to dom/base/messageWakeupService.manifest
diff --git a/dom/base/moz.build b/dom/base/moz.build
index f0f0b07ffce..2a9e98ae7ed 100644
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -4,55 +4,173 @@
 # 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/.
 
+TEST_DIRS += ['test']
+
 XPIDL_SOURCES += [
     'nsIConsoleAPIStorage.idl',
+    'nsIContentPolicy.idl',
+    'nsIContentSecurityPolicy.idl',
+    'nsIDocumentEncoder.idl',
+    'nsIDOMDataChannel.idl',
     'nsIDOMDOMCursor.idl',
     'nsIDOMDOMRequest.idl',
+    'nsIDOMFile.idl',
+    'nsIDOMFileList.idl',
+    'nsIDOMFileReader.idl',
+    'nsIDOMFormData.idl',
+    'nsIDOMParser.idl',
+    'nsIDOMSerializer.idl',
+    'nsIDroppedLinkHandler.idl',
     'nsIEntropyCollector.idl',
+    'nsIFrameLoader.idl',
+    'nsIImageLoadingContent.idl',
+    'nsIMessageManager.idl',
+    'nsIObjectLoadingContent.idl',
     'nsIScriptChannel.idl',
+    'nsIScriptLoaderObserver.idl',
+    'nsISelection.idl',
+    'nsISelectionController.idl',
+    'nsISelectionDisplay.idl',
+    'nsISelectionListener.idl',
+    'nsISelectionPrivate.idl',
     'nsISiteSpecificUserAgent.idl',
     'nsISlowScriptDebug.idl',
+    'nsIXMLHttpRequest.idl',
 ]
 
 XPIDL_MODULE = 'dom'
 
 EXPORTS += [
+    'AutocompleteFieldList.h',
     'Crypto.h',
+    'HTMLSplitOnSpacesTokenizer.h',
+    'mozAutoDocUpdate.h',
+    'mozFlushType.h',
+    'nsAtomListUtils.h',
+    'nsAttrAndChildArray.h',
+    'nsAttrName.h',
+    'nsAttrValue.h',
+    'nsAttrValueInlines.h',
+    'nsCaseTreatment.h',
+    'nsContentCID.h',
+    'nsContentCreatorFunctions.h',
+    'nsContentList.h',
+    'nsContentListDeclarations.h',
     'nsContentPermissionHelper.h',
+    'nsContentPolicyUtils.h',
+    'nsContentSink.h',
+    'nsContentTypeParser.h',
+    'nsContentUtils.h',
+    'nsCopySupport.h',
+    'nsCrossSiteListenerProxy.h',
+    'nsDeprecatedOperationList.h',
+    'nsDocElementCreatedNotificationRunner.h',
+    'nsDOMAttributeMap.h',
     'nsDOMCID.h',
     'nsDOMClassInfoClasses.h',
     'nsDOMClassInfoID.h',
     'nsDOMJSUtils.h',
     'nsDOMNavigationTiming.h',
     'nsDOMString.h',
+    'nsElementFrameLoaderOwner.h',
     'nsFocusManager.h',
+    'nsFrameMessageManager.h',
+    'nsGenericDOMDataNode.h',
+    'nsGkAtomList.h',
+    'nsGkAtoms.h',
+    'nsHostObjectProtocolHandler.h',
+    'nsIAttribute.h',
+    'nsIContent.h',
+    'nsIContentInlines.h',
+    'nsIContentIterator.h',
+    'nsIContentSerializer.h',
+    'nsIDocument.h',
+    'nsIDocumentInlines.h',
+    'nsIDocumentObserver.h',
     'nsIDOMClassInfo.h',
     'nsIDOMScriptObjectFactory.h',
     'nsIGlobalObject.h',
+    'nsImageLoadingContent.h',
+    'nsIMutationObserver.h',
+    'nsINode.h',
+    'nsINodeList.h',
     'nsIScriptContext.h',
+    'nsIScriptElement.h',
     'nsIScriptGlobalObject.h',
     'nsIScriptNameSpaceManager.h',
     'nsIScriptObjectPrincipal.h',
     'nsIScriptTimeoutHandler.h',
+    'nsIStyleSheetLinkingElement.h',
     'nsJSEnvironment.h',
     'nsJSUtils.h',
+    'nsLineBreaker.h',
+    'nsMappedAttributeElement.h',
+    'nsNameSpaceManager.h',
+    'nsNodeInfoManager.h',
+    'nsNodeUtils.h',
     'nsPerformance.h',
     'nsPIDOMWindow.h',
     'nsPIWindowRoot.h',
+    'nsPropertyTable.h',
+    'nsRange.h',
+    'nsReferencedElement.h',
+    'nsSandboxFlags.h',
+    'nsScriptLoader.h',
     'nsStructuredCloneContainer.h',
+    'nsStubDocumentObserver.h',
+    'nsStubMutationObserver.h',
+    'nsStyledElement.h',
+    'nsTextFragment.h',
+    'nsTraversal.h',
+    'nsTreeSanitizer.h',
+    'nsViewportInfo.h',
     'nsWindowMemoryReporter.h',
     'nsWrapperCache.h',
     'nsWrapperCacheInlines.h',
+    'nsXMLNameSpaceMap.h',
+]
+
+if CONFIG['MOZ_WEBRTC']:
+    EXPORTS += [
+        'nsDOMDataChannel.h',
+        'nsDOMDataChannelDeclarations.h',
+    ]
+
+EXPORTS.mozilla += [
+    'CORSMode.h',
+    'FeedWriterEnabled.h',
 ]
 
 EXPORTS.mozilla.dom += [
+    'Attr.h',
     'BarProps.h',
+    'BlobSet.h',
+    'ChildIterator.h',
+    'Comment.h',
     'Console.h',
+    'DirectionalityUtils.h',
+    'DocumentFragment.h',
+    'DocumentType.h',
     'DOMCursor.h',
     'DOMError.h',
     'DOMException.h',
+    'DOMImplementation.h',
+    'DOMMatrix.h',
+    'DOMParser.h',
+    'DOMPoint.h',
+    'DOMQuad.h',
+    'DOMRect.h',
     'DOMRequest.h',
+    'DOMStringList.h',
+    'Element.h',
+    'ElementInlines.h',
+    'EventSource.h',
+    'File.h',
+    'FragmentOrElement.h',
+    'FromParser.h',
     'ImageEncoder.h',
+    'ImportManager.h',
+    'Link.h',
     'MessageChannel.h',
     'MessagePort.h',
     'MessagePortList.h',
@@ -60,76 +178,199 @@ EXPORTS.mozilla.dom += [
     'Navigator.h',
     'NodeInfo.h',
     'NodeInfoInlines.h',
+    'NodeIterator.h',
     'PerformanceEntry.h',
     'PerformanceResourceTiming.h',
+    'ResponsiveImageSelector.h',
     'ScreenOrientation.h',
     'ScriptSettings.h',
+    'ShadowRoot.h',
     'StructuredCloneTags.h',
+    'StyleSheetList.h',
     'SubtleCrypto.h',
+    'Text.h',
+    'TreeWalker.h',
     'URL.h',
     'URLSearchParams.h',
+    'WebSocket.h',
 ]
 
 UNIFIED_SOURCES += [
+    'Attr.cpp',
     'BarProps.cpp',
+    'ChildIterator.cpp',
+    'Comment.cpp',
     'CompositionStringSynthesizer.cpp',
     'Console.cpp',
     'Crypto.cpp',
+    'DirectionalityUtils.cpp',
+    'DocumentFragment.cpp',
+    'DocumentType.cpp',
     'DOMCursor.cpp',
     'DOMError.cpp',
     'DOMException.cpp',
+    'DOMImplementation.cpp',
+    'DOMMatrix.cpp',
+    'DOMParser.cpp',
+    'DOMPoint.cpp',
+    'DOMQuad.cpp',
+    'DOMRect.cpp',
     'DOMRequest.cpp',
+    'DOMStringList.cpp',
+    'Element.cpp',
+    'EventSource.cpp',
+    'File.cpp',
+    'FileIOObject.cpp',
+    'FragmentOrElement.cpp',
     'ImageEncoder.cpp',
+    'ImportManager.cpp',
+    'Link.cpp',
     'MessageChannel.cpp',
     'MessagePortList.cpp',
+    'MultipartFileImpl.cpp',
     'Navigator.cpp',
     'NodeInfo.cpp',
+    'NodeIterator.cpp',
+    'nsAtomListUtils.cpp',
+    'nsAttrAndChildArray.cpp',
+    'nsAttrValue.cpp',
+    'nsAttrValueOrString.cpp',
+    'nsCCUncollectableMarker.cpp',
+    'nsContentAreaDragDrop.cpp',
+    'nsContentIterator.cpp',
+    'nsContentList.cpp',
     'nsContentPermissionHelper.cpp',
+    'nsContentPolicy.cpp',
+    'nsContentSink.cpp',
+    'nsCopySupport.cpp',
+    'nsCrossSiteListenerProxy.cpp',
+    'nsCSPContext.cpp',
+    'nsCSPParser.cpp',
+    'nsCSPService.cpp',
+    'nsCSPUtils.cpp',
+    'nsDataDocumentContentPolicy.cpp',
+    'nsDocument.cpp',
+    'nsDocumentEncoder.cpp',
+    'nsDOMAttributeMap.cpp',
+    'nsDOMCaretPosition.cpp',
     'nsDOMClassInfo.cpp',
+    'nsDOMFileReader.cpp',
+    'nsDOMMutationObserver.cpp',
     'nsDOMNavigationTiming.cpp',
     'nsDOMScriptObjectFactory.cpp',
+    'nsDOMSerializer.cpp',
+    'nsDOMSettableTokenList.cpp',
+    'nsDOMTokenList.cpp',
     'nsDOMWindowList.cpp',
+    'nsElementFrameLoaderOwner.cpp',
     'nsFocusManager.cpp',
+    'nsFormData.cpp',
+    'nsFrameLoader.cpp',
+    'nsFrameMessageManager.cpp',
+    'nsGenConImageContent.cpp',
+    'nsGenericDOMDataNode.cpp',
+    'nsGkAtoms.cpp',
     'nsGlobalWindowCommands.cpp',
     'nsHistory.cpp',
+    'nsHostObjectProtocolHandler.cpp',
+    'nsHostObjectURI.cpp',
+    'nsHTMLContentSerializer.cpp',
     'nsIGlobalObject.cpp',
+    'nsINode.cpp',
+    'nsInProcessTabChildGlobal.cpp',
     'nsJSEnvironment.cpp',
     'nsJSTimeoutHandler.cpp',
     'nsJSUtils.cpp',
+    'nsLineBreaker.cpp',
     'nsLocation.cpp',
+    'nsMappedAttributeElement.cpp',
+    'nsMappedAttributes.cpp',
     'nsMimeTypeArray.cpp',
+    'nsMixedContentBlocker.cpp',
+    'nsNameSpaceManager.cpp',
+    'nsNoDataProtocolContentPolicy.cpp',
+    'nsNodeInfoManager.cpp',
+    'nsNodeUtils.cpp',
     'nsPerformance.cpp',
+    'nsPlainTextSerializer.cpp',
+    'nsPropertyTable.cpp',
     'nsQueryContentEventResult.cpp',
+    'nsRange.cpp',
+    'nsReferencedElement.cpp',
     'nsScreen.cpp',
+    'nsScriptElement.cpp',
+    'nsScriptLoader.cpp',
     'nsScriptNameSpaceManager.cpp',
     'nsStructuredCloneContainer.cpp',
+    'nsStubDocumentObserver.cpp',
+    'nsStubMutationObserver.cpp',
+    'nsStyledElement.cpp',
+    'nsStyleLinkElement.cpp',
+    'nsSyncLoadService.cpp',
+    'nsTextFragment.cpp',
+    'nsTextNode.cpp',
+    'nsTraversal.cpp',
+    'nsTreeSanitizer.cpp',
+    'nsViewportInfo.cpp',
     'nsWindowMemoryReporter.cpp',
     'nsWindowRoot.cpp',
     'nsWrapperCache.cpp',
+    'nsXHTMLContentSerializer.cpp',
+    'nsXMLContentSerializer.cpp',
+    'nsXMLHttpRequest.cpp',
+    'nsXMLNameSpaceMap.cpp',
     'PerformanceEntry.cpp',
     'PerformanceResourceTiming.cpp',
+    'ResponsiveImageSelector.cpp',
     'ScriptSettings.cpp',
+    'ShadowRoot.cpp',
+    'StyleSheetList.cpp',
     'SubtleCrypto.cpp',
+    'Text.cpp',
+    'ThirdPartyUtil.cpp',
+    'TreeWalker.cpp',
     'URL.cpp',
     'URLSearchParams.cpp',
+    'WebSocket.cpp',
     'WindowNamedPropertiesHandler.cpp',
 ]
 
+if CONFIG['MOZ_WEBRTC']:
+    UNIFIED_SOURCES += [
+        'nsDOMDataChannel.cpp',
+    ]
+
 # these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
 SOURCES += [
     # this file doesn't like windows.h
     'MessagePort.cpp',
+    # Because of OS X headers.
+    'nsContentUtils.cpp',
     # this file doesn't like windows.h
     'nsDOMWindowUtils.cpp',
     # This file has a #error "Never include windows.h in this file!"
     'nsGlobalWindow.cpp',
+    # Conflicts with windows.h's definition of LoadImage.
+    'nsImageLoadingContent.cpp',
+    # Because of OS X headers.
+    'nsObjectLoadingContent.cpp',
     # nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
     'nsPluginArray.cpp',
 ]
 
+# Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
+# nsTextFragment.cpp
+if CONFIG['INTEL_ARCHITECTURE']:
+    SOURCES += ['nsTextFragmentSSE2.cpp']
+    SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+
 EXTRA_COMPONENTS += [
     'ConsoleAPI.manifest',
     'ConsoleAPIStorage.js',
+    'contentAreaDropListener.js',
+    'contentAreaDropListener.manifest',
+    'messageWakeupService.js',
+    'messageWakeupService.manifest',
     'SiteSpecificUserAgent.js',
     'SiteSpecificUserAgent.manifest',
     'SlowScriptDebug.js',
@@ -152,19 +393,31 @@ LOCAL_INCLUDES += [
     '../media',
     '../network',
     '../time',
-    '../workers',
-    '../xbl',
-    '/content/base/src',
+    '/caps',
     '/docshell/base',
+    '/dom/base',
     '/dom/geolocation',
     '/dom/html',
+    '/dom/ipc',
     '/dom/storage',
+    '/dom/svg',
+    '/dom/workers',
+    '/dom/xbl',
+    '/dom/xml',
+    '/dom/xslt/xpath',
     '/dom/xul',
+    '/image/src',
+    '/js/ipc',
+    '/js/xpconnect/src',
+    '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
+    '/layout/svg',
     '/layout/xul',
+    '/netwerk/base/src',
     '/widget',
+    '/xpcom/ds',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
@@ -173,15 +426,15 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         '../system/gonk',
     ]
 
+if CONFIG['MOZ_WEBRTC']:
+    LOCAL_INCLUDES += [
+        '/netwerk/sctp/datachannel',
+    ]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
-LOCAL_INCLUDES += [
-    '/js/xpconnect/src',
-    '/js/xpconnect/wrappers',
-]
-
 for var in ('MOZ_B2G_RIL', 'MOZ_B2G_FM'):
     if CONFIG[var]:
         DEFINES[var] = True
@@ -189,8 +442,5 @@ for var in ('MOZ_B2G_RIL', 'MOZ_B2G_FM'):
 if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
     DEFINES['HAVE_SIDEBAR'] = True
 
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-
 if CONFIG['MOZ_X11']:
     CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/content/base/src/mozAutoDocUpdate.h b/dom/base/mozAutoDocUpdate.h
similarity index 100%
rename from content/base/src/mozAutoDocUpdate.h
rename to dom/base/mozAutoDocUpdate.h
diff --git a/content/base/public/mozFlushType.h b/dom/base/mozFlushType.h
similarity index 100%
rename from content/base/public/mozFlushType.h
rename to dom/base/mozFlushType.h
diff --git a/content/base/src/nsAtomListUtils.cpp b/dom/base/nsAtomListUtils.cpp
similarity index 100%
rename from content/base/src/nsAtomListUtils.cpp
rename to dom/base/nsAtomListUtils.cpp
diff --git a/content/base/src/nsAtomListUtils.h b/dom/base/nsAtomListUtils.h
similarity index 100%
rename from content/base/src/nsAtomListUtils.h
rename to dom/base/nsAtomListUtils.h
diff --git a/content/base/src/nsAttrAndChildArray.cpp b/dom/base/nsAttrAndChildArray.cpp
similarity index 100%
rename from content/base/src/nsAttrAndChildArray.cpp
rename to dom/base/nsAttrAndChildArray.cpp
diff --git a/content/base/src/nsAttrAndChildArray.h b/dom/base/nsAttrAndChildArray.h
similarity index 100%
rename from content/base/src/nsAttrAndChildArray.h
rename to dom/base/nsAttrAndChildArray.h
diff --git a/content/base/src/nsAttrName.h b/dom/base/nsAttrName.h
similarity index 100%
rename from content/base/src/nsAttrName.h
rename to dom/base/nsAttrName.h
diff --git a/content/base/src/nsAttrValue.cpp b/dom/base/nsAttrValue.cpp
similarity index 100%
rename from content/base/src/nsAttrValue.cpp
rename to dom/base/nsAttrValue.cpp
diff --git a/content/base/src/nsAttrValue.h b/dom/base/nsAttrValue.h
similarity index 100%
rename from content/base/src/nsAttrValue.h
rename to dom/base/nsAttrValue.h
diff --git a/content/base/src/nsAttrValueInlines.h b/dom/base/nsAttrValueInlines.h
similarity index 100%
rename from content/base/src/nsAttrValueInlines.h
rename to dom/base/nsAttrValueInlines.h
diff --git a/content/base/src/nsAttrValueOrString.cpp b/dom/base/nsAttrValueOrString.cpp
similarity index 100%
rename from content/base/src/nsAttrValueOrString.cpp
rename to dom/base/nsAttrValueOrString.cpp
diff --git a/content/base/src/nsAttrValueOrString.h b/dom/base/nsAttrValueOrString.h
similarity index 100%
rename from content/base/src/nsAttrValueOrString.h
rename to dom/base/nsAttrValueOrString.h
diff --git a/content/base/src/nsCCUncollectableMarker.cpp b/dom/base/nsCCUncollectableMarker.cpp
similarity index 100%
rename from content/base/src/nsCCUncollectableMarker.cpp
rename to dom/base/nsCCUncollectableMarker.cpp
diff --git a/content/base/src/nsCCUncollectableMarker.h b/dom/base/nsCCUncollectableMarker.h
similarity index 100%
rename from content/base/src/nsCCUncollectableMarker.h
rename to dom/base/nsCCUncollectableMarker.h
diff --git a/content/base/src/nsCSPContext.cpp b/dom/base/nsCSPContext.cpp
similarity index 100%
rename from content/base/src/nsCSPContext.cpp
rename to dom/base/nsCSPContext.cpp
diff --git a/content/base/src/nsCSPContext.h b/dom/base/nsCSPContext.h
similarity index 100%
rename from content/base/src/nsCSPContext.h
rename to dom/base/nsCSPContext.h
diff --git a/content/base/src/nsCSPParser.cpp b/dom/base/nsCSPParser.cpp
similarity index 100%
rename from content/base/src/nsCSPParser.cpp
rename to dom/base/nsCSPParser.cpp
diff --git a/content/base/src/nsCSPParser.h b/dom/base/nsCSPParser.h
similarity index 100%
rename from content/base/src/nsCSPParser.h
rename to dom/base/nsCSPParser.h
diff --git a/content/base/src/nsCSPService.cpp b/dom/base/nsCSPService.cpp
similarity index 100%
rename from content/base/src/nsCSPService.cpp
rename to dom/base/nsCSPService.cpp
diff --git a/content/base/src/nsCSPService.h b/dom/base/nsCSPService.h
similarity index 100%
rename from content/base/src/nsCSPService.h
rename to dom/base/nsCSPService.h
diff --git a/content/base/src/nsCSPUtils.cpp b/dom/base/nsCSPUtils.cpp
similarity index 100%
rename from content/base/src/nsCSPUtils.cpp
rename to dom/base/nsCSPUtils.cpp
diff --git a/content/base/src/nsCSPUtils.h b/dom/base/nsCSPUtils.h
similarity index 100%
rename from content/base/src/nsCSPUtils.h
rename to dom/base/nsCSPUtils.h
diff --git a/content/base/public/nsCaseTreatment.h b/dom/base/nsCaseTreatment.h
similarity index 100%
rename from content/base/public/nsCaseTreatment.h
rename to dom/base/nsCaseTreatment.h
diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/dom/base/nsContentAreaDragDrop.cpp
similarity index 100%
rename from content/base/src/nsContentAreaDragDrop.cpp
rename to dom/base/nsContentAreaDragDrop.cpp
diff --git a/content/base/src/nsContentAreaDragDrop.h b/dom/base/nsContentAreaDragDrop.h
similarity index 100%
rename from content/base/src/nsContentAreaDragDrop.h
rename to dom/base/nsContentAreaDragDrop.h
diff --git a/content/base/public/nsContentCID.h b/dom/base/nsContentCID.h
similarity index 100%
rename from content/base/public/nsContentCID.h
rename to dom/base/nsContentCID.h
diff --git a/content/base/public/nsContentCreatorFunctions.h b/dom/base/nsContentCreatorFunctions.h
similarity index 100%
rename from content/base/public/nsContentCreatorFunctions.h
rename to dom/base/nsContentCreatorFunctions.h
diff --git a/content/base/src/nsContentIterator.cpp b/dom/base/nsContentIterator.cpp
similarity index 100%
rename from content/base/src/nsContentIterator.cpp
rename to dom/base/nsContentIterator.cpp
diff --git a/content/base/src/nsContentList.cpp b/dom/base/nsContentList.cpp
similarity index 100%
rename from content/base/src/nsContentList.cpp
rename to dom/base/nsContentList.cpp
diff --git a/content/base/src/nsContentList.h b/dom/base/nsContentList.h
similarity index 100%
rename from content/base/src/nsContentList.h
rename to dom/base/nsContentList.h
diff --git a/content/base/src/nsContentListDeclarations.h b/dom/base/nsContentListDeclarations.h
similarity index 100%
rename from content/base/src/nsContentListDeclarations.h
rename to dom/base/nsContentListDeclarations.h
diff --git a/content/base/src/nsContentPolicy.cpp b/dom/base/nsContentPolicy.cpp
similarity index 100%
rename from content/base/src/nsContentPolicy.cpp
rename to dom/base/nsContentPolicy.cpp
diff --git a/content/base/src/nsContentPolicy.h b/dom/base/nsContentPolicy.h
similarity index 100%
rename from content/base/src/nsContentPolicy.h
rename to dom/base/nsContentPolicy.h
diff --git a/content/base/public/nsContentPolicyUtils.h b/dom/base/nsContentPolicyUtils.h
similarity index 100%
rename from content/base/public/nsContentPolicyUtils.h
rename to dom/base/nsContentPolicyUtils.h
diff --git a/content/base/src/nsContentSink.cpp b/dom/base/nsContentSink.cpp
similarity index 100%
rename from content/base/src/nsContentSink.cpp
rename to dom/base/nsContentSink.cpp
diff --git a/content/base/src/nsContentSink.h b/dom/base/nsContentSink.h
similarity index 100%
rename from content/base/src/nsContentSink.h
rename to dom/base/nsContentSink.h
diff --git a/content/base/public/nsContentTypeParser.h b/dom/base/nsContentTypeParser.h
similarity index 100%
rename from content/base/public/nsContentTypeParser.h
rename to dom/base/nsContentTypeParser.h
diff --git a/content/base/src/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
similarity index 100%
rename from content/base/src/nsContentUtils.cpp
rename to dom/base/nsContentUtils.cpp
diff --git a/content/base/public/nsContentUtils.h b/dom/base/nsContentUtils.h
similarity index 100%
rename from content/base/public/nsContentUtils.h
rename to dom/base/nsContentUtils.h
diff --git a/content/base/src/nsCopySupport.cpp b/dom/base/nsCopySupport.cpp
similarity index 100%
rename from content/base/src/nsCopySupport.cpp
rename to dom/base/nsCopySupport.cpp
diff --git a/content/base/public/nsCopySupport.h b/dom/base/nsCopySupport.h
similarity index 100%
rename from content/base/public/nsCopySupport.h
rename to dom/base/nsCopySupport.h
diff --git a/content/base/src/nsCrossSiteListenerProxy.cpp b/dom/base/nsCrossSiteListenerProxy.cpp
similarity index 100%
rename from content/base/src/nsCrossSiteListenerProxy.cpp
rename to dom/base/nsCrossSiteListenerProxy.cpp
diff --git a/content/base/src/nsCrossSiteListenerProxy.h b/dom/base/nsCrossSiteListenerProxy.h
similarity index 100%
rename from content/base/src/nsCrossSiteListenerProxy.h
rename to dom/base/nsCrossSiteListenerProxy.h
diff --git a/content/base/src/nsDOMAttributeMap.cpp b/dom/base/nsDOMAttributeMap.cpp
similarity index 100%
rename from content/base/src/nsDOMAttributeMap.cpp
rename to dom/base/nsDOMAttributeMap.cpp
diff --git a/content/base/src/nsDOMAttributeMap.h b/dom/base/nsDOMAttributeMap.h
similarity index 100%
rename from content/base/src/nsDOMAttributeMap.h
rename to dom/base/nsDOMAttributeMap.h
diff --git a/content/base/src/nsDOMCaretPosition.cpp b/dom/base/nsDOMCaretPosition.cpp
similarity index 100%
rename from content/base/src/nsDOMCaretPosition.cpp
rename to dom/base/nsDOMCaretPosition.cpp
diff --git a/content/base/src/nsDOMCaretPosition.h b/dom/base/nsDOMCaretPosition.h
similarity index 100%
rename from content/base/src/nsDOMCaretPosition.h
rename to dom/base/nsDOMCaretPosition.h
diff --git a/content/base/src/nsDOMDataChannel.cpp b/dom/base/nsDOMDataChannel.cpp
similarity index 100%
rename from content/base/src/nsDOMDataChannel.cpp
rename to dom/base/nsDOMDataChannel.cpp
diff --git a/content/base/src/nsDOMDataChannel.h b/dom/base/nsDOMDataChannel.h
similarity index 100%
rename from content/base/src/nsDOMDataChannel.h
rename to dom/base/nsDOMDataChannel.h
diff --git a/content/base/src/nsDOMDataChannelDeclarations.h b/dom/base/nsDOMDataChannelDeclarations.h
similarity index 100%
rename from content/base/src/nsDOMDataChannelDeclarations.h
rename to dom/base/nsDOMDataChannelDeclarations.h
diff --git a/content/base/src/nsDOMFileReader.cpp b/dom/base/nsDOMFileReader.cpp
similarity index 100%
rename from content/base/src/nsDOMFileReader.cpp
rename to dom/base/nsDOMFileReader.cpp
diff --git a/content/base/src/nsDOMFileReader.h b/dom/base/nsDOMFileReader.h
similarity index 100%
rename from content/base/src/nsDOMFileReader.h
rename to dom/base/nsDOMFileReader.h
diff --git a/content/base/src/nsDOMMutationObserver.cpp b/dom/base/nsDOMMutationObserver.cpp
similarity index 100%
rename from content/base/src/nsDOMMutationObserver.cpp
rename to dom/base/nsDOMMutationObserver.cpp
diff --git a/content/base/src/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h
similarity index 100%
rename from content/base/src/nsDOMMutationObserver.h
rename to dom/base/nsDOMMutationObserver.h
diff --git a/content/base/src/nsDOMSerializer.cpp b/dom/base/nsDOMSerializer.cpp
similarity index 100%
rename from content/base/src/nsDOMSerializer.cpp
rename to dom/base/nsDOMSerializer.cpp
diff --git a/content/base/src/nsDOMSerializer.h b/dom/base/nsDOMSerializer.h
similarity index 100%
rename from content/base/src/nsDOMSerializer.h
rename to dom/base/nsDOMSerializer.h
diff --git a/content/base/src/nsDOMSettableTokenList.cpp b/dom/base/nsDOMSettableTokenList.cpp
similarity index 100%
rename from content/base/src/nsDOMSettableTokenList.cpp
rename to dom/base/nsDOMSettableTokenList.cpp
diff --git a/content/base/src/nsDOMSettableTokenList.h b/dom/base/nsDOMSettableTokenList.h
similarity index 100%
rename from content/base/src/nsDOMSettableTokenList.h
rename to dom/base/nsDOMSettableTokenList.h
diff --git a/content/base/src/nsDOMTokenList.cpp b/dom/base/nsDOMTokenList.cpp
similarity index 100%
rename from content/base/src/nsDOMTokenList.cpp
rename to dom/base/nsDOMTokenList.cpp
diff --git a/content/base/src/nsDOMTokenList.h b/dom/base/nsDOMTokenList.h
similarity index 100%
rename from content/base/src/nsDOMTokenList.h
rename to dom/base/nsDOMTokenList.h
diff --git a/content/base/src/nsDataDocumentContentPolicy.cpp b/dom/base/nsDataDocumentContentPolicy.cpp
similarity index 100%
rename from content/base/src/nsDataDocumentContentPolicy.cpp
rename to dom/base/nsDataDocumentContentPolicy.cpp
diff --git a/content/base/src/nsDataDocumentContentPolicy.h b/dom/base/nsDataDocumentContentPolicy.h
similarity index 100%
rename from content/base/src/nsDataDocumentContentPolicy.h
rename to dom/base/nsDataDocumentContentPolicy.h
diff --git a/content/base/public/nsDeprecatedOperationList.h b/dom/base/nsDeprecatedOperationList.h
similarity index 100%
rename from content/base/public/nsDeprecatedOperationList.h
rename to dom/base/nsDeprecatedOperationList.h
diff --git a/content/base/public/nsDocElementCreatedNotificationRunner.h b/dom/base/nsDocElementCreatedNotificationRunner.h
similarity index 100%
rename from content/base/public/nsDocElementCreatedNotificationRunner.h
rename to dom/base/nsDocElementCreatedNotificationRunner.h
diff --git a/content/base/src/nsDocument.cpp b/dom/base/nsDocument.cpp
similarity index 100%
rename from content/base/src/nsDocument.cpp
rename to dom/base/nsDocument.cpp
diff --git a/content/base/src/nsDocument.h b/dom/base/nsDocument.h
similarity index 100%
rename from content/base/src/nsDocument.h
rename to dom/base/nsDocument.h
diff --git a/content/base/src/nsDocumentEncoder.cpp b/dom/base/nsDocumentEncoder.cpp
similarity index 100%
rename from content/base/src/nsDocumentEncoder.cpp
rename to dom/base/nsDocumentEncoder.cpp
diff --git a/content/base/src/nsElementFrameLoaderOwner.cpp b/dom/base/nsElementFrameLoaderOwner.cpp
similarity index 100%
rename from content/base/src/nsElementFrameLoaderOwner.cpp
rename to dom/base/nsElementFrameLoaderOwner.cpp
diff --git a/content/base/src/nsElementFrameLoaderOwner.h b/dom/base/nsElementFrameLoaderOwner.h
similarity index 100%
rename from content/base/src/nsElementFrameLoaderOwner.h
rename to dom/base/nsElementFrameLoaderOwner.h
diff --git a/content/base/src/nsFormData.cpp b/dom/base/nsFormData.cpp
similarity index 100%
rename from content/base/src/nsFormData.cpp
rename to dom/base/nsFormData.cpp
diff --git a/content/base/src/nsFormData.h b/dom/base/nsFormData.h
similarity index 100%
rename from content/base/src/nsFormData.h
rename to dom/base/nsFormData.h
diff --git a/content/base/src/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
similarity index 100%
rename from content/base/src/nsFrameLoader.cpp
rename to dom/base/nsFrameLoader.cpp
diff --git a/content/base/src/nsFrameLoader.h b/dom/base/nsFrameLoader.h
similarity index 100%
rename from content/base/src/nsFrameLoader.h
rename to dom/base/nsFrameLoader.h
diff --git a/content/base/src/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
similarity index 100%
rename from content/base/src/nsFrameMessageManager.cpp
rename to dom/base/nsFrameMessageManager.cpp
diff --git a/content/base/src/nsFrameMessageManager.h b/dom/base/nsFrameMessageManager.h
similarity index 100%
rename from content/base/src/nsFrameMessageManager.h
rename to dom/base/nsFrameMessageManager.h
diff --git a/content/base/src/nsGenConImageContent.cpp b/dom/base/nsGenConImageContent.cpp
similarity index 100%
rename from content/base/src/nsGenConImageContent.cpp
rename to dom/base/nsGenConImageContent.cpp
diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/dom/base/nsGenericDOMDataNode.cpp
similarity index 100%
rename from content/base/src/nsGenericDOMDataNode.cpp
rename to dom/base/nsGenericDOMDataNode.cpp
diff --git a/content/base/src/nsGenericDOMDataNode.h b/dom/base/nsGenericDOMDataNode.h
similarity index 100%
rename from content/base/src/nsGenericDOMDataNode.h
rename to dom/base/nsGenericDOMDataNode.h
diff --git a/content/base/src/nsGkAtomList.h b/dom/base/nsGkAtomList.h
similarity index 100%
rename from content/base/src/nsGkAtomList.h
rename to dom/base/nsGkAtomList.h
diff --git a/content/base/src/nsGkAtoms.cpp b/dom/base/nsGkAtoms.cpp
similarity index 100%
rename from content/base/src/nsGkAtoms.cpp
rename to dom/base/nsGkAtoms.cpp
diff --git a/content/base/src/nsGkAtoms.h b/dom/base/nsGkAtoms.h
similarity index 100%
rename from content/base/src/nsGkAtoms.h
rename to dom/base/nsGkAtoms.h
diff --git a/content/base/src/nsHTMLContentSerializer.cpp b/dom/base/nsHTMLContentSerializer.cpp
similarity index 100%
rename from content/base/src/nsHTMLContentSerializer.cpp
rename to dom/base/nsHTMLContentSerializer.cpp
diff --git a/content/base/src/nsHTMLContentSerializer.h b/dom/base/nsHTMLContentSerializer.h
similarity index 100%
rename from content/base/src/nsHTMLContentSerializer.h
rename to dom/base/nsHTMLContentSerializer.h
diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp
similarity index 100%
rename from content/base/src/nsHostObjectProtocolHandler.cpp
rename to dom/base/nsHostObjectProtocolHandler.cpp
diff --git a/content/base/public/nsHostObjectProtocolHandler.h b/dom/base/nsHostObjectProtocolHandler.h
similarity index 100%
rename from content/base/public/nsHostObjectProtocolHandler.h
rename to dom/base/nsHostObjectProtocolHandler.h
diff --git a/content/base/src/nsHostObjectURI.cpp b/dom/base/nsHostObjectURI.cpp
similarity index 100%
rename from content/base/src/nsHostObjectURI.cpp
rename to dom/base/nsHostObjectURI.cpp
diff --git a/content/base/src/nsHostObjectURI.h b/dom/base/nsHostObjectURI.h
similarity index 100%
rename from content/base/src/nsHostObjectURI.h
rename to dom/base/nsHostObjectURI.h
diff --git a/content/base/public/nsIAttribute.h b/dom/base/nsIAttribute.h
similarity index 100%
rename from content/base/public/nsIAttribute.h
rename to dom/base/nsIAttribute.h
diff --git a/content/base/public/nsIContent.h b/dom/base/nsIContent.h
similarity index 100%
rename from content/base/public/nsIContent.h
rename to dom/base/nsIContent.h
diff --git a/content/base/public/nsIContentInlines.h b/dom/base/nsIContentInlines.h
similarity index 100%
rename from content/base/public/nsIContentInlines.h
rename to dom/base/nsIContentInlines.h
diff --git a/content/base/public/nsIContentIterator.h b/dom/base/nsIContentIterator.h
similarity index 100%
rename from content/base/public/nsIContentIterator.h
rename to dom/base/nsIContentIterator.h
diff --git a/content/base/public/nsIContentPolicy.idl b/dom/base/nsIContentPolicy.idl
similarity index 100%
rename from content/base/public/nsIContentPolicy.idl
rename to dom/base/nsIContentPolicy.idl
diff --git a/content/base/public/nsIContentSecurityPolicy.idl b/dom/base/nsIContentSecurityPolicy.idl
similarity index 100%
rename from content/base/public/nsIContentSecurityPolicy.idl
rename to dom/base/nsIContentSecurityPolicy.idl
diff --git a/content/base/public/nsIContentSerializer.h b/dom/base/nsIContentSerializer.h
similarity index 100%
rename from content/base/public/nsIContentSerializer.h
rename to dom/base/nsIContentSerializer.h
diff --git a/content/base/public/nsIDOMDataChannel.idl b/dom/base/nsIDOMDataChannel.idl
similarity index 100%
rename from content/base/public/nsIDOMDataChannel.idl
rename to dom/base/nsIDOMDataChannel.idl
diff --git a/content/base/public/nsIDOMFile.idl b/dom/base/nsIDOMFile.idl
similarity index 100%
rename from content/base/public/nsIDOMFile.idl
rename to dom/base/nsIDOMFile.idl
diff --git a/content/base/public/nsIDOMFileList.idl b/dom/base/nsIDOMFileList.idl
similarity index 100%
rename from content/base/public/nsIDOMFileList.idl
rename to dom/base/nsIDOMFileList.idl
diff --git a/content/base/public/nsIDOMFileReader.idl b/dom/base/nsIDOMFileReader.idl
similarity index 100%
rename from content/base/public/nsIDOMFileReader.idl
rename to dom/base/nsIDOMFileReader.idl
diff --git a/content/base/public/nsIDOMFormData.idl b/dom/base/nsIDOMFormData.idl
similarity index 100%
rename from content/base/public/nsIDOMFormData.idl
rename to dom/base/nsIDOMFormData.idl
diff --git a/content/base/public/nsIDOMParser.idl b/dom/base/nsIDOMParser.idl
similarity index 100%
rename from content/base/public/nsIDOMParser.idl
rename to dom/base/nsIDOMParser.idl
diff --git a/content/base/public/nsIDOMSerializer.idl b/dom/base/nsIDOMSerializer.idl
similarity index 100%
rename from content/base/public/nsIDOMSerializer.idl
rename to dom/base/nsIDOMSerializer.idl
diff --git a/content/base/public/nsIDocument.h b/dom/base/nsIDocument.h
similarity index 100%
rename from content/base/public/nsIDocument.h
rename to dom/base/nsIDocument.h
diff --git a/content/base/public/nsIDocumentEncoder.idl b/dom/base/nsIDocumentEncoder.idl
similarity index 100%
rename from content/base/public/nsIDocumentEncoder.idl
rename to dom/base/nsIDocumentEncoder.idl
diff --git a/content/base/public/nsIDocumentInlines.h b/dom/base/nsIDocumentInlines.h
similarity index 100%
rename from content/base/public/nsIDocumentInlines.h
rename to dom/base/nsIDocumentInlines.h
diff --git a/content/base/public/nsIDocumentObserver.h b/dom/base/nsIDocumentObserver.h
similarity index 100%
rename from content/base/public/nsIDocumentObserver.h
rename to dom/base/nsIDocumentObserver.h
diff --git a/content/base/public/nsIDroppedLinkHandler.idl b/dom/base/nsIDroppedLinkHandler.idl
similarity index 100%
rename from content/base/public/nsIDroppedLinkHandler.idl
rename to dom/base/nsIDroppedLinkHandler.idl
diff --git a/content/base/public/nsIFrameLoader.idl b/dom/base/nsIFrameLoader.idl
similarity index 100%
rename from content/base/public/nsIFrameLoader.idl
rename to dom/base/nsIFrameLoader.idl
diff --git a/content/base/public/nsIImageLoadingContent.idl b/dom/base/nsIImageLoadingContent.idl
similarity index 100%
rename from content/base/public/nsIImageLoadingContent.idl
rename to dom/base/nsIImageLoadingContent.idl
diff --git a/content/base/public/nsIMessageManager.idl b/dom/base/nsIMessageManager.idl
similarity index 100%
rename from content/base/public/nsIMessageManager.idl
rename to dom/base/nsIMessageManager.idl
diff --git a/content/base/public/nsIMutationObserver.h b/dom/base/nsIMutationObserver.h
similarity index 100%
rename from content/base/public/nsIMutationObserver.h
rename to dom/base/nsIMutationObserver.h
diff --git a/content/base/src/nsINode.cpp b/dom/base/nsINode.cpp
similarity index 100%
rename from content/base/src/nsINode.cpp
rename to dom/base/nsINode.cpp
diff --git a/content/base/public/nsINode.h b/dom/base/nsINode.h
similarity index 100%
rename from content/base/public/nsINode.h
rename to dom/base/nsINode.h
diff --git a/content/base/public/nsINodeList.h b/dom/base/nsINodeList.h
similarity index 100%
rename from content/base/public/nsINodeList.h
rename to dom/base/nsINodeList.h
diff --git a/content/base/public/nsIObjectLoadingContent.idl b/dom/base/nsIObjectLoadingContent.idl
similarity index 100%
rename from content/base/public/nsIObjectLoadingContent.idl
rename to dom/base/nsIObjectLoadingContent.idl
diff --git a/content/base/public/nsIScriptElement.h b/dom/base/nsIScriptElement.h
similarity index 100%
rename from content/base/public/nsIScriptElement.h
rename to dom/base/nsIScriptElement.h
diff --git a/content/base/public/nsIScriptLoaderObserver.idl b/dom/base/nsIScriptLoaderObserver.idl
similarity index 100%
rename from content/base/public/nsIScriptLoaderObserver.idl
rename to dom/base/nsIScriptLoaderObserver.idl
diff --git a/content/base/public/nsISelection.idl b/dom/base/nsISelection.idl
similarity index 100%
rename from content/base/public/nsISelection.idl
rename to dom/base/nsISelection.idl
diff --git a/content/base/public/nsISelectionController.idl b/dom/base/nsISelectionController.idl
similarity index 100%
rename from content/base/public/nsISelectionController.idl
rename to dom/base/nsISelectionController.idl
diff --git a/content/base/public/nsISelectionDisplay.idl b/dom/base/nsISelectionDisplay.idl
similarity index 100%
rename from content/base/public/nsISelectionDisplay.idl
rename to dom/base/nsISelectionDisplay.idl
diff --git a/content/base/public/nsISelectionListener.idl b/dom/base/nsISelectionListener.idl
similarity index 100%
rename from content/base/public/nsISelectionListener.idl
rename to dom/base/nsISelectionListener.idl
diff --git a/content/base/public/nsISelectionPrivate.idl b/dom/base/nsISelectionPrivate.idl
similarity index 100%
rename from content/base/public/nsISelectionPrivate.idl
rename to dom/base/nsISelectionPrivate.idl
diff --git a/content/base/public/nsIStyleSheetLinkingElement.h b/dom/base/nsIStyleSheetLinkingElement.h
similarity index 100%
rename from content/base/public/nsIStyleSheetLinkingElement.h
rename to dom/base/nsIStyleSheetLinkingElement.h
diff --git a/content/base/public/nsIXMLHttpRequest.idl b/dom/base/nsIXMLHttpRequest.idl
similarity index 100%
rename from content/base/public/nsIXMLHttpRequest.idl
rename to dom/base/nsIXMLHttpRequest.idl
diff --git a/content/base/src/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
similarity index 100%
rename from content/base/src/nsImageLoadingContent.cpp
rename to dom/base/nsImageLoadingContent.cpp
diff --git a/content/base/src/nsImageLoadingContent.h b/dom/base/nsImageLoadingContent.h
similarity index 100%
rename from content/base/src/nsImageLoadingContent.h
rename to dom/base/nsImageLoadingContent.h
diff --git a/content/base/src/nsInProcessTabChildGlobal.cpp b/dom/base/nsInProcessTabChildGlobal.cpp
similarity index 100%
rename from content/base/src/nsInProcessTabChildGlobal.cpp
rename to dom/base/nsInProcessTabChildGlobal.cpp
diff --git a/content/base/src/nsInProcessTabChildGlobal.h b/dom/base/nsInProcessTabChildGlobal.h
similarity index 100%
rename from content/base/src/nsInProcessTabChildGlobal.h
rename to dom/base/nsInProcessTabChildGlobal.h
diff --git a/content/base/src/nsLineBreaker.cpp b/dom/base/nsLineBreaker.cpp
similarity index 100%
rename from content/base/src/nsLineBreaker.cpp
rename to dom/base/nsLineBreaker.cpp
diff --git a/content/base/public/nsLineBreaker.h b/dom/base/nsLineBreaker.h
similarity index 100%
rename from content/base/public/nsLineBreaker.h
rename to dom/base/nsLineBreaker.h
diff --git a/content/base/src/nsMappedAttributeElement.cpp b/dom/base/nsMappedAttributeElement.cpp
similarity index 100%
rename from content/base/src/nsMappedAttributeElement.cpp
rename to dom/base/nsMappedAttributeElement.cpp
diff --git a/content/base/src/nsMappedAttributeElement.h b/dom/base/nsMappedAttributeElement.h
similarity index 100%
rename from content/base/src/nsMappedAttributeElement.h
rename to dom/base/nsMappedAttributeElement.h
diff --git a/content/base/src/nsMappedAttributes.cpp b/dom/base/nsMappedAttributes.cpp
similarity index 100%
rename from content/base/src/nsMappedAttributes.cpp
rename to dom/base/nsMappedAttributes.cpp
diff --git a/content/base/src/nsMappedAttributes.h b/dom/base/nsMappedAttributes.h
similarity index 100%
rename from content/base/src/nsMappedAttributes.h
rename to dom/base/nsMappedAttributes.h
diff --git a/content/base/src/nsMixedContentBlocker.cpp b/dom/base/nsMixedContentBlocker.cpp
similarity index 100%
rename from content/base/src/nsMixedContentBlocker.cpp
rename to dom/base/nsMixedContentBlocker.cpp
diff --git a/content/base/src/nsMixedContentBlocker.h b/dom/base/nsMixedContentBlocker.h
similarity index 100%
rename from content/base/src/nsMixedContentBlocker.h
rename to dom/base/nsMixedContentBlocker.h
diff --git a/content/base/src/nsNameSpaceManager.cpp b/dom/base/nsNameSpaceManager.cpp
similarity index 100%
rename from content/base/src/nsNameSpaceManager.cpp
rename to dom/base/nsNameSpaceManager.cpp
diff --git a/content/base/public/nsNameSpaceManager.h b/dom/base/nsNameSpaceManager.h
similarity index 100%
rename from content/base/public/nsNameSpaceManager.h
rename to dom/base/nsNameSpaceManager.h
diff --git a/content/base/src/nsNoDataProtocolContentPolicy.cpp b/dom/base/nsNoDataProtocolContentPolicy.cpp
similarity index 100%
rename from content/base/src/nsNoDataProtocolContentPolicy.cpp
rename to dom/base/nsNoDataProtocolContentPolicy.cpp
diff --git a/content/base/src/nsNoDataProtocolContentPolicy.h b/dom/base/nsNoDataProtocolContentPolicy.h
similarity index 100%
rename from content/base/src/nsNoDataProtocolContentPolicy.h
rename to dom/base/nsNoDataProtocolContentPolicy.h
diff --git a/content/base/src/nsNodeInfoManager.cpp b/dom/base/nsNodeInfoManager.cpp
similarity index 100%
rename from content/base/src/nsNodeInfoManager.cpp
rename to dom/base/nsNodeInfoManager.cpp
diff --git a/content/base/src/nsNodeInfoManager.h b/dom/base/nsNodeInfoManager.h
similarity index 100%
rename from content/base/src/nsNodeInfoManager.h
rename to dom/base/nsNodeInfoManager.h
diff --git a/content/base/src/nsNodeUtils.cpp b/dom/base/nsNodeUtils.cpp
similarity index 100%
rename from content/base/src/nsNodeUtils.cpp
rename to dom/base/nsNodeUtils.cpp
diff --git a/content/base/src/nsNodeUtils.h b/dom/base/nsNodeUtils.h
similarity index 100%
rename from content/base/src/nsNodeUtils.h
rename to dom/base/nsNodeUtils.h
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp
similarity index 100%
rename from content/base/src/nsObjectLoadingContent.cpp
rename to dom/base/nsObjectLoadingContent.cpp
diff --git a/content/base/src/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h
similarity index 100%
rename from content/base/src/nsObjectLoadingContent.h
rename to dom/base/nsObjectLoadingContent.h
diff --git a/content/base/src/nsPlainTextSerializer.cpp b/dom/base/nsPlainTextSerializer.cpp
similarity index 100%
rename from content/base/src/nsPlainTextSerializer.cpp
rename to dom/base/nsPlainTextSerializer.cpp
diff --git a/content/base/src/nsPlainTextSerializer.h b/dom/base/nsPlainTextSerializer.h
similarity index 100%
rename from content/base/src/nsPlainTextSerializer.h
rename to dom/base/nsPlainTextSerializer.h
diff --git a/content/base/src/nsPropertyTable.cpp b/dom/base/nsPropertyTable.cpp
similarity index 100%
rename from content/base/src/nsPropertyTable.cpp
rename to dom/base/nsPropertyTable.cpp
diff --git a/content/base/src/nsPropertyTable.h b/dom/base/nsPropertyTable.h
similarity index 100%
rename from content/base/src/nsPropertyTable.h
rename to dom/base/nsPropertyTable.h
diff --git a/content/base/src/nsRange.cpp b/dom/base/nsRange.cpp
similarity index 100%
rename from content/base/src/nsRange.cpp
rename to dom/base/nsRange.cpp
diff --git a/content/base/src/nsRange.h b/dom/base/nsRange.h
similarity index 100%
rename from content/base/src/nsRange.h
rename to dom/base/nsRange.h
diff --git a/content/base/src/nsReferencedElement.cpp b/dom/base/nsReferencedElement.cpp
similarity index 100%
rename from content/base/src/nsReferencedElement.cpp
rename to dom/base/nsReferencedElement.cpp
diff --git a/content/base/public/nsReferencedElement.h b/dom/base/nsReferencedElement.h
similarity index 100%
rename from content/base/public/nsReferencedElement.h
rename to dom/base/nsReferencedElement.h
diff --git a/content/base/src/nsSandboxFlags.h b/dom/base/nsSandboxFlags.h
similarity index 100%
rename from content/base/src/nsSandboxFlags.h
rename to dom/base/nsSandboxFlags.h
diff --git a/content/base/src/nsScriptElement.cpp b/dom/base/nsScriptElement.cpp
similarity index 100%
rename from content/base/src/nsScriptElement.cpp
rename to dom/base/nsScriptElement.cpp
diff --git a/content/base/src/nsScriptElement.h b/dom/base/nsScriptElement.h
similarity index 100%
rename from content/base/src/nsScriptElement.h
rename to dom/base/nsScriptElement.h
diff --git a/content/base/src/nsScriptLoader.cpp b/dom/base/nsScriptLoader.cpp
similarity index 100%
rename from content/base/src/nsScriptLoader.cpp
rename to dom/base/nsScriptLoader.cpp
diff --git a/content/base/src/nsScriptLoader.h b/dom/base/nsScriptLoader.h
similarity index 100%
rename from content/base/src/nsScriptLoader.h
rename to dom/base/nsScriptLoader.h
diff --git a/content/base/src/nsStubDocumentObserver.cpp b/dom/base/nsStubDocumentObserver.cpp
similarity index 100%
rename from content/base/src/nsStubDocumentObserver.cpp
rename to dom/base/nsStubDocumentObserver.cpp
diff --git a/content/base/src/nsStubDocumentObserver.h b/dom/base/nsStubDocumentObserver.h
similarity index 100%
rename from content/base/src/nsStubDocumentObserver.h
rename to dom/base/nsStubDocumentObserver.h
diff --git a/content/base/src/nsStubMutationObserver.cpp b/dom/base/nsStubMutationObserver.cpp
similarity index 100%
rename from content/base/src/nsStubMutationObserver.cpp
rename to dom/base/nsStubMutationObserver.cpp
diff --git a/content/base/src/nsStubMutationObserver.h b/dom/base/nsStubMutationObserver.h
similarity index 100%
rename from content/base/src/nsStubMutationObserver.h
rename to dom/base/nsStubMutationObserver.h
diff --git a/content/base/src/nsStyleLinkElement.cpp b/dom/base/nsStyleLinkElement.cpp
similarity index 100%
rename from content/base/src/nsStyleLinkElement.cpp
rename to dom/base/nsStyleLinkElement.cpp
diff --git a/content/base/src/nsStyleLinkElement.h b/dom/base/nsStyleLinkElement.h
similarity index 100%
rename from content/base/src/nsStyleLinkElement.h
rename to dom/base/nsStyleLinkElement.h
diff --git a/content/base/src/nsStyledElement.cpp b/dom/base/nsStyledElement.cpp
similarity index 100%
rename from content/base/src/nsStyledElement.cpp
rename to dom/base/nsStyledElement.cpp
diff --git a/content/base/src/nsStyledElement.h b/dom/base/nsStyledElement.h
similarity index 100%
rename from content/base/src/nsStyledElement.h
rename to dom/base/nsStyledElement.h
diff --git a/content/base/src/nsSyncLoadService.cpp b/dom/base/nsSyncLoadService.cpp
similarity index 100%
rename from content/base/src/nsSyncLoadService.cpp
rename to dom/base/nsSyncLoadService.cpp
diff --git a/content/base/src/nsSyncLoadService.h b/dom/base/nsSyncLoadService.h
similarity index 100%
rename from content/base/src/nsSyncLoadService.h
rename to dom/base/nsSyncLoadService.h
diff --git a/content/base/src/nsTextFragment.cpp b/dom/base/nsTextFragment.cpp
similarity index 100%
rename from content/base/src/nsTextFragment.cpp
rename to dom/base/nsTextFragment.cpp
diff --git a/content/base/src/nsTextFragment.h b/dom/base/nsTextFragment.h
similarity index 100%
rename from content/base/src/nsTextFragment.h
rename to dom/base/nsTextFragment.h
diff --git a/content/base/src/nsTextFragmentImpl.h b/dom/base/nsTextFragmentImpl.h
similarity index 100%
rename from content/base/src/nsTextFragmentImpl.h
rename to dom/base/nsTextFragmentImpl.h
diff --git a/content/base/src/nsTextFragmentSSE2.cpp b/dom/base/nsTextFragmentSSE2.cpp
similarity index 100%
rename from content/base/src/nsTextFragmentSSE2.cpp
rename to dom/base/nsTextFragmentSSE2.cpp
diff --git a/content/base/src/nsTextNode.cpp b/dom/base/nsTextNode.cpp
similarity index 100%
rename from content/base/src/nsTextNode.cpp
rename to dom/base/nsTextNode.cpp
diff --git a/content/base/src/nsTextNode.h b/dom/base/nsTextNode.h
similarity index 100%
rename from content/base/src/nsTextNode.h
rename to dom/base/nsTextNode.h
diff --git a/content/base/src/nsTraversal.cpp b/dom/base/nsTraversal.cpp
similarity index 100%
rename from content/base/src/nsTraversal.cpp
rename to dom/base/nsTraversal.cpp
diff --git a/content/base/src/nsTraversal.h b/dom/base/nsTraversal.h
similarity index 100%
rename from content/base/src/nsTraversal.h
rename to dom/base/nsTraversal.h
diff --git a/content/base/src/nsTreeSanitizer.cpp b/dom/base/nsTreeSanitizer.cpp
similarity index 100%
rename from content/base/src/nsTreeSanitizer.cpp
rename to dom/base/nsTreeSanitizer.cpp
diff --git a/content/base/public/nsTreeSanitizer.h b/dom/base/nsTreeSanitizer.h
similarity index 100%
rename from content/base/public/nsTreeSanitizer.h
rename to dom/base/nsTreeSanitizer.h
diff --git a/content/base/src/nsViewportInfo.cpp b/dom/base/nsViewportInfo.cpp
similarity index 100%
rename from content/base/src/nsViewportInfo.cpp
rename to dom/base/nsViewportInfo.cpp
diff --git a/content/base/public/nsViewportInfo.h b/dom/base/nsViewportInfo.h
similarity index 100%
rename from content/base/public/nsViewportInfo.h
rename to dom/base/nsViewportInfo.h
diff --git a/content/base/src/nsXHTMLContentSerializer.cpp b/dom/base/nsXHTMLContentSerializer.cpp
similarity index 100%
rename from content/base/src/nsXHTMLContentSerializer.cpp
rename to dom/base/nsXHTMLContentSerializer.cpp
diff --git a/content/base/src/nsXHTMLContentSerializer.h b/dom/base/nsXHTMLContentSerializer.h
similarity index 100%
rename from content/base/src/nsXHTMLContentSerializer.h
rename to dom/base/nsXHTMLContentSerializer.h
diff --git a/content/base/src/nsXMLContentSerializer.cpp b/dom/base/nsXMLContentSerializer.cpp
similarity index 100%
rename from content/base/src/nsXMLContentSerializer.cpp
rename to dom/base/nsXMLContentSerializer.cpp
diff --git a/content/base/src/nsXMLContentSerializer.h b/dom/base/nsXMLContentSerializer.h
similarity index 100%
rename from content/base/src/nsXMLContentSerializer.h
rename to dom/base/nsXMLContentSerializer.h
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/dom/base/nsXMLHttpRequest.cpp
similarity index 100%
rename from content/base/src/nsXMLHttpRequest.cpp
rename to dom/base/nsXMLHttpRequest.cpp
diff --git a/content/base/src/nsXMLHttpRequest.h b/dom/base/nsXMLHttpRequest.h
similarity index 100%
rename from content/base/src/nsXMLHttpRequest.h
rename to dom/base/nsXMLHttpRequest.h
diff --git a/content/base/src/nsXMLNameSpaceMap.cpp b/dom/base/nsXMLNameSpaceMap.cpp
similarity index 100%
rename from content/base/src/nsXMLNameSpaceMap.cpp
rename to dom/base/nsXMLNameSpaceMap.cpp
diff --git a/content/base/public/nsXMLNameSpaceMap.h b/dom/base/nsXMLNameSpaceMap.h
similarity index 100%
rename from content/base/public/nsXMLNameSpaceMap.h
rename to dom/base/nsXMLNameSpaceMap.h
diff --git a/content/base/test/345339_iframe.html b/dom/base/test/345339_iframe.html
similarity index 100%
rename from content/base/test/345339_iframe.html
rename to dom/base/test/345339_iframe.html
diff --git a/content/base/test/Ahem.ttf b/dom/base/test/Ahem.ttf
similarity index 100%
rename from content/base/test/Ahem.ttf
rename to dom/base/test/Ahem.ttf
diff --git a/content/base/test/TestCSPParser.cpp b/dom/base/test/TestCSPParser.cpp
similarity index 99%
rename from content/base/test/TestCSPParser.cpp
rename to dom/base/test/TestCSPParser.cpp
index 3e53ca37f06..8c8b0f1d36d 100644
--- a/content/base/test/TestCSPParser.cpp
+++ b/dom/base/test/TestCSPParser.cpp
@@ -25,7 +25,7 @@ template<class T> class nsReadingIterator;
 #include "nsNetUtil.h"
 #include "TestHarness.h"
 #include "nsIScriptSecurityManager.h"
-#include "../src/nsCSPContext.h"
+#include "../nsCSPContext.h"
 
 #ifndef MOZILLA_INTERNAL_API
 #undef nsString_h___
diff --git a/content/base/test/TestGetURL.cpp b/dom/base/test/TestGetURL.cpp
similarity index 100%
rename from content/base/test/TestGetURL.cpp
rename to dom/base/test/TestGetURL.cpp
diff --git a/content/base/test/TestNativeXMLHttpRequest.cpp b/dom/base/test/TestNativeXMLHttpRequest.cpp
similarity index 100%
rename from content/base/test/TestNativeXMLHttpRequest.cpp
rename to dom/base/test/TestNativeXMLHttpRequest.cpp
diff --git a/content/base/test/TestPlainTextSerializer.cpp b/dom/base/test/TestPlainTextSerializer.cpp
similarity index 100%
rename from content/base/test/TestPlainTextSerializer.cpp
rename to dom/base/test/TestPlainTextSerializer.cpp
diff --git a/content/base/test/accesscontrol.resource b/dom/base/test/accesscontrol.resource
similarity index 100%
rename from content/base/test/accesscontrol.resource
rename to dom/base/test/accesscontrol.resource
diff --git a/content/base/test/accesscontrol.resource^headers^ b/dom/base/test/accesscontrol.resource^headers^
similarity index 100%
rename from content/base/test/accesscontrol.resource^headers^
rename to dom/base/test/accesscontrol.resource^headers^
diff --git a/content/base/test/badContentType.eventsource b/dom/base/test/badContentType.eventsource
similarity index 100%
rename from content/base/test/badContentType.eventsource
rename to dom/base/test/badContentType.eventsource
diff --git a/content/base/test/badContentType.eventsource^headers^ b/dom/base/test/badContentType.eventsource^headers^
similarity index 100%
rename from content/base/test/badContentType.eventsource^headers^
rename to dom/base/test/badContentType.eventsource^headers^
diff --git a/content/base/test/badHTTPResponseCode.eventsource b/dom/base/test/badHTTPResponseCode.eventsource
similarity index 100%
rename from content/base/test/badHTTPResponseCode.eventsource
rename to dom/base/test/badHTTPResponseCode.eventsource
diff --git a/content/base/test/badHTTPResponseCode.eventsource^headers^ b/dom/base/test/badHTTPResponseCode.eventsource^headers^
similarity index 100%
rename from content/base/test/badHTTPResponseCode.eventsource^headers^
rename to dom/base/test/badHTTPResponseCode.eventsource^headers^
diff --git a/content/base/test/badMessageEvent.eventsource b/dom/base/test/badMessageEvent.eventsource
similarity index 100%
rename from content/base/test/badMessageEvent.eventsource
rename to dom/base/test/badMessageEvent.eventsource
diff --git a/content/base/test/badMessageEvent.eventsource^headers^ b/dom/base/test/badMessageEvent.eventsource^headers^
similarity index 100%
rename from content/base/test/badMessageEvent.eventsource^headers^
rename to dom/base/test/badMessageEvent.eventsource^headers^
diff --git a/content/base/test/badMessageEvent2.eventsource b/dom/base/test/badMessageEvent2.eventsource
similarity index 100%
rename from content/base/test/badMessageEvent2.eventsource
rename to dom/base/test/badMessageEvent2.eventsource
diff --git a/content/base/test/badMessageEvent2.eventsource^headers^ b/dom/base/test/badMessageEvent2.eventsource^headers^
similarity index 100%
rename from content/base/test/badMessageEvent2.eventsource^headers^
rename to dom/base/test/badMessageEvent2.eventsource^headers^
diff --git a/content/base/test/browser.ini b/dom/base/test/browser.ini
similarity index 100%
rename from content/base/test/browser.ini
rename to dom/base/test/browser.ini
diff --git a/content/base/test/browser_bug1058164.js b/dom/base/test/browser_bug1058164.js
similarity index 100%
rename from content/base/test/browser_bug1058164.js
rename to dom/base/test/browser_bug1058164.js
diff --git a/content/base/test/browser_bug593387.js b/dom/base/test/browser_bug593387.js
similarity index 90%
rename from content/base/test/browser_bug593387.js
rename to dom/base/test/browser_bug593387.js
index 13c8dcada64..6e7ca6da64f 100644
--- a/content/base/test/browser_bug593387.js
+++ b/dom/base/test/browser_bug593387.js
@@ -25,7 +25,7 @@ function testXFOFrameInChrome() {
   // Insert an iframe that specifies "X-Frame-Options: DENY" and verify
   // that it loads, since the top context is chrome
   var frame = newBrowser.contentDocument.createElement("iframe");
-  frame.src = "http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny";
+  frame.src = "http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny";
   frame.addEventListener("load", function() {
     frame.removeEventListener("load", arguments.callee, true);
 
@@ -48,7 +48,7 @@ function testXFOFrameInContent() {
   // Insert an iframe that specifies "X-Frame-Options: DENY" and verify that it
   // is blocked from loading since the top browsing context is another site
   var frame = newBrowser.contentDocument.createElement("iframe");
-  frame.src = "http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny";
+  frame.src = "http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny";
   frame.addEventListener("load", function() {
     frame.removeEventListener("load", arguments.callee, true);
 
diff --git a/content/base/test/browser_bug902350.js b/dom/base/test/browser_bug902350.js
similarity index 96%
rename from content/base/test/browser_bug902350.js
rename to dom/base/test/browser_bug902350.js
index 12b20fc22c3..48bc358f957 100644
--- a/content/base/test/browser_bug902350.js
+++ b/dom/base/test/browser_bug902350.js
@@ -4,7 +4,7 @@
 
 
 const PREF_ACTIVE = "security.mixed_content.block_active_content";
-const gHttpTestRoot = "https://example.com/tests/content/base/test/";
+const gHttpTestRoot = "https://example.com/tests/dom/base/test/";
 var origBlockActive;
 var gTestBrowser = null;
 
diff --git a/content/base/test/browser_state_notifications.js b/dom/base/test/browser_state_notifications.js
similarity index 100%
rename from content/base/test/browser_state_notifications.js
rename to dom/base/test/browser_state_notifications.js
diff --git a/content/base/test/bug282547.sjs b/dom/base/test/bug282547.sjs
similarity index 100%
rename from content/base/test/bug282547.sjs
rename to dom/base/test/bug282547.sjs
diff --git a/content/base/test/bug298064-subframe.html b/dom/base/test/bug298064-subframe.html
similarity index 100%
rename from content/base/test/bug298064-subframe.html
rename to dom/base/test/bug298064-subframe.html
diff --git a/content/base/test/bug313646.txt b/dom/base/test/bug313646.txt
similarity index 100%
rename from content/base/test/bug313646.txt
rename to dom/base/test/bug313646.txt
diff --git a/content/base/test/bug382113_object.html b/dom/base/test/bug382113_object.html
similarity index 100%
rename from content/base/test/bug382113_object.html
rename to dom/base/test/bug382113_object.html
diff --git a/content/base/test/bug419132.html b/dom/base/test/bug419132.html
similarity index 100%
rename from content/base/test/bug419132.html
rename to dom/base/test/bug419132.html
diff --git a/content/base/test/bug426308-redirect.sjs b/dom/base/test/bug426308-redirect.sjs
similarity index 100%
rename from content/base/test/bug426308-redirect.sjs
rename to dom/base/test/bug426308-redirect.sjs
diff --git a/content/base/test/bug435425.sjs b/dom/base/test/bug435425.sjs
similarity index 100%
rename from content/base/test/bug435425.sjs
rename to dom/base/test/bug435425.sjs
diff --git a/content/base/test/bug435425_redirect.sjs b/dom/base/test/bug435425_redirect.sjs
similarity index 100%
rename from content/base/test/bug435425_redirect.sjs
rename to dom/base/test/bug435425_redirect.sjs
diff --git a/content/base/test/bug444322.js b/dom/base/test/bug444322.js
similarity index 100%
rename from content/base/test/bug444322.js
rename to dom/base/test/bug444322.js
diff --git a/content/base/test/bug444322.txt b/dom/base/test/bug444322.txt
similarity index 100%
rename from content/base/test/bug444322.txt
rename to dom/base/test/bug444322.txt
diff --git a/content/base/test/bug444546.sjs b/dom/base/test/bug444546.sjs
similarity index 100%
rename from content/base/test/bug444546.sjs
rename to dom/base/test/bug444546.sjs
diff --git a/content/base/test/bug455629-helper.svg b/dom/base/test/bug455629-helper.svg
similarity index 100%
rename from content/base/test/bug455629-helper.svg
rename to dom/base/test/bug455629-helper.svg
diff --git a/content/base/test/bug457746.sjs b/dom/base/test/bug457746.sjs
similarity index 100%
rename from content/base/test/bug457746.sjs
rename to dom/base/test/bug457746.sjs
diff --git a/content/base/test/bug461735-post-redirect.js b/dom/base/test/bug461735-post-redirect.js
similarity index 100%
rename from content/base/test/bug461735-post-redirect.js
rename to dom/base/test/bug461735-post-redirect.js
diff --git a/dom/base/test/bug461735-redirect1.sjs b/dom/base/test/bug461735-redirect1.sjs
new file mode 100644
index 00000000000..a31eb066a3b
--- /dev/null
+++ b/dom/base/test/bug461735-redirect1.sjs
@@ -0,0 +1,4 @@
+function handleRequest(request, response) {
+  response.setStatusLine(null, 302, "Found");
+  response.setHeader("Location", "http://example.com/tests/dom/base/test/bug461735-post-redirect.js", false);
+}
diff --git a/dom/base/test/bug461735-redirect2.sjs b/dom/base/test/bug461735-redirect2.sjs
new file mode 100644
index 00000000000..cfd9299785c
--- /dev/null
+++ b/dom/base/test/bug461735-redirect2.sjs
@@ -0,0 +1,4 @@
+function handleRequest(request, response) {
+  response.setStatusLine(null, 302, "Found");
+  response.setHeader("Location", "http://mochi.test:8888/tests/dom/base/test/bug461735-post-redirect.js", false);
+}
diff --git a/content/base/test/bug466080.sjs b/dom/base/test/bug466080.sjs
similarity index 100%
rename from content/base/test/bug466080.sjs
rename to dom/base/test/bug466080.sjs
diff --git a/content/base/test/bug466409-empty.css b/dom/base/test/bug466409-empty.css
similarity index 100%
rename from content/base/test/bug466409-empty.css
rename to dom/base/test/bug466409-empty.css
diff --git a/content/base/test/bug466409-page.html b/dom/base/test/bug466409-page.html
similarity index 100%
rename from content/base/test/bug466409-page.html
rename to dom/base/test/bug466409-page.html
diff --git a/content/base/test/bug475156.sjs b/dom/base/test/bug475156.sjs
similarity index 100%
rename from content/base/test/bug475156.sjs
rename to dom/base/test/bug475156.sjs
diff --git a/content/base/test/bug482935.sjs b/dom/base/test/bug482935.sjs
similarity index 100%
rename from content/base/test/bug482935.sjs
rename to dom/base/test/bug482935.sjs
diff --git a/content/base/test/bug540854.sjs b/dom/base/test/bug540854.sjs
similarity index 100%
rename from content/base/test/bug540854.sjs
rename to dom/base/test/bug540854.sjs
diff --git a/content/base/test/bug578096LoadChromeScript.js b/dom/base/test/bug578096LoadChromeScript.js
similarity index 100%
rename from content/base/test/bug578096LoadChromeScript.js
rename to dom/base/test/bug578096LoadChromeScript.js
diff --git a/content/base/test/bug638112-response.txt b/dom/base/test/bug638112-response.txt
similarity index 100%
rename from content/base/test/bug638112-response.txt
rename to dom/base/test/bug638112-response.txt
diff --git a/content/base/test/bug638112.sjs b/dom/base/test/bug638112.sjs
similarity index 90%
rename from content/base/test/bug638112.sjs
rename to dom/base/test/bug638112.sjs
index a3ec1e86f8f..3b4f8331b27 100644
--- a/content/base/test/bug638112.sjs
+++ b/dom/base/test/bug638112.sjs
@@ -17,7 +17,7 @@ function getInputStream(path)
 
 function handleRequest(request, response)
 {
-  var inputStream = getInputStream("tests/content/base/test/bug638112-response.txt")
+  var inputStream = getInputStream("tests/dom/base/test/bug638112-response.txt")
   response.seizePower();
   response.bodyOutputStream.writeFrom(inputStream,
                                       inputStream.available());
diff --git a/content/base/test/bug682592-subframe-ref.html b/dom/base/test/bug682592-subframe-ref.html
similarity index 100%
rename from content/base/test/bug682592-subframe-ref.html
rename to dom/base/test/bug682592-subframe-ref.html
diff --git a/content/base/test/bug682592-subframe.html b/dom/base/test/bug682592-subframe.html
similarity index 100%
rename from content/base/test/bug682592-subframe.html
rename to dom/base/test/bug682592-subframe.html
diff --git a/content/base/test/bug696301-script-1.js b/dom/base/test/bug696301-script-1.js
similarity index 100%
rename from content/base/test/bug696301-script-1.js
rename to dom/base/test/bug696301-script-1.js
diff --git a/content/base/test/bug696301-script-1.js^headers^ b/dom/base/test/bug696301-script-1.js^headers^
similarity index 100%
rename from content/base/test/bug696301-script-1.js^headers^
rename to dom/base/test/bug696301-script-1.js^headers^
diff --git a/content/base/test/bug696301-script-2.js b/dom/base/test/bug696301-script-2.js
similarity index 100%
rename from content/base/test/bug696301-script-2.js
rename to dom/base/test/bug696301-script-2.js
diff --git a/content/base/test/bug803225_test_mailto.html b/dom/base/test/bug803225_test_mailto.html
similarity index 100%
rename from content/base/test/bug803225_test_mailto.html
rename to dom/base/test/bug803225_test_mailto.html
diff --git a/content/base/test/bug819051.sjs b/dom/base/test/bug819051.sjs
similarity index 100%
rename from content/base/test/bug819051.sjs
rename to dom/base/test/bug819051.sjs
diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini
index 346a84555e5..779d7082659 100644
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -12,3 +12,8 @@ support-files =
 [test_navigator_resolve_identity_xrays.xul]
 [test_sendQueryContentAndSelectionSetEvent.html]
 [test_bug1016960.html]
+[test_bug357450.js]
+[test_copypaste.xul]
+[test_messagemanager_principal.html]
+[test_messagemanager_send_principal.html]
+skip-if = buildapp == 'mulet'
diff --git a/content/base/test/chrome/blockNoPlugins.xml b/dom/base/test/chrome/blockNoPlugins.xml
similarity index 100%
rename from content/base/test/chrome/blockNoPlugins.xml
rename to dom/base/test/chrome/blockNoPlugins.xml
diff --git a/content/base/test/chrome/blockPluginHard.xml b/dom/base/test/chrome/blockPluginHard.xml
similarity index 100%
rename from content/base/test/chrome/blockPluginHard.xml
rename to dom/base/test/chrome/blockPluginHard.xml
diff --git a/content/base/test/chrome/bug421622-referer.sjs b/dom/base/test/chrome/bug421622-referer.sjs
similarity index 100%
rename from content/base/test/chrome/bug421622-referer.sjs
rename to dom/base/test/chrome/bug421622-referer.sjs
diff --git a/content/base/test/chrome/chrome.ini b/dom/base/test/chrome/chrome.ini
similarity index 100%
rename from content/base/test/chrome/chrome.ini
rename to dom/base/test/chrome/chrome.ini
diff --git a/content/base/test/chrome/cpows_child.js b/dom/base/test/chrome/cpows_child.js
similarity index 100%
rename from content/base/test/chrome/cpows_child.js
rename to dom/base/test/chrome/cpows_child.js
diff --git a/content/base/test/chrome/cpows_parent.xul b/dom/base/test/chrome/cpows_parent.xul
similarity index 99%
rename from content/base/test/chrome/cpows_parent.xul
rename to dom/base/test/chrome/cpows_parent.xul
index 73876f63f01..2e4c87dc016 100644
--- a/content/base/test/chrome/cpows_parent.xul
+++ b/dom/base/test/chrome/cpows_parent.xul
@@ -320,7 +320,7 @@
       mm.addMessageListener("cpows:regexp_test", recvRegExpTest);
       mm.addMessageListener("cpows:lifetime_test_1", recvLifetimeTest1);
       mm.addMessageListener("cpows:lifetime_test_2", recvLifetimeTest2);
-      mm.loadFrameScript("chrome://mochitests/content/chrome/content/base/test/chrome/cpows_child.js", true);
+      mm.loadFrameScript("chrome://mochitests/content/chrome/dom/base/test/chrome/cpows_child.js", true);
     }
 
     function start() {
diff --git a/content/base/test/chrome/file_bug391728.html b/dom/base/test/chrome/file_bug391728.html
similarity index 100%
rename from content/base/test/chrome/file_bug391728.html
rename to dom/base/test/chrome/file_bug391728.html
diff --git a/content/base/test/chrome/file_bug391728_2.html b/dom/base/test/chrome/file_bug391728_2.html
similarity index 100%
rename from content/base/test/chrome/file_bug391728_2.html
rename to dom/base/test/chrome/file_bug391728_2.html
diff --git a/content/base/test/chrome/file_bug549682.xul b/dom/base/test/chrome/file_bug549682.xul
similarity index 100%
rename from content/base/test/chrome/file_bug549682.xul
rename to dom/base/test/chrome/file_bug549682.xul
diff --git a/content/base/test/chrome/file_bug616841.xul b/dom/base/test/chrome/file_bug616841.xul
similarity index 100%
rename from content/base/test/chrome/file_bug616841.xul
rename to dom/base/test/chrome/file_bug616841.xul
diff --git a/content/base/test/chrome/file_bug816340.xul b/dom/base/test/chrome/file_bug816340.xul
similarity index 100%
rename from content/base/test/chrome/file_bug816340.xul
rename to dom/base/test/chrome/file_bug816340.xul
diff --git a/content/base/test/chrome/file_bug990812-1.xul b/dom/base/test/chrome/file_bug990812-1.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812-1.xul
rename to dom/base/test/chrome/file_bug990812-1.xul
diff --git a/content/base/test/chrome/file_bug990812-2.xul b/dom/base/test/chrome/file_bug990812-2.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812-2.xul
rename to dom/base/test/chrome/file_bug990812-2.xul
diff --git a/content/base/test/chrome/file_bug990812-3.xul b/dom/base/test/chrome/file_bug990812-3.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812-3.xul
rename to dom/base/test/chrome/file_bug990812-3.xul
diff --git a/content/base/test/chrome/file_bug990812-4.xul b/dom/base/test/chrome/file_bug990812-4.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812-4.xul
rename to dom/base/test/chrome/file_bug990812-4.xul
diff --git a/content/base/test/chrome/file_bug990812-5.xul b/dom/base/test/chrome/file_bug990812-5.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812-5.xul
rename to dom/base/test/chrome/file_bug990812-5.xul
diff --git a/content/base/test/chrome/file_bug990812.xul b/dom/base/test/chrome/file_bug990812.xul
similarity index 100%
rename from content/base/test/chrome/file_bug990812.xul
rename to dom/base/test/chrome/file_bug990812.xul
diff --git a/content/base/test/chrome/fileconstructor_file.png b/dom/base/test/chrome/fileconstructor_file.png
similarity index 100%
rename from content/base/test/chrome/fileconstructor_file.png
rename to dom/base/test/chrome/fileconstructor_file.png
diff --git a/content/base/test/chrome/frame_bug814638.xul b/dom/base/test/chrome/frame_bug814638.xul
similarity index 100%
rename from content/base/test/chrome/frame_bug814638.xul
rename to dom/base/test/chrome/frame_bug814638.xul
diff --git a/content/base/test/chrome/host_bug814638.xul b/dom/base/test/chrome/host_bug814638.xul
similarity index 100%
rename from content/base/test/chrome/host_bug814638.xul
rename to dom/base/test/chrome/host_bug814638.xul
diff --git a/content/base/test/chrome/mochitest.ini b/dom/base/test/chrome/mochitest.ini
similarity index 100%
rename from content/base/test/chrome/mochitest.ini
rename to dom/base/test/chrome/mochitest.ini
diff --git a/content/base/test/chrome/nochrome_bug765993.html b/dom/base/test/chrome/nochrome_bug765993.html
similarity index 100%
rename from content/base/test/chrome/nochrome_bug765993.html
rename to dom/base/test/chrome/nochrome_bug765993.html
diff --git a/content/base/test/chrome/nochrome_bug765993.js b/dom/base/test/chrome/nochrome_bug765993.js
similarity index 100%
rename from content/base/test/chrome/nochrome_bug765993.js
rename to dom/base/test/chrome/nochrome_bug765993.js
diff --git a/content/base/test/chrome/nochrome_bug765993.js^headers^ b/dom/base/test/chrome/nochrome_bug765993.js^headers^
similarity index 100%
rename from content/base/test/chrome/nochrome_bug765993.js^headers^
rename to dom/base/test/chrome/nochrome_bug765993.js^headers^
diff --git a/content/base/test/chrome/test_bug1063837.xul b/dom/base/test/chrome/test_bug1063837.xul
similarity index 100%
rename from content/base/test/chrome/test_bug1063837.xul
rename to dom/base/test/chrome/test_bug1063837.xul
diff --git a/content/base/test/chrome/test_bug206691.xul b/dom/base/test/chrome/test_bug206691.xul
similarity index 100%
rename from content/base/test/chrome/test_bug206691.xul
rename to dom/base/test/chrome/test_bug206691.xul
diff --git a/content/base/test/chrome/test_bug339494.xul b/dom/base/test/chrome/test_bug339494.xul
similarity index 100%
rename from content/base/test/chrome/test_bug339494.xul
rename to dom/base/test/chrome/test_bug339494.xul
diff --git a/content/base/test/chrome/test_bug357450.xul b/dom/base/test/chrome/test_bug357450.xul
similarity index 100%
rename from content/base/test/chrome/test_bug357450.xul
rename to dom/base/test/chrome/test_bug357450.xul
diff --git a/content/base/test/chrome/test_bug380418.html b/dom/base/test/chrome/test_bug380418.html
similarity index 100%
rename from content/base/test/chrome/test_bug380418.html
rename to dom/base/test/chrome/test_bug380418.html
diff --git a/content/base/test/chrome/test_bug380418.html^headers^ b/dom/base/test/chrome/test_bug380418.html^headers^
similarity index 100%
rename from content/base/test/chrome/test_bug380418.html^headers^
rename to dom/base/test/chrome/test_bug380418.html^headers^
diff --git a/content/base/test/chrome/test_bug383430.html b/dom/base/test/chrome/test_bug383430.html
similarity index 100%
rename from content/base/test/chrome/test_bug383430.html
rename to dom/base/test/chrome/test_bug383430.html
diff --git a/content/base/test/chrome/test_bug391728.html b/dom/base/test/chrome/test_bug391728.html
similarity index 100%
rename from content/base/test/chrome/test_bug391728.html
rename to dom/base/test/chrome/test_bug391728.html
diff --git a/content/base/test/chrome/test_bug421622.xul b/dom/base/test/chrome/test_bug421622.xul
similarity index 92%
rename from content/base/test/chrome/test_bug421622.xul
rename to dom/base/test/chrome/test_bug421622.xul
index 6fa4c8d68f2..abbb9f2d59b 100644
--- a/content/base/test/chrome/test_bug421622.xul
+++ b/dom/base/test/chrome/test_bug421622.xul
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=421622
   <script type="application/javascript"><![CDATA[
 
     /** Test for Bug 421622 **/
-    const SJS_URL = "http://mochi.test:8888/tests/content/base/test/chrome/bug421622-referer.sjs";
+    const SJS_URL = "http://mochi.test:8888/tests/dom/base/test/chrome/bug421622-referer.sjs";
     const REFERER_URL = "http://www.mozilla.org/";
 
     var req = new XMLHttpRequest();
diff --git a/content/base/test/chrome/test_bug429785.xul b/dom/base/test/chrome/test_bug429785.xul
similarity index 100%
rename from content/base/test/chrome/test_bug429785.xul
rename to dom/base/test/chrome/test_bug429785.xul
diff --git a/content/base/test/chrome/test_bug430050.xul b/dom/base/test/chrome/test_bug430050.xul
similarity index 100%
rename from content/base/test/chrome/test_bug430050.xul
rename to dom/base/test/chrome/test_bug430050.xul
diff --git a/content/base/test/chrome/test_bug467123.xul b/dom/base/test/chrome/test_bug467123.xul
similarity index 100%
rename from content/base/test/chrome/test_bug467123.xul
rename to dom/base/test/chrome/test_bug467123.xul
diff --git a/content/base/test/chrome/test_bug549682.xul b/dom/base/test/chrome/test_bug549682.xul
similarity index 100%
rename from content/base/test/chrome/test_bug549682.xul
rename to dom/base/test/chrome/test_bug549682.xul
diff --git a/content/base/test/chrome/test_bug571390.xul b/dom/base/test/chrome/test_bug571390.xul
similarity index 100%
rename from content/base/test/chrome/test_bug571390.xul
rename to dom/base/test/chrome/test_bug571390.xul
diff --git a/content/base/test/chrome/test_bug574596.html b/dom/base/test/chrome/test_bug574596.html
similarity index 100%
rename from content/base/test/chrome/test_bug574596.html
rename to dom/base/test/chrome/test_bug574596.html
diff --git a/content/base/test/chrome/test_bug599295.html b/dom/base/test/chrome/test_bug599295.html
similarity index 100%
rename from content/base/test/chrome/test_bug599295.html
rename to dom/base/test/chrome/test_bug599295.html
diff --git a/content/base/test/chrome/test_bug616841.xul b/dom/base/test/chrome/test_bug616841.xul
similarity index 100%
rename from content/base/test/chrome/test_bug616841.xul
rename to dom/base/test/chrome/test_bug616841.xul
diff --git a/content/base/test/chrome/test_bug635835.xul b/dom/base/test/chrome/test_bug635835.xul
similarity index 100%
rename from content/base/test/chrome/test_bug635835.xul
rename to dom/base/test/chrome/test_bug635835.xul
diff --git a/content/base/test/chrome/test_bug650776.html b/dom/base/test/chrome/test_bug650776.html
similarity index 100%
rename from content/base/test/chrome/test_bug650776.html
rename to dom/base/test/chrome/test_bug650776.html
diff --git a/content/base/test/chrome/test_bug650784.html b/dom/base/test/chrome/test_bug650784.html
similarity index 100%
rename from content/base/test/chrome/test_bug650784.html
rename to dom/base/test/chrome/test_bug650784.html
diff --git a/content/base/test/chrome/test_bug682305.html b/dom/base/test/chrome/test_bug682305.html
similarity index 100%
rename from content/base/test/chrome/test_bug682305.html
rename to dom/base/test/chrome/test_bug682305.html
diff --git a/content/base/test/chrome/test_bug683852.xul b/dom/base/test/chrome/test_bug683852.xul
similarity index 100%
rename from content/base/test/chrome/test_bug683852.xul
rename to dom/base/test/chrome/test_bug683852.xul
diff --git a/content/base/test/chrome/test_bug750096.html b/dom/base/test/chrome/test_bug750096.html
similarity index 100%
rename from content/base/test/chrome/test_bug750096.html
rename to dom/base/test/chrome/test_bug750096.html
diff --git a/content/base/test/chrome/test_bug752226-3.xul b/dom/base/test/chrome/test_bug752226-3.xul
similarity index 100%
rename from content/base/test/chrome/test_bug752226-3.xul
rename to dom/base/test/chrome/test_bug752226-3.xul
diff --git a/content/base/test/chrome/test_bug752226-4.xul b/dom/base/test/chrome/test_bug752226-4.xul
similarity index 100%
rename from content/base/test/chrome/test_bug752226-4.xul
rename to dom/base/test/chrome/test_bug752226-4.xul
diff --git a/content/base/test/chrome/test_bug765993.html b/dom/base/test/chrome/test_bug765993.html
similarity index 86%
rename from content/base/test/chrome/test_bug765993.html
rename to dom/base/test/chrome/test_bug765993.html
index 26c39d0f2c3..1e94b34417a 100644
--- a/content/base/test/chrome/test_bug765993.html
+++ b/dom/base/test/chrome/test_bug765993.html
@@ -33,16 +33,16 @@ window.onload = function () {
     SimpleTest.waitForExplicitFinish();
 
     var iframe = document.createElement("iframe");
-    iframe.src = "http://mochi.test:8888/tests/content/base/test/chrome/nochrome_bug765993.html";
+    iframe.src = "http://mochi.test:8888/tests/dom/base/test/chrome/nochrome_bug765993.html";
     iframe.onload = function () {
         var script = iframe.contentWindow.document.createElement("script");
-        script.src = "http://mochi.test:8888/tests/content/base/test/chrome/nochrome_bug765993.js";
+        script.src = "http://mochi.test:8888/tests/dom/base/test/chrome/nochrome_bug765993.js";
         script.onload = function () {
             var dbg = new Debugger(iframe.contentWindow);
             ok(dbg, "Should be able to create debugger");
 
             var scripts = dbg.findScripts({
-                url: "http://mochi.test:8888/tests/content/base/test/chrome/nochrome_bug765993.js"
+                url: "http://mochi.test:8888/tests/dom/base/test/chrome/nochrome_bug765993.js"
             });
             ok(scripts.length > 0, "Should be able to find script");
 
diff --git a/content/base/test/chrome/test_bug780199.xul b/dom/base/test/chrome/test_bug780199.xul
similarity index 100%
rename from content/base/test/chrome/test_bug780199.xul
rename to dom/base/test/chrome/test_bug780199.xul
diff --git a/content/base/test/chrome/test_bug780529.xul b/dom/base/test/chrome/test_bug780529.xul
similarity index 100%
rename from content/base/test/chrome/test_bug780529.xul
rename to dom/base/test/chrome/test_bug780529.xul
diff --git a/content/base/test/chrome/test_bug800386.xul b/dom/base/test/chrome/test_bug800386.xul
similarity index 100%
rename from content/base/test/chrome/test_bug800386.xul
rename to dom/base/test/chrome/test_bug800386.xul
diff --git a/content/base/test/chrome/test_bug814638.xul b/dom/base/test/chrome/test_bug814638.xul
similarity index 95%
rename from content/base/test/chrome/test_bug814638.xul
rename to dom/base/test/chrome/test_bug814638.xul
index 86fcec71e8f..f507099c980 100644
--- a/content/base/test/chrome/test_bug814638.xul
+++ b/dom/base/test/chrome/test_bug814638.xul
@@ -22,7 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=814638
   SimpleTest.waitForExplicitFinish();
 
   function startTest() {
-    let hostURL = "chrome://mochitests/content/chrome/content/base/test/chrome/host_bug814638.xul";
+    let hostURL = "chrome://mochitests/content/chrome/dom/base/test/chrome/host_bug814638.xul";
     let host1 = window.open(hostURL, "_blank", "chrome");
     let host2 = window.open(hostURL, "_blank", "chrome");
 
diff --git a/content/base/test/chrome/test_bug816340.xul b/dom/base/test/chrome/test_bug816340.xul
similarity index 100%
rename from content/base/test/chrome/test_bug816340.xul
rename to dom/base/test/chrome/test_bug816340.xul
diff --git a/content/base/test/chrome/test_bug914381.html b/dom/base/test/chrome/test_bug914381.html
similarity index 100%
rename from content/base/test/chrome/test_bug914381.html
rename to dom/base/test/chrome/test_bug914381.html
diff --git a/content/base/test/chrome/test_bug990812.xul b/dom/base/test/chrome/test_bug990812.xul
similarity index 100%
rename from content/base/test/chrome/test_bug990812.xul
rename to dom/base/test/chrome/test_bug990812.xul
diff --git a/content/base/test/chrome/test_cpows.xul b/dom/base/test/chrome/test_cpows.xul
similarity index 100%
rename from content/base/test/chrome/test_cpows.xul
rename to dom/base/test/chrome/test_cpows.xul
diff --git a/content/base/test/chrome/test_document_register.xul b/dom/base/test/chrome/test_document_register.xul
similarity index 100%
rename from content/base/test/chrome/test_document_register.xul
rename to dom/base/test/chrome/test_document_register.xul
diff --git a/content/base/test/chrome/test_domparsing.xul b/dom/base/test/chrome/test_domparsing.xul
similarity index 100%
rename from content/base/test/chrome/test_domparsing.xul
rename to dom/base/test/chrome/test_domparsing.xul
diff --git a/content/base/test/chrome/test_fileconstructor.xul b/dom/base/test/chrome/test_fileconstructor.xul
similarity index 95%
rename from content/base/test/chrome/test_fileconstructor.xul
rename to dom/base/test/chrome/test_fileconstructor.xul
index 8ace31e8b72..d2d2985a139 100644
--- a/content/base/test/chrome/test_fileconstructor.xul
+++ b/dom/base/test/chrome/test_fileconstructor.xul
@@ -36,7 +36,7 @@ var file = Components.classes["@mozilla.org/file/directory_service;1"]
 
 // man I wish this were simpler ...
 file.append("chrome");
-file.append("content");
+file.append("dom");
 file.append("base");
 file.append("test");
 file.append("chrome");
diff --git a/content/base/test/chrome/test_fileconstructor_tempfile.xul b/dom/base/test/chrome/test_fileconstructor_tempfile.xul
similarity index 100%
rename from content/base/test/chrome/test_fileconstructor_tempfile.xul
rename to dom/base/test/chrome/test_fileconstructor_tempfile.xul
diff --git a/content/base/test/chrome/test_title.xul b/dom/base/test/chrome/test_title.xul
similarity index 100%
rename from content/base/test/chrome/test_title.xul
rename to dom/base/test/chrome/test_title.xul
diff --git a/content/base/test/chrome/title_window.xul b/dom/base/test/chrome/title_window.xul
similarity index 100%
rename from content/base/test/chrome/title_window.xul
rename to dom/base/test/chrome/title_window.xul
diff --git a/content/base/test/copypaste.js b/dom/base/test/copypaste.js
similarity index 100%
rename from content/base/test/copypaste.js
rename to dom/base/test/copypaste.js
diff --git a/content/base/test/csp/chrome.ini b/dom/base/test/csp/chrome.ini
similarity index 100%
rename from content/base/test/csp/chrome.ini
rename to dom/base/test/csp/chrome.ini
diff --git a/content/base/test/csp/file_CSP.css b/dom/base/test/csp/file_CSP.css
similarity index 82%
rename from content/base/test/csp/file_CSP.css
rename to dom/base/test/csp/file_CSP.css
index f83930e541c..35fcd6f5fd1 100644
--- a/content/base/test/csp/file_CSP.css
+++ b/dom/base/test/csp/file_CSP.css
@@ -12,7 +12,7 @@
 }
 @font-face {
   font-family: "arbitrary_bad";
-  src: url('http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
+  src: url('http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
 }
 
 .div_arbitrary_good { font-family: "arbitrary_good"; }
diff --git a/content/base/test/csp/file_CSP.sjs b/dom/base/test/csp/file_CSP.sjs
similarity index 100%
rename from content/base/test/csp/file_CSP.sjs
rename to dom/base/test/csp/file_CSP.sjs
diff --git a/content/base/test/csp/file_CSP_bug663567.xsl b/dom/base/test/csp/file_CSP_bug663567.xsl
similarity index 100%
rename from content/base/test/csp/file_CSP_bug663567.xsl
rename to dom/base/test/csp/file_CSP_bug663567.xsl
diff --git a/content/base/test/csp/file_CSP_bug663567_allows.xml b/dom/base/test/csp/file_CSP_bug663567_allows.xml
similarity index 100%
rename from content/base/test/csp/file_CSP_bug663567_allows.xml
rename to dom/base/test/csp/file_CSP_bug663567_allows.xml
diff --git a/content/base/test/csp/file_CSP_bug663567_allows.xml^headers^ b/dom/base/test/csp/file_CSP_bug663567_allows.xml^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug663567_allows.xml^headers^
rename to dom/base/test/csp/file_CSP_bug663567_allows.xml^headers^
diff --git a/content/base/test/csp/file_CSP_bug663567_blocks.xml b/dom/base/test/csp/file_CSP_bug663567_blocks.xml
similarity index 100%
rename from content/base/test/csp/file_CSP_bug663567_blocks.xml
rename to dom/base/test/csp/file_CSP_bug663567_blocks.xml
diff --git a/content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ b/dom/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
rename to dom/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
diff --git a/content/base/test/csp/file_CSP_bug802872.html b/dom/base/test/csp/file_CSP_bug802872.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug802872.html
rename to dom/base/test/csp/file_CSP_bug802872.html
diff --git a/content/base/test/csp/file_CSP_bug802872.html^headers^ b/dom/base/test/csp/file_CSP_bug802872.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug802872.html^headers^
rename to dom/base/test/csp/file_CSP_bug802872.html^headers^
diff --git a/content/base/test/csp/file_CSP_bug802872.js b/dom/base/test/csp/file_CSP_bug802872.js
similarity index 88%
rename from content/base/test/csp/file_CSP_bug802872.js
rename to dom/base/test/csp/file_CSP_bug802872.js
index c4c2783923a..febea0c8557 100644
--- a/content/base/test/csp/file_CSP_bug802872.js
+++ b/dom/base/test/csp/file_CSP_bug802872.js
@@ -8,7 +8,7 @@ function createAllowedEvent() {
    * Creates a new EventSource using 'http://mochi.test:8888'. Since all mochitests run on
    * 'http://mochi.test', a default-src of 'self' allows this request.
    */
-  var src_event = new EventSource("http://mochi.test:8888/tests/content/base/test/csp/file_CSP_bug802872.sjs");
+  var src_event = new EventSource("http://mochi.test:8888/tests/dom/base/test/csp/file_CSP_bug802872.sjs");
 
   src_event.onmessage = function(e) {
     src_event.close();
@@ -26,7 +26,7 @@ function createBlockedEvent() {
    * creates a new EventSource using 'http://example.com'. This domain is not whitelisted by the 
    * CSP of this page, therefore the CSP blocks this request.
    */
-  var src_event = new EventSource("http://example.com/tests/content/base/test/csp/file_CSP_bug802872.sjs");
+  var src_event = new EventSource("http://example.com/tests/dom/base/test/csp/file_CSP_bug802872.sjs");
 
   src_event.onmessage = function(e) {
     src_event.close();
diff --git a/content/base/test/csp/file_CSP_bug802872.sjs b/dom/base/test/csp/file_CSP_bug802872.sjs
similarity index 100%
rename from content/base/test/csp/file_CSP_bug802872.sjs
rename to dom/base/test/csp/file_CSP_bug802872.sjs
diff --git a/content/base/test/csp/file_CSP_bug885433_allows.html b/dom/base/test/csp/file_CSP_bug885433_allows.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug885433_allows.html
rename to dom/base/test/csp/file_CSP_bug885433_allows.html
diff --git a/content/base/test/csp/file_CSP_bug885433_allows.html^headers^ b/dom/base/test/csp/file_CSP_bug885433_allows.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug885433_allows.html^headers^
rename to dom/base/test/csp/file_CSP_bug885433_allows.html^headers^
diff --git a/content/base/test/csp/file_CSP_bug885433_blocks.html b/dom/base/test/csp/file_CSP_bug885433_blocks.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug885433_blocks.html
rename to dom/base/test/csp/file_CSP_bug885433_blocks.html
diff --git a/content/base/test/csp/file_CSP_bug885433_blocks.html^headers^ b/dom/base/test/csp/file_CSP_bug885433_blocks.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug885433_blocks.html^headers^
rename to dom/base/test/csp/file_CSP_bug885433_blocks.html^headers^
diff --git a/content/base/test/csp/file_CSP_bug888172.html b/dom/base/test/csp/file_CSP_bug888172.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug888172.html
rename to dom/base/test/csp/file_CSP_bug888172.html
diff --git a/content/base/test/csp/file_CSP_bug888172.sjs b/dom/base/test/csp/file_CSP_bug888172.sjs
similarity index 94%
rename from content/base/test/csp/file_CSP_bug888172.sjs
rename to dom/base/test/csp/file_CSP_bug888172.sjs
index 8f06f516bfe..7427f415b7c 100644
--- a/content/base/test/csp/file_CSP_bug888172.sjs
+++ b/dom/base/test/csp/file_CSP_bug888172.sjs
@@ -39,5 +39,5 @@ function handleRequest(request, response)
 
   // Send HTML to test allowed/blocked behaviors
   response.setHeader("Content-Type", "text/html", false);
-  response.write(loadHTMLFromFile("tests/content/base/test/csp/file_CSP_bug888172.html"));
+  response.write(loadHTMLFromFile("tests/dom/base/test/csp/file_CSP_bug888172.html"));
 }
diff --git a/content/base/test/csp/file_CSP_bug909029_none.html b/dom/base/test/csp/file_CSP_bug909029_none.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug909029_none.html
rename to dom/base/test/csp/file_CSP_bug909029_none.html
diff --git a/content/base/test/csp/file_CSP_bug909029_none.html^headers^ b/dom/base/test/csp/file_CSP_bug909029_none.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug909029_none.html^headers^
rename to dom/base/test/csp/file_CSP_bug909029_none.html^headers^
diff --git a/content/base/test/csp/file_CSP_bug909029_star.html b/dom/base/test/csp/file_CSP_bug909029_star.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug909029_star.html
rename to dom/base/test/csp/file_CSP_bug909029_star.html
diff --git a/content/base/test/csp/file_CSP_bug909029_star.html^headers^ b/dom/base/test/csp/file_CSP_bug909029_star.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug909029_star.html^headers^
rename to dom/base/test/csp/file_CSP_bug909029_star.html^headers^
diff --git a/content/base/test/csp/file_CSP_bug910139.sjs b/dom/base/test/csp/file_CSP_bug910139.sjs
similarity index 94%
rename from content/base/test/csp/file_CSP_bug910139.sjs
rename to dom/base/test/csp/file_CSP_bug910139.sjs
index a61f4a5de26..6ca39ba1063 100644
--- a/content/base/test/csp/file_CSP_bug910139.sjs
+++ b/dom/base/test/csp/file_CSP_bug910139.sjs
@@ -48,5 +48,5 @@ function handleRequest(request, response)
   response.setHeader("Content-Security-Policy", getPolicy(), false);
 
   // return the requested XML file.
-  response.write(loadResponseFromFile("tests/content/base/test/csp/file_CSP_bug910139.xml"));
+  response.write(loadResponseFromFile("tests/dom/base/test/csp/file_CSP_bug910139.xml"));
 }
diff --git a/content/base/test/csp/file_CSP_bug910139.xml b/dom/base/test/csp/file_CSP_bug910139.xml
similarity index 100%
rename from content/base/test/csp/file_CSP_bug910139.xml
rename to dom/base/test/csp/file_CSP_bug910139.xml
diff --git a/content/base/test/csp/file_CSP_bug910139.xsl b/dom/base/test/csp/file_CSP_bug910139.xsl
similarity index 100%
rename from content/base/test/csp/file_CSP_bug910139.xsl
rename to dom/base/test/csp/file_CSP_bug910139.xsl
diff --git a/content/base/test/csp/file_CSP_bug941404.html b/dom/base/test/csp/file_CSP_bug941404.html
similarity index 72%
rename from content/base/test/csp/file_CSP_bug941404.html
rename to dom/base/test/csp/file_CSP_bug941404.html
index 94f4499c3c8..5f11f233fcc 100644
--- a/content/base/test/csp/file_CSP_bug941404.html
+++ b/dom/base/test/csp/file_CSP_bug941404.html
@@ -3,7 +3,7 @@
   <body>
 
     <!-- this should be allowed (no CSP)-->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img_good&type=img/png"> </img>
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img_good&type=img/png"> </img>
 
 
     <script type="text/javascript">
@@ -12,7 +12,7 @@
         //this should be allowed (no CSP)
         try {
         var img = document.createElement("img");
-        img.src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img2_good&type=img/png";
+        img.src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img2_good&type=img/png";
         document.body.appendChild(img);
         } catch(e) {
           console.log("yo: "+e);
diff --git a/content/base/test/csp/file_CSP_bug941404_xhr.html b/dom/base/test/csp/file_CSP_bug941404_xhr.html
similarity index 100%
rename from content/base/test/csp/file_CSP_bug941404_xhr.html
rename to dom/base/test/csp/file_CSP_bug941404_xhr.html
diff --git a/content/base/test/csp/file_CSP_bug941404_xhr.html^headers^ b/dom/base/test/csp/file_CSP_bug941404_xhr.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_bug941404_xhr.html^headers^
rename to dom/base/test/csp/file_CSP_bug941404_xhr.html^headers^
diff --git a/content/base/test/csp/file_CSP_evalscript_main.html b/dom/base/test/csp/file_CSP_evalscript_main.html
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main.html
rename to dom/base/test/csp/file_CSP_evalscript_main.html
diff --git a/content/base/test/csp/file_CSP_evalscript_main.html^headers^ b/dom/base/test/csp/file_CSP_evalscript_main.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename to dom/base/test/csp/file_CSP_evalscript_main.html^headers^
diff --git a/content/base/test/csp/file_CSP_evalscript_main.js b/dom/base/test/csp/file_CSP_evalscript_main.js
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main.js
rename to dom/base/test/csp/file_CSP_evalscript_main.js
diff --git a/content/base/test/csp/file_CSP_evalscript_main_allowed.html b/dom/base/test/csp/file_CSP_evalscript_main_allowed.html
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main_allowed.html
rename to dom/base/test/csp/file_CSP_evalscript_main_allowed.html
diff --git a/content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^ b/dom/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
rename to dom/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
diff --git a/content/base/test/csp/file_CSP_evalscript_main_allowed.js b/dom/base/test/csp/file_CSP_evalscript_main_allowed.js
similarity index 100%
rename from content/base/test/csp/file_CSP_evalscript_main_allowed.js
rename to dom/base/test/csp/file_CSP_evalscript_main_allowed.js
diff --git a/content/base/test/csp/file_CSP_frameancestors.sjs b/dom/base/test/csp/file_CSP_frameancestors.sjs
similarity index 100%
rename from content/base/test/csp/file_CSP_frameancestors.sjs
rename to dom/base/test/csp/file_CSP_frameancestors.sjs
diff --git a/content/base/test/csp/file_CSP_frameancestors_main.html b/dom/base/test/csp/file_CSP_frameancestors_main.html
similarity index 100%
rename from content/base/test/csp/file_CSP_frameancestors_main.html
rename to dom/base/test/csp/file_CSP_frameancestors_main.html
diff --git a/content/base/test/csp/file_CSP_frameancestors_main.js b/dom/base/test/csp/file_CSP_frameancestors_main.js
similarity index 92%
rename from content/base/test/csp/file_CSP_frameancestors_main.js
rename to dom/base/test/csp/file_CSP_frameancestors_main.js
index f1216a284b2..a5b17027c69 100644
--- a/content/base/test/csp/file_CSP_frameancestors_main.js
+++ b/dom/base/test/csp/file_CSP_frameancestors_main.js
@@ -4,9 +4,9 @@ function setupFrames() {
 
   var $ = function(v) { return document.getElementById(v); }
   var base = {
-        self: '/tests/content/base/test/csp/file_CSP_frameancestors.sjs',
-        a: 'http://mochi.test:8888/tests/content/base/test/csp/file_CSP_frameancestors.sjs',
-        b: 'http://example.com/tests/content/base/test/csp/file_CSP_frameancestors.sjs'
+        self: '/tests/dom/base/test/csp/file_CSP_frameancestors.sjs',
+        a: 'http://mochi.test:8888/tests/dom/base/test/csp/file_CSP_frameancestors.sjs',
+        b: 'http://example.com/tests/dom/base/test/csp/file_CSP_frameancestors.sjs'
   };
 
   var host = { a: 'http://mochi.test:8888', b: 'http://example.com:80' };
diff --git a/content/base/test/csp/file_CSP_inlinescript_main.html b/dom/base/test/csp/file_CSP_inlinescript_main.html
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinescript_main.html
rename to dom/base/test/csp/file_CSP_inlinescript_main.html
diff --git a/content/base/test/csp/file_CSP_inlinescript_main.html^headers^ b/dom/base/test/csp/file_CSP_inlinescript_main.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename to dom/base/test/csp/file_CSP_inlinescript_main.html^headers^
diff --git a/content/base/test/csp/file_CSP_inlinescript_main_allowed.html b/dom/base/test/csp/file_CSP_inlinescript_main_allowed.html
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinescript_main_allowed.html
rename to dom/base/test/csp/file_CSP_inlinescript_main_allowed.html
diff --git a/content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^ b/dom/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
rename to dom/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
diff --git a/content/base/test/csp/file_CSP_inlinestyle_main.html b/dom/base/test/csp/file_CSP_inlinestyle_main.html
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinestyle_main.html
rename to dom/base/test/csp/file_CSP_inlinestyle_main.html
diff --git a/content/base/test/csp/file_CSP_inlinestyle_main.html^headers^ b/dom/base/test/csp/file_CSP_inlinestyle_main.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename to dom/base/test/csp/file_CSP_inlinestyle_main.html^headers^
diff --git a/content/base/test/csp/file_CSP_inlinestyle_main_allowed.html b/dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinestyle_main_allowed.html
rename to dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html
diff --git a/content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^ b/dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
rename to dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
diff --git a/content/base/test/csp/file_CSP_main.html b/dom/base/test/csp/file_CSP_main.html
similarity index 62%
rename from content/base/test/csp/file_CSP_main.html
rename to dom/base/test/csp/file_CSP_main.html
index f98c12aedb5..7bd4ae7f82d 100644
--- a/content/base/test/csp/file_CSP_main.html
+++ b/dom/base/test/csp/file_CSP_main.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel='stylesheet' type='text/css'
-          href='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=style_bad&type=text/css' />
+          href='http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=style_bad&type=text/css' />
     <link rel='stylesheet' type='text/css'
           href='file_CSP.sjs?testid=style_good&type=text/css' />
 
@@ -14,7 +14,7 @@
       }
       @font-face {
         font-family: "arbitrary_bad";
-        src: url('http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
+        src: url('http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
       }
 
       .div_arbitrary_good { font-family: "arbitrary_good"; }
@@ -23,13 +23,13 @@
   </head>
   <body>
     <!-- these should be stopped by CSP.  :) -->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
-    <audio src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=media_bad&type=audio/vorbis"></audio>
-    <script src='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=script_bad&type=text/javascript'></script>
-    <iframe src='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=frame_bad&content=FAIL'></iframe>
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
+    <audio src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=media_bad&type=audio/vorbis"></audio>
+    <script src='http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=script_bad&type=text/javascript'></script>
+    <iframe src='http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=frame_bad&content=FAIL'></iframe>
     <object width="10" height="10">
-      <param name="movie" value="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=object_bad&type=application/x-shockwave-flash">
-      <embed src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=object_bad&type=application/x-shockwave-flash"></embed>
+      <param name="movie" value="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=object_bad&type=application/x-shockwave-flash">
+      <embed src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=object_bad&type=application/x-shockwave-flash"></embed>
     </object>
 
     <!-- these should load ok.  :) -->
diff --git a/content/base/test/csp/file_CSP_main.html^headers^ b/dom/base/test/csp/file_CSP_main.html^headers^
similarity index 100%
rename from content/base/test/csp/file_CSP_main.html^headers^
rename to dom/base/test/csp/file_CSP_main.html^headers^
diff --git a/content/base/test/csp/file_CSP_main.js b/dom/base/test/csp/file_CSP_main.js
similarity index 59%
rename from content/base/test/csp/file_CSP_main.js
rename to dom/base/test/csp/file_CSP_main.js
index 96645d6c5b7..1da3ddab211 100644
--- a/content/base/test/csp/file_CSP_main.js
+++ b/dom/base/test/csp/file_CSP_main.js
@@ -3,14 +3,14 @@
 
 try {
   var xhr_good = new XMLHttpRequest();
-  var xhr_good_uri ="http://mochi.test:8888/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_good";
+  var xhr_good_uri ="http://mochi.test:8888/tests/dom/base/test/csp/file_CSP.sjs?testid=xhr_good";
   xhr_good.open("GET", xhr_good_uri, true);
   xhr_good.send(null);
 } catch(e) {}
 
 try {
   var xhr_bad = new XMLHttpRequest();
-  var xhr_bad_uri ="http://example.com/tests/content/base/test/csp/file_CSP.sjs?testid=xhr_bad";
+  var xhr_bad_uri ="http://example.com/tests/dom/base/test/csp/file_CSP.sjs?testid=xhr_bad";
   xhr_bad.open("GET", xhr_bad_uri, true);
   xhr_bad.send(null);
 } catch(e) {}
diff --git a/content/base/test/csp/file_base-uri.html b/dom/base/test/csp/file_base-uri.html
similarity index 100%
rename from content/base/test/csp/file_base-uri.html
rename to dom/base/test/csp/file_base-uri.html
diff --git a/dom/base/test/csp/file_bug836922_npolicies.html b/dom/base/test/csp/file_bug836922_npolicies.html
new file mode 100644
index 00000000000..3be43948f28
--- /dev/null
+++ b/dom/base/test/csp/file_bug836922_npolicies.html
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <link rel='stylesheet' type='text/css'
+          href='/tests/dom/base/test/csp/file_CSP.sjs?testid=css_self&type=text/css' />
+    <link rel='stylesheet' type='text/css'
+          href='http://example.com/tests/dom/base/test/csp/file_CSP.sjs?testid=css_examplecom&type=text/css' />
+
+  </head>
+  <body>
+    <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img_self&type=img/png"> </img>
+    <img src="http://example.com/tests/dom/base/test/csp/file_CSP.sjs?testid=img_examplecom&type=img/png"> </img>
+    <script src='/tests/dom/base/test/csp/file_CSP.sjs?testid=script_self&type=text/javascript'></script>
+
+  </body>
+</html>
diff --git a/dom/base/test/csp/file_bug836922_npolicies.html^headers^ b/dom/base/test/csp/file_bug836922_npolicies.html^headers^
new file mode 100644
index 00000000000..ecff5ff50d7
--- /dev/null
+++ b/dom/base/test/csp/file_bug836922_npolicies.html^headers^
@@ -0,0 +1,2 @@
+content-security-policy: default-src 'self'; img-src 'none'; report-uri http://mochi.test:8888/tests/dom/base/test/csp/file_bug836922_npolicies_violation.sjs
+content-security-policy-report-only: default-src *; img-src 'self'; script-src 'none'; report-uri http://mochi.test:8888/tests/dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
diff --git a/content/base/test/csp/file_bug836922_npolicies_ro_violation.sjs b/dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
similarity index 100%
rename from content/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
rename to dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
diff --git a/content/base/test/csp/file_bug836922_npolicies_violation.sjs b/dom/base/test/csp/file_bug836922_npolicies_violation.sjs
similarity index 100%
rename from content/base/test/csp/file_bug836922_npolicies_violation.sjs
rename to dom/base/test/csp/file_bug836922_npolicies_violation.sjs
diff --git a/dom/base/test/csp/file_bug886164.html b/dom/base/test/csp/file_bug886164.html
new file mode 100644
index 00000000000..f6d0b439c92
--- /dev/null
+++ b/dom/base/test/csp/file_bug886164.html
@@ -0,0 +1,15 @@
+<html>
+<head> <meta charset="utf-8"> </head>
+  <body>
+    <!-- sandbox="allow-same-origin" -->
+    <!-- Content-Security-Policy: default-src 'self' -->
+
+    <!-- these should be stopped by CSP -->
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
+
+    <!-- these should load ok -->
+    <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img_good&type=img/png" />
+    <script src='/tests/dom/base/test/csp/file_CSP.sjs?testid=scripta_bad&type=text/javascript'></script>
+
+  </body>
+</html>
diff --git a/content/base/test/csp/file_bug886164.html^headers^ b/dom/base/test/csp/file_bug886164.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164.html^headers^
rename to dom/base/test/csp/file_bug886164.html^headers^
diff --git a/content/base/test/csp/file_bug886164_2.html b/dom/base/test/csp/file_bug886164_2.html
similarity index 53%
rename from content/base/test/csp/file_bug886164_2.html
rename to dom/base/test/csp/file_bug886164_2.html
index f08826f698f..c94dac81441 100644
--- a/content/base/test/csp/file_bug886164_2.html
+++ b/dom/base/test/csp/file_bug886164_2.html
@@ -5,10 +5,10 @@
     <!-- Content-Security-Policy: default-src 'self' -->
 
     <!-- these should be stopped by CSP -->
-    <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img2_bad&type=img/png"> </img>
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img2_bad&type=img/png"> </img>
 
     <!-- these should load ok -->
-    <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img2a_good&type=img/png" />
+    <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img2a_good&type=img/png" />
 
   </body>
 </html>
diff --git a/content/base/test/csp/file_bug886164_2.html^headers^ b/dom/base/test/csp/file_bug886164_2.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164_2.html^headers^
rename to dom/base/test/csp/file_bug886164_2.html^headers^
diff --git a/dom/base/test/csp/file_bug886164_3.html b/dom/base/test/csp/file_bug886164_3.html
new file mode 100644
index 00000000000..175a2ff041e
--- /dev/null
+++ b/dom/base/test/csp/file_bug886164_3.html
@@ -0,0 +1,12 @@
+<html>
+<head> <meta charset="utf-8"> </head>
+  <body>
+    <!-- sandbox -->
+    <!-- Content-Security-Policy: default-src 'none' -->
+
+    <!-- these should be stopped by CSP -->
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img3_bad&type=img/png"> </img>
+    <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img3a_bad&type=img/png" />
+
+  </body>
+</html>
diff --git a/content/base/test/csp/file_bug886164_3.html^headers^ b/dom/base/test/csp/file_bug886164_3.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164_3.html^headers^
rename to dom/base/test/csp/file_bug886164_3.html^headers^
diff --git a/dom/base/test/csp/file_bug886164_4.html b/dom/base/test/csp/file_bug886164_4.html
new file mode 100644
index 00000000000..abf819441a5
--- /dev/null
+++ b/dom/base/test/csp/file_bug886164_4.html
@@ -0,0 +1,12 @@
+<html>
+<head> <meta charset="utf-8"> </head>
+  <body>
+    <!-- sandbox -->
+    <!-- Content-Security-Policy: default-src 'none' -->
+
+    <!-- these should be stopped by CSP -->
+    <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img4_bad&type=img/png"> </img>
+    <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img4a_bad&type=img/png" />
+
+  </body>
+</html>
diff --git a/content/base/test/csp/file_bug886164_4.html^headers^ b/dom/base/test/csp/file_bug886164_4.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164_4.html^headers^
rename to dom/base/test/csp/file_bug886164_4.html^headers^
diff --git a/content/base/test/csp/file_bug886164_5.html b/dom/base/test/csp/file_bug886164_5.html
similarity index 62%
rename from content/base/test/csp/file_bug886164_5.html
rename to dom/base/test/csp/file_bug886164_5.html
index 1d9bd022c17..daa535e5793 100644
--- a/content/base/test/csp/file_bug886164_5.html
+++ b/dom/base/test/csp/file_bug886164_5.html
@@ -18,9 +18,9 @@
  <!-- Content-Security-Policy: default-src 'none' 'unsafe-inline'-->
 
  <!-- these should be stopped by CSP -->
- <img src="/tests/content/base/test/csp/file_CSP.sjs?testid=img5_bad&type=img/png" />
- <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img5a_bad&type=img/png"> </img>
- <script src='/tests/content/base/test/csp/file_CSP.sjs?testid=script5_bad&type=text/javascript'></script>
- <script src='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=script5a_bad&type=text/javascript'></script>
+ <img src="/tests/dom/base/test/csp/file_CSP.sjs?testid=img5_bad&type=img/png" />
+ <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img5a_bad&type=img/png"> </img>
+ <script src='/tests/dom/base/test/csp/file_CSP.sjs?testid=script5_bad&type=text/javascript'></script>
+ <script src='http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=script5a_bad&type=text/javascript'></script>
 </body>
 </html>
diff --git a/content/base/test/csp/file_bug886164_5.html^headers^ b/dom/base/test/csp/file_bug886164_5.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164_5.html^headers^
rename to dom/base/test/csp/file_bug886164_5.html^headers^
diff --git a/content/base/test/csp/file_bug886164_6.html b/dom/base/test/csp/file_bug886164_6.html
similarity index 83%
rename from content/base/test/csp/file_bug886164_6.html
rename to dom/base/test/csp/file_bug886164_6.html
index 211a2aa0669..9b1d18a9e19 100644
--- a/content/base/test/csp/file_bug886164_6.html
+++ b/dom/base/test/csp/file_bug886164_6.html
@@ -21,8 +21,8 @@
 <script src='file_iframe_sandbox_pass.js'></script>
 <body onLoad='ok(true, "documents sandboxed with allow-scripts should be able to run script from event listeners");doStuff();'>
   I am sandboxed but with "allow-scripts"
-  <img src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=img6_bad&type=img/png"> </img>
-  <script src='http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=script6_bad&type=text/javascript'></script>
+  <img src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=img6_bad&type=img/png"> </img>
+  <script src='http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=script6_bad&type=text/javascript'></script>
 
   <form method="get" action="file_iframe_sandbox_form_fail.html" id="a_form">
     First name: <input type="text" name="firstname">
diff --git a/content/base/test/csp/file_bug886164_6.html^headers^ b/dom/base/test/csp/file_bug886164_6.html^headers^
similarity index 100%
rename from content/base/test/csp/file_bug886164_6.html^headers^
rename to dom/base/test/csp/file_bug886164_6.html^headers^
diff --git a/content/base/test/csp/file_connect-src.html b/dom/base/test/csp/file_connect-src.html
similarity index 100%
rename from content/base/test/csp/file_connect-src.html
rename to dom/base/test/csp/file_connect-src.html
diff --git a/content/base/test/csp/file_csp_bug768029.html b/dom/base/test/csp/file_csp_bug768029.html
similarity index 60%
rename from content/base/test/csp/file_csp_bug768029.html
rename to dom/base/test/csp/file_csp_bug768029.html
index d7f2730e6c7..b2f1fe5bbc7 100644
--- a/content/base/test/csp/file_csp_bug768029.html
+++ b/dom/base/test/csp/file_csp_bug768029.html
@@ -10,14 +10,14 @@
     <link rel="stylesheet" type="text/css"
           href="file_csp_bug768029.sjs?type=style&origin=same_origin" />
     <link rel="stylesheet" type="text/css"
-          href="http://example.com/tests/content/base/test/csp/file_csp_bug768029.sjs?type=style&origin=cross_origin" />
+          href="http://example.com/tests/dom/base/test/csp/file_csp_bug768029.sjs?type=style&origin=cross_origin" />
   </head>
   <body>
 
     <script src="file_csp_bug768029.sjs?type=script&origin=same_origin"></script>
-    <script src="http://example.com/tests/content/base/test/csp/file_csp_bug768029.sjs?type=script&origin=cross_origin"></script>
+    <script src="http://example.com/tests/dom/base/test/csp/file_csp_bug768029.sjs?type=script&origin=cross_origin"></script>
     <img src="file_csp_bug768029.sjs?type=img&origin=same_origin" />
-    <img src="http://example.com/tests/content/base/test/csp/file_csp_bug768029.sjs?type=img&origin=cross_origin" />
+    <img src="http://example.com/tests/dom/base/test/csp/file_csp_bug768029.sjs?type=img&origin=cross_origin" />
 
     Test for CSP applied to (simulated) app.
 
diff --git a/content/base/test/csp/file_csp_bug768029.sjs b/dom/base/test/csp/file_csp_bug768029.sjs
similarity index 100%
rename from content/base/test/csp/file_csp_bug768029.sjs
rename to dom/base/test/csp/file_csp_bug768029.sjs
diff --git a/content/base/test/csp/file_csp_bug773891.html b/dom/base/test/csp/file_csp_bug773891.html
similarity index 60%
rename from content/base/test/csp/file_csp_bug773891.html
rename to dom/base/test/csp/file_csp_bug773891.html
index 563e5f1699c..ae2ba8d2fec 100644
--- a/content/base/test/csp/file_csp_bug773891.html
+++ b/dom/base/test/csp/file_csp_bug773891.html
@@ -10,14 +10,14 @@
     <link rel="stylesheet" type="text/css"
           href="file_csp_bug773891.sjs?type=style&origin=same_origin" />
     <link rel="stylesheet" type="text/css"
-          href="http://example.com/tests/content/base/test/csp/file_csp_bug773891.sjs?type=style&origin=cross_origin" />
+          href="http://example.com/tests/dom/base/test/csp/file_csp_bug773891.sjs?type=style&origin=cross_origin" />
   </head>
   <body>
 
     <script src="file_csp_bug773891.sjs?type=script&origin=same_origin"></script>
-    <script src="http://example.com/tests/content/base/test/csp/file_csp_bug773891.sjs?type=script&origin=cross_origin"></script>
+    <script src="http://example.com/tests/dom/base/test/csp/file_csp_bug773891.sjs?type=script&origin=cross_origin"></script>
     <img src="file_csp_bug773891.sjs?type=img&origin=same_origin" />
-    <img src="http://example.com/tests/content/base/test/csp/file_csp_bug773891.sjs?type=img&origin=cross_origin" />
+    <img src="http://example.com/tests/dom/base/test/csp/file_csp_bug773891.sjs?type=img&origin=cross_origin" />
 
     Test for CSP applied to (simulated) app.
 
diff --git a/content/base/test/csp/file_csp_bug773891.sjs b/dom/base/test/csp/file_csp_bug773891.sjs
similarity index 100%
rename from content/base/test/csp/file_csp_bug773891.sjs
rename to dom/base/test/csp/file_csp_bug773891.sjs
diff --git a/content/base/test/csp/file_csp_invalid_source_expression.html b/dom/base/test/csp/file_csp_invalid_source_expression.html
similarity index 75%
rename from content/base/test/csp/file_csp_invalid_source_expression.html
rename to dom/base/test/csp/file_csp_invalid_source_expression.html
index 73b1cf8d092..155e6d0f8b9 100644
--- a/content/base/test/csp/file_csp_invalid_source_expression.html
+++ b/dom/base/test/csp/file_csp_invalid_source_expression.html
@@ -6,6 +6,6 @@
   <body>
   <div id="testdiv">blocked</div>
   <!-- Note, we reuse file_csp_path_matching.js which only updates the testdiv to 'allowed' if loaded !-->
-  <script src="http://test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js"></script>
+  <script src="http://test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js"></script>
 </body>
 </html>
diff --git a/content/base/test/csp/file_csp_path_matching.html b/dom/base/test/csp/file_csp_path_matching.html
similarity index 62%
rename from content/base/test/csp/file_csp_path_matching.html
rename to dom/base/test/csp/file_csp_path_matching.html
index ec131aea72a..4126ed58a00 100644
--- a/content/base/test/csp/file_csp_path_matching.html
+++ b/dom/base/test/csp/file_csp_path_matching.html
@@ -5,6 +5,6 @@
   </head>
   <body>
   <div id="testdiv">blocked</div>
-  <script src="http://test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js#foo"></script>
+  <script src="http://test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js#foo"></script>
 </body>
 </html>
diff --git a/content/base/test/csp/file_csp_path_matching.js b/dom/base/test/csp/file_csp_path_matching.js
similarity index 100%
rename from content/base/test/csp/file_csp_path_matching.js
rename to dom/base/test/csp/file_csp_path_matching.js
diff --git a/content/base/test/csp/file_csp_path_matching_redirect.html b/dom/base/test/csp/file_csp_path_matching_redirect.html
similarity index 61%
rename from content/base/test/csp/file_csp_path_matching_redirect.html
rename to dom/base/test/csp/file_csp_path_matching_redirect.html
index 5ef65cde7fc..c1716b45031 100644
--- a/content/base/test/csp/file_csp_path_matching_redirect.html
+++ b/dom/base/test/csp/file_csp_path_matching_redirect.html
@@ -5,6 +5,6 @@
   </head>
   <body>
   <div id="testdiv">blocked</div>
-  <script src="http://example.com/tests/content/base/test/csp/file_csp_path_matching_redirect_server.sjs"></script>
+  <script src="http://example.com/tests/dom/base/test/csp/file_csp_path_matching_redirect_server.sjs"></script>
 </body>
 </html>
diff --git a/content/base/test/csp/file_csp_path_matching_redirect_server.sjs b/dom/base/test/csp/file_csp_path_matching_redirect_server.sjs
similarity index 77%
rename from content/base/test/csp/file_csp_path_matching_redirect_server.sjs
rename to dom/base/test/csp/file_csp_path_matching_redirect_server.sjs
index 1b890fa6ff3..41943cbc307 100644
--- a/content/base/test/csp/file_csp_path_matching_redirect_server.sjs
+++ b/dom/base/test/csp/file_csp_path_matching_redirect_server.sjs
@@ -5,7 +5,7 @@
 function handleRequest(request, response)
 {
 
-  var newLocation = "http://test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js";
+  var newLocation = "http://test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js";
 
   response.setStatusLine("1.1", 302, "Found");
   response.setHeader("Cache-Control", "no-cache", false);
diff --git a/content/base/test/csp/file_csp_redirects_main.html b/dom/base/test/csp/file_csp_redirects_main.html
similarity index 93%
rename from content/base/test/csp/file_csp_redirects_main.html
rename to dom/base/test/csp/file_csp_redirects_main.html
index 321aea3254a..b3a0385ddb7 100644
--- a/content/base/test/csp/file_csp_redirects_main.html
+++ b/dom/base/test/csp/file_csp_redirects_main.html
@@ -9,7 +9,7 @@
 <script>
 var thisSite = "http://mochi.test:8888";
 var otherSite = "http://example.com";
-var page = "/tests/content/base/test/csp/file_csp_redirects_page.sjs";
+var page = "/tests/dom/base/test/csp/file_csp_redirects_page.sjs";
 
 var tests = { "font-src": thisSite+page+"?testid=font-src&csp=1",
               "frame-src": thisSite+page+"?testid=frame-src&csp=1",
diff --git a/content/base/test/csp/file_csp_redirects_page.sjs b/dom/base/test/csp/file_csp_redirects_page.sjs
similarity index 97%
rename from content/base/test/csp/file_csp_redirects_page.sjs
rename to dom/base/test/csp/file_csp_redirects_page.sjs
index c8b01634907..9253a02bc3d 100644
--- a/content/base/test/csp/file_csp_redirects_page.sjs
+++ b/dom/base/test/csp/file_csp_redirects_page.sjs
@@ -11,7 +11,7 @@ function handleRequest(request, response)
   response.setHeader("Cache-Control", "no-cache", false);
   response.setHeader("Content-Type", "text/html", false);
 
-  var resource = "/tests/content/base/test/csp/file_csp_redirects_resource.sjs";
+  var resource = "/tests/dom/base/test/csp/file_csp_redirects_resource.sjs";
 
   // CSP header value
   if (query["csp"] == 1) {
diff --git a/content/base/test/csp/file_csp_redirects_resource.sjs b/dom/base/test/csp/file_csp_redirects_resource.sjs
similarity index 97%
rename from content/base/test/csp/file_csp_redirects_resource.sjs
rename to dom/base/test/csp/file_csp_redirects_resource.sjs
index dbab4f29ad7..3f9ab90707e 100644
--- a/content/base/test/csp/file_csp_redirects_resource.sjs
+++ b/dom/base/test/csp/file_csp_redirects_resource.sjs
@@ -11,7 +11,7 @@ function handleRequest(request, response)
 
   var thisSite = "http://mochi.test:8888";
   var otherSite = "http://example.com";
-  var resource = "/tests/content/base/test/csp/file_csp_redirects_resource.sjs";
+  var resource = "/tests/dom/base/test/csp/file_csp_redirects_resource.sjs";
 
   response.setHeader("Cache-Control", "no-cache", false);
 
diff --git a/content/base/test/csp/file_csp_report.html b/dom/base/test/csp/file_csp_report.html
similarity index 100%
rename from content/base/test/csp/file_csp_report.html
rename to dom/base/test/csp/file_csp_report.html
diff --git a/content/base/test/csp/file_csp_testserver.sjs b/dom/base/test/csp/file_csp_testserver.sjs
similarity index 100%
rename from content/base/test/csp/file_csp_testserver.sjs
rename to dom/base/test/csp/file_csp_testserver.sjs
diff --git a/content/base/test/csp/file_hash_source.html b/dom/base/test/csp/file_hash_source.html
similarity index 100%
rename from content/base/test/csp/file_hash_source.html
rename to dom/base/test/csp/file_hash_source.html
diff --git a/content/base/test/csp/file_hash_source.html^headers^ b/dom/base/test/csp/file_hash_source.html^headers^
similarity index 100%
rename from content/base/test/csp/file_hash_source.html^headers^
rename to dom/base/test/csp/file_hash_source.html^headers^
diff --git a/content/base/test/csp/file_leading_wildcard.html b/dom/base/test/csp/file_leading_wildcard.html
similarity index 54%
rename from content/base/test/csp/file_leading_wildcard.html
rename to dom/base/test/csp/file_leading_wildcard.html
index e62fcc2d702..4270adf78fc 100644
--- a/content/base/test/csp/file_leading_wildcard.html
+++ b/dom/base/test/csp/file_leading_wildcard.html
@@ -5,7 +5,7 @@
   </head>
   <body>
   <!-- Please note that both scripts do *not* exist in the file system -->
-  <script src="http://test1.example.com/tests/content/base/test/csp/leading_wildcard_allowed.js" ></script>
-  <script src="http://example.com/tests/content/base/test/csp/leading_wildcard_blocked.js" ></script>
+  <script src="http://test1.example.com/tests/dom/base/test/csp/leading_wildcard_allowed.js" ></script>
+  <script src="http://example.com/tests/dom/base/test/csp/leading_wildcard_blocked.js" ></script>
 </body>
 </html>
diff --git a/content/base/test/csp/file_multi_policy_injection_bypass.html b/dom/base/test/csp/file_multi_policy_injection_bypass.html
similarity index 61%
rename from content/base/test/csp/file_multi_policy_injection_bypass.html
rename to dom/base/test/csp/file_multi_policy_injection_bypass.html
index 82eed84570a..4932387c742 100644
--- a/content/base/test/csp/file_multi_policy_injection_bypass.html
+++ b/dom/base/test/csp/file_multi_policy_injection_bypass.html
@@ -4,8 +4,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=717511
 -->
   <body>
     <!-- these should be stopped by CSP after fixing bug 717511.  :) -->
-    <img src="http://example.org/tests/content/base/test/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
-    <script src='http://example.org/tests/content/base/test/file_CSP.sjs?testid=script_bad&type=text/javascript'></script>
+    <img src="http://example.org/tests/dom/base/test/file_CSP.sjs?testid=img_bad&type=img/png"> </img>
+    <script src='http://example.org/tests/dom/base/test/file_CSP.sjs?testid=script_bad&type=text/javascript'></script>
 
     <!-- these should load ok after fixing bug 717511.  :) -->
     <img src="file_CSP.sjs?testid=img_good&type=img/png" />
diff --git a/content/base/test/csp/file_multi_policy_injection_bypass.html^headers^ b/dom/base/test/csp/file_multi_policy_injection_bypass.html^headers^
similarity index 100%
rename from content/base/test/csp/file_multi_policy_injection_bypass.html^headers^
rename to dom/base/test/csp/file_multi_policy_injection_bypass.html^headers^
diff --git a/content/base/test/csp/file_multi_policy_injection_bypass_2.html b/dom/base/test/csp/file_multi_policy_injection_bypass_2.html
similarity index 61%
rename from content/base/test/csp/file_multi_policy_injection_bypass_2.html
rename to dom/base/test/csp/file_multi_policy_injection_bypass_2.html
index 6f27a043fb8..f3696bb8594 100644
--- a/content/base/test/csp/file_multi_policy_injection_bypass_2.html
+++ b/dom/base/test/csp/file_multi_policy_injection_bypass_2.html
@@ -4,8 +4,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=717511
 -->
   <body>
     <!-- these should be stopped by CSP after fixing bug 717511.  :) -->
-    <img src="http://example.org/tests/content/base/test/file_CSP.sjs?testid=img2_bad&type=img/png"> </img>
-    <script src='http://example.org/tests/content/base/test/file_CSP.sjs?testid=script2_bad&type=text/javascript'></script>
+    <img src="http://example.org/tests/dom/base/test/file_CSP.sjs?testid=img2_bad&type=img/png"> </img>
+    <script src='http://example.org/tests/dom/base/test/file_CSP.sjs?testid=script2_bad&type=text/javascript'></script>
 
     <!-- these should load ok after fixing bug 717511.  :) -->
     <img src="file_CSP.sjs?testid=img2_good&type=img/png" />
diff --git a/content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^ b/dom/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
similarity index 100%
rename from content/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename to dom/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
diff --git a/content/base/test/csp/file_nonce_source.html b/dom/base/test/csp/file_nonce_source.html
similarity index 85%
rename from content/base/test/csp/file_nonce_source.html
rename to dom/base/test/csp/file_nonce_source.html
index b38a55f8192..7892ad9b226 100644
--- a/content/base/test/csp/file_nonce_source.html
+++ b/dom/base/test/csp/file_nonce_source.html
@@ -29,11 +29,11 @@
     </script>
 
     <!-- external scripts -->
-    <script nonce="correctscriptnonce" src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=external_script_correct_nonce_good&type=text/javascript"></script>
-    <script nonce="anothercorrectscriptnonce" src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=external_script_another_correct_nonce_good&type=text/javascript"></script>
-    <script nonce="incorrectscriptnonce" src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=external_script_incorrect_nonce_bad&type=text/javascript"></script>
-    <script nonce="correctstylenonce" src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=external_script_correct_style_nonce_bad&type=text/javascript"></script>
-    <script src="http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=external_script_no_nonce_bad&type=text/javascript"></script>
+    <script nonce="correctscriptnonce" src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=external_script_correct_nonce_good&type=text/javascript"></script>
+    <script nonce="anothercorrectscriptnonce" src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=external_script_another_correct_nonce_good&type=text/javascript"></script>
+    <script nonce="incorrectscriptnonce" src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=external_script_incorrect_nonce_bad&type=text/javascript"></script>
+    <script nonce="correctstylenonce" src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=external_script_correct_style_nonce_bad&type=text/javascript"></script>
+    <script src="http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=external_script_no_nonce_bad&type=text/javascript"></script>
 
     <!-- This external script has the correct nonce and comes from a whitelisted URI. It should be allowed. -->
     <script nonce="correctscriptnonce" src="file_CSP.sjs?testid=external_script_correct_nonce_correct_uri_good&type=text/javascript"></script>
diff --git a/content/base/test/csp/file_nonce_source.html^headers^ b/dom/base/test/csp/file_nonce_source.html^headers^
similarity index 100%
rename from content/base/test/csp/file_nonce_source.html^headers^
rename to dom/base/test/csp/file_nonce_source.html^headers^
diff --git a/content/base/test/csp/file_policyuri_regression_from_multipolicy.html b/dom/base/test/csp/file_policyuri_regression_from_multipolicy.html
similarity index 100%
rename from content/base/test/csp/file_policyuri_regression_from_multipolicy.html
rename to dom/base/test/csp/file_policyuri_regression_from_multipolicy.html
diff --git a/dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ b/dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
new file mode 100644
index 00000000000..b57a8447c62
--- /dev/null
+++ b/dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
@@ -0,0 +1 @@
+content-security-policy-report-only: policy-uri /tests/dom/base/test/csp/file_CSP_policyuri_regression_from_multipolicy_policy
diff --git a/content/base/test/csp/file_policyuri_regression_from_multipolicy_policy b/dom/base/test/csp/file_policyuri_regression_from_multipolicy_policy
similarity index 100%
rename from content/base/test/csp/file_policyuri_regression_from_multipolicy_policy
rename to dom/base/test/csp/file_policyuri_regression_from_multipolicy_policy
diff --git a/content/base/test/csp/file_redirect_content.sjs b/dom/base/test/csp/file_redirect_content.sjs
similarity index 95%
rename from content/base/test/csp/file_redirect_content.sjs
rename to dom/base/test/csp/file_redirect_content.sjs
index f06315098d2..d0e31412f7a 100644
--- a/content/base/test/csp/file_redirect_content.sjs
+++ b/dom/base/test/csp/file_redirect_content.sjs
@@ -23,7 +23,7 @@ function handleRequest(request, response) {
     return;
   }
 
-  var csp = "default-src \'self\';report-uri http://mochi.test:8888/tests/content/base/test/csp/file_redirect_report.sjs?" + redirect;
+  var csp = "default-src \'self\';report-uri http://mochi.test:8888/tests/dom/base/test/csp/file_redirect_report.sjs?" + redirect;
 
   response.setHeader("Content-Security-Policy", csp, false);
 
diff --git a/content/base/test/csp/file_redirect_report.sjs b/dom/base/test/csp/file_redirect_report.sjs
similarity index 100%
rename from content/base/test/csp/file_redirect_report.sjs
rename to dom/base/test/csp/file_redirect_report.sjs
diff --git a/content/base/test/csp/file_report_uri_missing_in_report_only_header.html b/dom/base/test/csp/file_report_uri_missing_in_report_only_header.html
similarity index 100%
rename from content/base/test/csp/file_report_uri_missing_in_report_only_header.html
rename to dom/base/test/csp/file_report_uri_missing_in_report_only_header.html
diff --git a/content/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ b/dom/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
similarity index 100%
rename from content/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
rename to dom/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
diff --git a/content/base/test/csp/file_self_none_as_hostname_confusion.html b/dom/base/test/csp/file_self_none_as_hostname_confusion.html
similarity index 100%
rename from content/base/test/csp/file_self_none_as_hostname_confusion.html
rename to dom/base/test/csp/file_self_none_as_hostname_confusion.html
diff --git a/content/base/test/csp/file_self_none_as_hostname_confusion.html^headers^ b/dom/base/test/csp/file_self_none_as_hostname_confusion.html^headers^
similarity index 100%
rename from content/base/test/csp/file_self_none_as_hostname_confusion.html^headers^
rename to dom/base/test/csp/file_self_none_as_hostname_confusion.html^headers^
diff --git a/content/base/test/csp/file_subframe_run_js_if_allowed.html b/dom/base/test/csp/file_subframe_run_js_if_allowed.html
similarity index 100%
rename from content/base/test/csp/file_subframe_run_js_if_allowed.html
rename to dom/base/test/csp/file_subframe_run_js_if_allowed.html
diff --git a/content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^ b/dom/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
similarity index 100%
rename from content/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
rename to dom/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
diff --git a/content/base/test/csp/mochitest.ini b/dom/base/test/csp/mochitest.ini
similarity index 100%
rename from content/base/test/csp/mochitest.ini
rename to dom/base/test/csp/mochitest.ini
diff --git a/content/base/test/csp/test_301_redirect.html b/dom/base/test/csp/test_301_redirect.html
similarity index 100%
rename from content/base/test/csp/test_301_redirect.html
rename to dom/base/test/csp/test_301_redirect.html
diff --git a/content/base/test/csp/test_302_redirect.html b/dom/base/test/csp/test_302_redirect.html
similarity index 100%
rename from content/base/test/csp/test_302_redirect.html
rename to dom/base/test/csp/test_302_redirect.html
diff --git a/content/base/test/csp/test_303_redirect.html b/dom/base/test/csp/test_303_redirect.html
similarity index 100%
rename from content/base/test/csp/test_303_redirect.html
rename to dom/base/test/csp/test_303_redirect.html
diff --git a/content/base/test/csp/test_307_redirect.html b/dom/base/test/csp/test_307_redirect.html
similarity index 100%
rename from content/base/test/csp/test_307_redirect.html
rename to dom/base/test/csp/test_307_redirect.html
diff --git a/content/base/test/csp/test_CSP.html b/dom/base/test/csp/test_CSP.html
similarity index 100%
rename from content/base/test/csp/test_CSP.html
rename to dom/base/test/csp/test_CSP.html
diff --git a/content/base/test/csp/test_CSP_bug663567.html b/dom/base/test/csp/test_CSP_bug663567.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug663567.html
rename to dom/base/test/csp/test_CSP_bug663567.html
diff --git a/content/base/test/csp/test_CSP_bug802872.html b/dom/base/test/csp/test_CSP_bug802872.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug802872.html
rename to dom/base/test/csp/test_CSP_bug802872.html
diff --git a/content/base/test/csp/test_CSP_bug885433.html b/dom/base/test/csp/test_CSP_bug885433.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug885433.html
rename to dom/base/test/csp/test_CSP_bug885433.html
diff --git a/content/base/test/csp/test_CSP_bug888172.html b/dom/base/test/csp/test_CSP_bug888172.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug888172.html
rename to dom/base/test/csp/test_CSP_bug888172.html
diff --git a/content/base/test/csp/test_CSP_bug909029.html b/dom/base/test/csp/test_CSP_bug909029.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug909029.html
rename to dom/base/test/csp/test_CSP_bug909029.html
diff --git a/content/base/test/csp/test_CSP_bug910139.html b/dom/base/test/csp/test_CSP_bug910139.html
similarity index 100%
rename from content/base/test/csp/test_CSP_bug910139.html
rename to dom/base/test/csp/test_CSP_bug910139.html
diff --git a/content/base/test/csp/test_CSP_bug941404.html b/dom/base/test/csp/test_CSP_bug941404.html
similarity index 98%
rename from content/base/test/csp/test_CSP_bug941404.html
rename to dom/base/test/csp/test_CSP_bug941404.html
index d2ddc790faa..0735d3a71e8 100644
--- a/content/base/test/csp/test_CSP_bug941404.html
+++ b/dom/base/test/csp/test_CSP_bug941404.html
@@ -17,7 +17,7 @@
 <script class="testbody" type="text/javascript">
 
 
-var path = "/tests/content/base/test/csp/";
+var path = "/tests/dom/base/test/csp/";
 
 // These are test results: -1 means it hasn't run,
 // true/false is the pass/fail result.
diff --git a/content/base/test/csp/test_CSP_evalscript.html b/dom/base/test/csp/test_CSP_evalscript.html
similarity index 100%
rename from content/base/test/csp/test_CSP_evalscript.html
rename to dom/base/test/csp/test_CSP_evalscript.html
diff --git a/content/base/test/csp/test_CSP_frameancestors.html b/dom/base/test/csp/test_CSP_frameancestors.html
similarity index 100%
rename from content/base/test/csp/test_CSP_frameancestors.html
rename to dom/base/test/csp/test_CSP_frameancestors.html
diff --git a/content/base/test/csp/test_CSP_inlinescript.html b/dom/base/test/csp/test_CSP_inlinescript.html
similarity index 100%
rename from content/base/test/csp/test_CSP_inlinescript.html
rename to dom/base/test/csp/test_CSP_inlinescript.html
diff --git a/content/base/test/csp/test_CSP_inlinestyle.html b/dom/base/test/csp/test_CSP_inlinestyle.html
similarity index 100%
rename from content/base/test/csp/test_CSP_inlinestyle.html
rename to dom/base/test/csp/test_CSP_inlinestyle.html
diff --git a/content/base/test/csp/test_base-uri.html b/dom/base/test/csp/test_base-uri.html
similarity index 92%
rename from content/base/test/csp/test_base-uri.html
rename to dom/base/test/csp/test_base-uri.html
index b39dcb10dae..a19b759e0f7 100644
--- a/content/base/test/csp/test_base-uri.html
+++ b/dom/base/test/csp/test_base-uri.html
@@ -60,9 +60,9 @@ function loadNextTest() {
     window.BaseURIExaminer.remove();
     SimpleTest.finish();
   }
-  var src = "http://example.com/tests/content/base/test/csp/file_csp_testserver.sjs";
+  var src = "http://example.com/tests/dom/base/test/csp/file_csp_testserver.sjs";
   // append the file that should be served
-  src += "?file=" + escape("tests/content/base/test/csp/file_base-uri.html");
+  src += "?file=" + escape("tests/dom/base/test/csp/file_base-uri.html");
   // append the CSP that should be used to serve the file
   src += "&csp=" + escape(testPolicies[counter]);
   document.getElementById("testframe").src = src;
diff --git a/content/base/test/csp/test_bug836922_npolicies.html b/dom/base/test/csp/test_bug836922_npolicies.html
similarity index 99%
rename from content/base/test/csp/test_bug836922_npolicies.html
rename to dom/base/test/csp/test_bug836922_npolicies.html
index 1434e0dda9f..3f8a34832dd 100644
--- a/content/base/test/csp/test_bug836922_npolicies.html
+++ b/dom/base/test/csp/test_bug836922_npolicies.html
@@ -14,7 +14,7 @@
 <iframe style="width:200px;height:200px;" id='cspframe'></iframe>
 <script class="testbody" type="text/javascript">
 
-var path = "/tests/content/base/test/csp/";
+var path = "/tests/dom/base/test/csp/";
 
 // These are test results: verified indicates whether or not the test has run.
 // true/false is the pass/fail result.
diff --git a/content/base/test/csp/test_bug886164.html b/dom/base/test/csp/test_bug886164.html
similarity index 99%
rename from content/base/test/csp/test_bug886164.html
rename to dom/base/test/csp/test_bug886164.html
index 88a93a8174a..2c46f75381b 100644
--- a/content/base/test/csp/test_bug886164.html
+++ b/dom/base/test/csp/test_bug886164.html
@@ -19,7 +19,7 @@
 <script class="testbody" type="text/javascript">
 
 
-var path = "/tests/content/base/test/csp/";
+var path = "/tests/dom/base/test/csp/";
 
 // These are test results: -1 means it hasn't run,
 // true/false is the pass/fail result.
diff --git a/content/base/test/csp/test_bug949549.html b/dom/base/test/csp/test_bug949549.html
similarity index 100%
rename from content/base/test/csp/test_bug949549.html
rename to dom/base/test/csp/test_bug949549.html
diff --git a/content/base/test/csp/test_connect-src.html b/dom/base/test/csp/test_connect-src.html
similarity index 97%
rename from content/base/test/csp/test_connect-src.html
rename to dom/base/test/csp/test_connect-src.html
index e98ae7cda1e..f271917afac 100644
--- a/content/base/test/csp/test_connect-src.html
+++ b/dom/base/test/csp/test_connect-src.html
@@ -95,7 +95,7 @@ function loadNextTest() {
 
   var src = "file_csp_testserver.sjs";
   // append the file that should be served
-  src += "?file=" + escape("tests/content/base/test/csp/file_connect-src.html");
+  src += "?file=" + escape("tests/dom/base/test/csp/file_connect-src.html");
   // append the CSP that should be used to serve the file
   src += "&csp=" + escape(tests[counter].policy);
 
diff --git a/content/base/test/csp/test_csp_bug768029.html b/dom/base/test/csp/test_csp_bug768029.html
similarity index 96%
rename from content/base/test/csp/test_csp_bug768029.html
rename to dom/base/test/csp/test_csp_bug768029.html
index d455326c4cb..3e867076f1d 100644
--- a/content/base/test/csp/test_csp_bug768029.html
+++ b/dom/base/test/csp/test_csp_bug768029.html
@@ -35,7 +35,7 @@ var gData = [
     app: "https://example.com/manifest.webapp",
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_INSTALLED,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug768029.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug768029.html",
     statusString: "installed app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
@@ -48,7 +48,7 @@ var gData = [
     app: "https://example.com/manifest_priv.webapp",
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_PRIVILEGED,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug768029.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug768029.html",
     statusString: "privileged app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
@@ -61,7 +61,7 @@ var gData = [
     app: "https://example.com/manifest_cert.webapp",
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_CERTIFIED,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug768029.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug768029.html",
     statusString: "certified app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
diff --git a/content/base/test/csp/test_csp_bug773891.html b/dom/base/test/csp/test_csp_bug773891.html
similarity index 97%
rename from content/base/test/csp/test_csp_bug773891.html
rename to dom/base/test/csp/test_csp_bug773891.html
index 33c1bc48e55..beec40a86ef 100644
--- a/content/base/test/csp/test_csp_bug773891.html
+++ b/dom/base/test/csp/test_csp_bug773891.html
@@ -41,7 +41,7 @@ var gData = [
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_INSTALLED,
     csp: MANIFEST_CSP_INST,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug773891.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug773891.html",
     statusString: "installed app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
@@ -54,7 +54,7 @@ var gData = [
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_CERTIFIED,
     csp: MANIFEST_CSP_CERT,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug773891.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug773891.html",
     statusString: "certified app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
@@ -67,7 +67,7 @@ var gData = [
     appStatus: Components.interfaces.nsIPrincipal.APP_STATUS_PRIVILEGED,
     csp: MANIFEST_CSP_PRIV,
     origin: "https://example.com",
-    uri: "https://example.com/tests/content/base/test/csp/file_csp_bug773891.html",
+    uri: "https://example.com/tests/dom/base/test/csp/file_csp_bug773891.html",
     statusString: "privileged app",
     expectedTestResults: {
       max_tests: 7, /* number of bools below plus one for the status check */
diff --git a/content/base/test/csp/test_csp_invalid_source_expression.html b/dom/base/test/csp/test_csp_invalid_source_expression.html
similarity index 94%
rename from content/base/test/csp/test_csp_invalid_source_expression.html
rename to dom/base/test/csp/test_csp_invalid_source_expression.html
index 60d41d1e1cc..8118d1c9a7f 100644
--- a/content/base/test/csp/test_csp_invalid_source_expression.html
+++ b/dom/base/test/csp/test_csp_invalid_source_expression.html
@@ -29,7 +29,7 @@ const policy = "script-src bankid:/*";
 function runTest() {
   var src = "file_csp_testserver.sjs";
   // append the file that should be served
-  src += "?file=" + escape("tests/content/base/test/csp/file_csp_invalid_source_expression.html");
+  src += "?file=" + escape("tests/dom/base/test/csp/file_csp_invalid_source_expression.html");
   // append the CSP that should be used to serve the file
   src += "&csp=" + escape(policy);
 
diff --git a/content/base/test/csp/test_csp_path_matching.html b/dom/base/test/csp/test_csp_path_matching.html
similarity index 63%
rename from content/base/test/csp/test_csp_path_matching.html
rename to dom/base/test/csp/test_csp_path_matching.html
index 9cdb6bc3d99..8b60b34520a 100644
--- a/content/base/test/csp/test_csp_path_matching.html
+++ b/dom/base/test/csp/test_csp_path_matching.html
@@ -18,7 +18,7 @@ SimpleTest.waitForExplicitFinish();
 
 /* Description of the test:
  * We are loading the following url (including a fragment portion):
- * http://test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js#foo
+ * http://test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js#foo
  * using different policies and verify that the applied policy is accurately enforced.
  */
 
@@ -27,41 +27,41 @@ var policies = [
   ["allowed", "http://*"], // test for bug 1075230, enforcing scheme and wildcard
   ["allowed", "test1.example.com"],
   ["allowed", "test1.example.com/"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js"],
 
   ["allowed", "test1.example.com?foo=val"],
   ["allowed", "test1.example.com/?foo=val"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/?foo=val"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js?foo=val"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/?foo=val"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js?foo=val"],
 
   ["allowed", "test1.example.com#foo"],
   ["allowed", "test1.example.com/#foo"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/#foo"],
-  ["allowed", "test1.example.com/tests/content/base/test/csp/file_csp_path_matching.js#foo"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/#foo"],
+  ["allowed", "test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.js#foo"],
 
   ["allowed", "*.example.com"],
   ["allowed", "*.example.com/"],
-  ["allowed", "*.example.com/tests/content/base/test/csp/"],
-  ["allowed", "*.example.com/tests/content/base/test/csp/file_csp_path_matching.js"],
+  ["allowed", "*.example.com/tests/dom/base/test/csp/"],
+  ["allowed", "*.example.com/tests/dom/base/test/csp/file_csp_path_matching.js"],
 
   ["allowed", "test1.example.com:80"],
   ["allowed", "test1.example.com:80/"],
-  ["allowed", "test1.example.com:80/tests/content/base/test/csp/"],
-  ["allowed", "test1.example.com:80/tests/content/base/test/csp/file_csp_path_matching.js"],
+  ["allowed", "test1.example.com:80/tests/dom/base/test/csp/"],
+  ["allowed", "test1.example.com:80/tests/dom/base/test/csp/file_csp_path_matching.js"],
 
   ["allowed", "test1.example.com:*"],
   ["allowed", "test1.example.com:*/"],
-  ["allowed", "test1.example.com:*/tests/content/base/test/csp/"],
-  ["allowed", "test1.example.com:*/tests/content/base/test/csp/file_csp_path_matching.js"],
+  ["allowed", "test1.example.com:*/tests/dom/base/test/csp/"],
+  ["allowed", "test1.example.com:*/tests/dom/base/test/csp/file_csp_path_matching.js"],
 
   ["blocked", "test1.example.com/tests"],
-  ["blocked", "test1.example.com/tests/content/base/test/csp"],
-  ["blocked", "test1.example.com/tests/content/base/test/csp/file_csp_path_matching.py"],
+  ["blocked", "test1.example.com/tests/dom/base/test/csp"],
+  ["blocked", "test1.example.com/tests/dom/base/test/csp/file_csp_path_matching.py"],
 
   ["blocked", "test1.example.com:8888/tests"],
-  ["blocked", "test1.example.com:8888/tests/content/base/test/csp"],
-  ["blocked", "test1.example.com:8888/tests/content/base/test/csp/file_csp_path_matching.py"],
+  ["blocked", "test1.example.com:8888/tests/dom/base/test/csp"],
+  ["blocked", "test1.example.com:8888/tests/dom/base/test/csp/file_csp_path_matching.py"],
 ]
 
 var counter = 0;
@@ -75,7 +75,7 @@ function loadNextTest() {
     policy = policies[counter++];
     var src = "file_csp_testserver.sjs";
     // append the file that should be served
-    src += "?file=" + escape("tests/content/base/test/csp/file_csp_path_matching.html");
+    src += "?file=" + escape("tests/dom/base/test/csp/file_csp_path_matching.html");
     // append the CSP that should be used to serve the file
     src += "&csp=" + escape("default-src 'none'; script-src " + policy[1]);
 
diff --git a/content/base/test/csp/test_csp_path_matching_redirect.html b/dom/base/test/csp/test_csp_path_matching_redirect.html
similarity index 88%
rename from content/base/test/csp/test_csp_path_matching_redirect.html
rename to dom/base/test/csp/test_csp_path_matching_redirect.html
index cf50a474156..18f85c84809 100644
--- a/content/base/test/csp/test_csp_path_matching_redirect.html
+++ b/dom/base/test/csp/test_csp_path_matching_redirect.html
@@ -32,20 +32,20 @@ var policy = "script-src http://example.com http://test1.example.com/CSPAllowsSc
 var tests = [
   {
     // the script in file_csp_path_matching.html
-    // <script src="http://test1.example.com/tests/content/base/..">
+    // <script src="http://test1.example.com/tests/dom/base/..">
     // is not within the whitelisted path by the csp-policy
     // hence the script is 'blocked' by CSP.
     expected: "blocked",
-    uri: "tests/content/base/test/csp/file_csp_path_matching.html"
+    uri: "tests/dom/base/test/csp/file_csp_path_matching.html"
   },
   {
     // the script in file_csp_path_matching_redirect.html
-    // <script src="http://example.com/tests/content/..">
-    // gets redirected to: http://test1.example.com/tests/content
+    // <script src="http://example.com/tests/dom/..">
+    // gets redirected to: http://test1.example.com/tests/dom
     // where after the redirect the path of the policy is not enforced
     // anymore and hence execution of the script is 'allowed'.
     expected: "allowed",
-    uri: "tests/content/base/test/csp/file_csp_path_matching_redirect.html"
+    uri: "tests/dom/base/test/csp/file_csp_path_matching_redirect.html"
   },
 ];
 
diff --git a/content/base/test/csp/test_csp_redirects.html b/dom/base/test/csp/test_csp_redirects.html
similarity index 99%
rename from content/base/test/csp/test_csp_redirects.html
rename to dom/base/test/csp/test_csp_redirects.html
index e213aef2478..f5d558d895a 100644
--- a/content/base/test/csp/test_csp_redirects.html
+++ b/dom/base/test/csp/test_csp_redirects.html
@@ -15,7 +15,7 @@
 <pre id="log"></pre>
 <script class="testbody" type="text/javascript">
 
-var path = "/tests/content/base/test/csp/";
+var path = "/tests/dom/base/test/csp/";
 
 // debugging
 function log(s) {
diff --git a/content/base/test/csp/test_csp_report.html b/dom/base/test/csp/test_csp_report.html
similarity index 94%
rename from content/base/test/csp/test_csp_report.html
rename to dom/base/test/csp/test_csp_report.html
index 2e13835fe36..0f2dc31b4f5 100644
--- a/content/base/test/csp/test_csp_report.html
+++ b/dom/base/test/csp/test_csp_report.html
@@ -27,11 +27,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=548193
  * observer, we can set the actual report-uri to a foo value.
  */
 
-const testfile = "tests/content/base/test/csp/file_csp_report.html";
+const testfile = "tests/dom/base/test/csp/file_csp_report.html";
 const reportURI = "http://mochi.test:8888/foo.sjs";
 const policy = "script-src 'none'; report-uri " + reportURI;
-const docUri = "http://mochi.test:8888/tests/content/base/test/csp/file_csp_testserver.sjs" +
-               "?file=tests/content/base/test/csp/file_csp_report.html" +
+const docUri = "http://mochi.test:8888/tests/dom/base/test/csp/file_csp_testserver.sjs" +
+               "?file=tests/dom/base/test/csp/file_csp_report.html" +
                "&csp=script-src%20%27none%27%3B%20report-uri%20http%3A//mochi.test%3A8888/foo.sjs";
 
 window.checkResults = function(reportObj) {
@@ -45,7 +45,7 @@ window.checkResults = function(reportObj) {
   is(cspReport["document-uri"], docUri, "Incorrect document-uri");
 
   // we can not test for the whole referrer since it includes platform specific information
-  ok(cspReport["referrer"].startsWith("http://mochi.test:8888/tests/content/base/test/csp/test_csp_report.html"),
+  ok(cspReport["referrer"].startsWith("http://mochi.test:8888/tests/dom/base/test/csp/test_csp_report.html"),
      "Incorrect referrer");
 
   is(cspReport["blocked-uri"], "self", "Incorrect blocked-uri");
diff --git a/content/base/test/csp/test_hash_source.html b/dom/base/test/csp/test_hash_source.html
similarity index 100%
rename from content/base/test/csp/test_hash_source.html
rename to dom/base/test/csp/test_hash_source.html
diff --git a/content/base/test/csp/test_leading_wildcard.html b/dom/base/test/csp/test_leading_wildcard.html
similarity index 97%
rename from content/base/test/csp/test_leading_wildcard.html
rename to dom/base/test/csp/test_leading_wildcard.html
index f041922a290..f8ede591539 100644
--- a/content/base/test/csp/test_leading_wildcard.html
+++ b/dom/base/test/csp/test_leading_wildcard.html
@@ -86,7 +86,7 @@ window.wildCardExaminer = new examiner();
 function runTest() {
   var src = "file_csp_testserver.sjs";
   // append the file that should be served
-  src += "?file=" + escape("tests/content/base/test/csp/file_leading_wildcard.html");
+  src += "?file=" + escape("tests/dom/base/test/csp/file_leading_wildcard.html");
   // append the CSP that should be used to serve the file
   src += "&csp=" + escape(policy);
 
diff --git a/content/base/test/csp/test_multi_policy_injection_bypass.html b/dom/base/test/csp/test_multi_policy_injection_bypass.html
similarity index 98%
rename from content/base/test/csp/test_multi_policy_injection_bypass.html
rename to dom/base/test/csp/test_multi_policy_injection_bypass.html
index 28a8bc077be..4db4392d466 100644
--- a/content/base/test/csp/test_multi_policy_injection_bypass.html
+++ b/dom/base/test/csp/test_multi_policy_injection_bypass.html
@@ -19,7 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=717511
 <iframe style="width:200px;height:200px;" id='cspframe2'></iframe>
 <script class="testbody" type="text/javascript">
 
-var path = "/tests/content/base/test/";
+var path = "/tests/dom/base/test/";
 
 // These are test results: -1 means it hasn't run,
 // true/false is the pass/fail result.
diff --git a/content/base/test/csp/test_nonce_source.html b/dom/base/test/csp/test_nonce_source.html
similarity index 100%
rename from content/base/test/csp/test_nonce_source.html
rename to dom/base/test/csp/test_nonce_source.html
diff --git a/content/base/test/csp/test_policyuri_regression_from_multipolicy.html b/dom/base/test/csp/test_policyuri_regression_from_multipolicy.html
similarity index 100%
rename from content/base/test/csp/test_policyuri_regression_from_multipolicy.html
rename to dom/base/test/csp/test_policyuri_regression_from_multipolicy.html
diff --git a/content/base/test/csp/test_report_uri_missing_in_report_only_header.html b/dom/base/test/csp/test_report_uri_missing_in_report_only_header.html
similarity index 100%
rename from content/base/test/csp/test_report_uri_missing_in_report_only_header.html
rename to dom/base/test/csp/test_report_uri_missing_in_report_only_header.html
diff --git a/content/base/test/csp/test_self_none_as_hostname_confusion.html b/dom/base/test/csp/test_self_none_as_hostname_confusion.html
similarity index 100%
rename from content/base/test/csp/test_self_none_as_hostname_confusion.html
rename to dom/base/test/csp/test_self_none_as_hostname_confusion.html
diff --git a/content/base/test/csp/test_subframe_run_js_if_allowed.html b/dom/base/test/csp/test_subframe_run_js_if_allowed.html
similarity index 100%
rename from content/base/test/csp/test_subframe_run_js_if_allowed.html
rename to dom/base/test/csp/test_subframe_run_js_if_allowed.html
diff --git a/content/base/test/delayedServerEvents.sjs b/dom/base/test/delayedServerEvents.sjs
similarity index 100%
rename from content/base/test/delayedServerEvents.sjs
rename to dom/base/test/delayedServerEvents.sjs
diff --git a/content/base/test/eventsource.resource b/dom/base/test/eventsource.resource
similarity index 100%
rename from content/base/test/eventsource.resource
rename to dom/base/test/eventsource.resource
diff --git a/content/base/test/eventsource.resource^headers^ b/dom/base/test/eventsource.resource^headers^
similarity index 100%
rename from content/base/test/eventsource.resource^headers^
rename to dom/base/test/eventsource.resource^headers^
diff --git a/content/base/test/eventsource_redirect.resource b/dom/base/test/eventsource_redirect.resource
similarity index 100%
rename from content/base/test/eventsource_redirect.resource
rename to dom/base/test/eventsource_redirect.resource
diff --git a/content/base/test/eventsource_redirect.resource^headers^ b/dom/base/test/eventsource_redirect.resource^headers^
similarity index 100%
rename from content/base/test/eventsource_redirect.resource^headers^
rename to dom/base/test/eventsource_redirect.resource^headers^
diff --git a/content/base/test/eventsource_redirect_to.resource b/dom/base/test/eventsource_redirect_to.resource
similarity index 100%
rename from content/base/test/eventsource_redirect_to.resource
rename to dom/base/test/eventsource_redirect_to.resource
diff --git a/content/base/test/eventsource_redirect_to.resource^headers^ b/dom/base/test/eventsource_redirect_to.resource^headers^
similarity index 100%
rename from content/base/test/eventsource_redirect_to.resource^headers^
rename to dom/base/test/eventsource_redirect_to.resource^headers^
diff --git a/content/base/test/fake_plugin.tst b/dom/base/test/fake_plugin.tst
similarity index 100%
rename from content/base/test/fake_plugin.tst
rename to dom/base/test/fake_plugin.tst
diff --git a/content/base/test/file_CrossSiteXHR_cache_server.sjs b/dom/base/test/file_CrossSiteXHR_cache_server.sjs
similarity index 89%
rename from content/base/test/file_CrossSiteXHR_cache_server.sjs
rename to dom/base/test/file_CrossSiteXHR_cache_server.sjs
index 4e436c13be9..5da6bf663e2 100644
--- a/content/base/test/file_CrossSiteXHR_cache_server.sjs
+++ b/dom/base/test/file_CrossSiteXHR_cache_server.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
   });
 
   if ("setState" in query) {
-    setState("test/content/base/test_CrossSiteXHR_cache:secData",
+    setState("test/dom/base/test_CrossSiteXHR_cache:secData",
              query.setState);
 
     response.setHeader("Cache-Control", "no-cache", false);
@@ -22,7 +22,7 @@ function handleRequest(request, response)
   // Send response
 
   secData =
-    eval(getState("test/content/base/test_CrossSiteXHR_cache:secData"));
+    eval(getState("test/dom/base/test_CrossSiteXHR_cache:secData"));
 
   if (secData.allowOrigin)
     response.setHeader("Access-Control-Allow-Origin", secData.allowOrigin);
diff --git a/content/base/test/file_CrossSiteXHR_inner.html b/dom/base/test/file_CrossSiteXHR_inner.html
similarity index 100%
rename from content/base/test/file_CrossSiteXHR_inner.html
rename to dom/base/test/file_CrossSiteXHR_inner.html
diff --git a/content/base/test/file_CrossSiteXHR_inner.jar b/dom/base/test/file_CrossSiteXHR_inner.jar
similarity index 100%
rename from content/base/test/file_CrossSiteXHR_inner.jar
rename to dom/base/test/file_CrossSiteXHR_inner.jar
diff --git a/content/base/test/file_CrossSiteXHR_inner_data.sjs b/dom/base/test/file_CrossSiteXHR_inner_data.sjs
similarity index 100%
rename from content/base/test/file_CrossSiteXHR_inner_data.sjs
rename to dom/base/test/file_CrossSiteXHR_inner_data.sjs
diff --git a/content/base/test/file_CrossSiteXHR_server.sjs b/dom/base/test/file_CrossSiteXHR_server.sjs
similarity index 98%
rename from content/base/test/file_CrossSiteXHR_server.sjs
rename to dom/base/test/file_CrossSiteXHR_server.sjs
index f1d9bb720a1..cbf042040e8 100644
--- a/content/base/test/file_CrossSiteXHR_server.sjs
+++ b/dom/base/test/file_CrossSiteXHR_server.sjs
@@ -138,7 +138,7 @@ function handleRequest(request, response)
 
   if (query.hop && query.hop < hops.length) {
     newURL = hops[query.hop].server +
-             "/tests/content/base/test/file_CrossSiteXHR_server.sjs?" +
+             "/tests/dom/base/test/file_CrossSiteXHR_server.sjs?" +
              "hop=" + (query.hop + 1) + "&hops=" + query.hops;
     response.setStatusLine(null, 307, "redirect");
     response.setHeader("Location", newURL);
diff --git a/content/base/test/file_XHRDocURI.html b/dom/base/test/file_XHRDocURI.html
similarity index 100%
rename from content/base/test/file_XHRDocURI.html
rename to dom/base/test/file_XHRDocURI.html
diff --git a/content/base/test/file_XHRDocURI.html^headers^ b/dom/base/test/file_XHRDocURI.html^headers^
similarity index 100%
rename from content/base/test/file_XHRDocURI.html^headers^
rename to dom/base/test/file_XHRDocURI.html^headers^
diff --git a/content/base/test/file_XHRDocURI.sjs b/dom/base/test/file_XHRDocURI.sjs
similarity index 100%
rename from content/base/test/file_XHRDocURI.sjs
rename to dom/base/test/file_XHRDocURI.sjs
diff --git a/content/base/test/file_XHRDocURI.text b/dom/base/test/file_XHRDocURI.text
similarity index 100%
rename from content/base/test/file_XHRDocURI.text
rename to dom/base/test/file_XHRDocURI.text
diff --git a/content/base/test/file_XHRDocURI.text^headers^ b/dom/base/test/file_XHRDocURI.text^headers^
similarity index 100%
rename from content/base/test/file_XHRDocURI.text^headers^
rename to dom/base/test/file_XHRDocURI.text^headers^
diff --git a/content/base/test/file_XHRDocURI.xml b/dom/base/test/file_XHRDocURI.xml
similarity index 100%
rename from content/base/test/file_XHRDocURI.xml
rename to dom/base/test/file_XHRDocURI.xml
diff --git a/content/base/test/file_XHRDocURI.xml^headers^ b/dom/base/test/file_XHRDocURI.xml^headers^
similarity index 100%
rename from content/base/test/file_XHRDocURI.xml^headers^
rename to dom/base/test/file_XHRDocURI.xml^headers^
diff --git a/content/base/test/file_XHRResponseURL.js b/dom/base/test/file_XHRResponseURL.js
similarity index 66%
rename from content/base/test/file_XHRResponseURL.js
rename to dom/base/test/file_XHRResponseURL.js
index ab4326ba835..3581988b87f 100644
--- a/content/base/test/file_XHRResponseURL.js
+++ b/dom/base/test/file_XHRResponseURL.js
@@ -108,30 +108,30 @@ function testSuccessResponse() {
     // tests that start with same-origin request
     {
       message: "request to same-origin without redirect",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"
     },
     {
       message: "request to same-origin redirect to same-origin URL",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"
     },
     {
       message: "request to same-origin redirects several times and finally go to same-origin URL",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"
     },
     {
       message: "request to same-origin redirect to cross-origin URL",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to same-origin redirects several times and finally go to cross-origin URL",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
@@ -139,60 +139,60 @@ function testSuccessResponse() {
     // tests that start with cross-origin request
     {
       message: "request to cross-origin without redirect",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text"
     },
     {
       message: "request to cross-origin redirect back to same-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"
     },
     {
       message: "request to cross-origin redirect to the same cross-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to cross-origin redirect to another cross-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.org/tests/content/base/test/file_XHRResponseURL.text",
-      responseURL: "http://example.org/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.org/tests/dom/base/test/file_XHRResponseURL.text",
+      responseURL: "http://example.org/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to cross-origin redirects several times and finally go to same-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to cross-origin redirects several times and finally go to the same cross-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to cross-origin redirects several times and finally go to another cross-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.org/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://example.org/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.org/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://example.org/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request to cross-origin redirects to another cross-origin and finally go to the other cross-origin URL",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.org/tests/content/base/test/file_XHRResponseURL.sjs?url=http://test1.example.com/tests/content/base/test/file_XHRResponseURL.text"),
-      responseURL: "http://test1.example.com/tests/content/base/test/file_XHRResponseURL.text",
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL.sjs?url=" + encodeURIComponent("http://example.org/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://test1.example.com/tests/dom/base/test/file_XHRResponseURL.text"),
+      responseURL: "http://test1.example.com/tests/dom/base/test/file_XHRResponseURL.text",
       skip: isInWorker(),
       reason: "cross-origin redirect request not works on Workers, see bug 882458"
     },
     {
       message: "request URL has fragment",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text#fragment",
-      responseURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text"
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text#fragment",
+      responseURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text"
     },
 
     // tests for non-http(s) URL
@@ -230,11 +230,11 @@ function testFailedResponse() {
   var parameters = [
     {
       message: "should be empty for denied cross-origin request without redirect",
-      requestURL: "http://example.com/tests/content/base/test/file_XHRResponseURL_nocors.text"
+      requestURL: "http://example.com/tests/dom/base/test/file_XHRResponseURL_nocors.text"
     },
     {
       message: "should be empty for denied cross-origin request with redirect",
-      requestURL: "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/content/base/test/file_XHRResponseURL_nocors.text"
+      requestURL: "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://example.com/tests/dom/base/test/file_XHRResponseURL_nocors.text"
     }
   ];
 
@@ -268,7 +268,7 @@ function testNotToLeakResponseURLWhileDoingRedirectsInWindow() {
   SpecialPowers.addObserver(requestObserver, "specialpowers-http-notify-request", false);
 
   return new Promise(function (aResolve, aReject) {
-    xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text");
+    xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text");
     xhr.addEventListener("load", function () {
       SpecialPowers.removeObserver(requestObserver, "specialpowers-http-notify-request");
       aResolve();
@@ -294,7 +294,7 @@ function testNotToLeakResponseURLWhileDoingRedirectsInWorker() {
   return new Promise(function (aResolve, aReject) {
     self.addEventListener("message", testRedirect);
     message({type: "redirect_test", status: "start"});
-    xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/content/base/test/file_XHRResponseURL.text");
+    xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.sjs?url=http://mochi.test:8888/tests/dom/base/test/file_XHRResponseURL.text");
     xhr.addEventListener("load", function () {
       self.removeEventListener("message", testRedirect);
       message({type: "redirect_test", status: "end"});
diff --git a/content/base/test/file_XHRResponseURL.sjs b/dom/base/test/file_XHRResponseURL.sjs
similarity index 100%
rename from content/base/test/file_XHRResponseURL.sjs
rename to dom/base/test/file_XHRResponseURL.sjs
diff --git a/content/base/test/file_XHRResponseURL.text b/dom/base/test/file_XHRResponseURL.text
similarity index 100%
rename from content/base/test/file_XHRResponseURL.text
rename to dom/base/test/file_XHRResponseURL.text
diff --git a/content/base/test/file_XHRResponseURL.text^headers^ b/dom/base/test/file_XHRResponseURL.text^headers^
similarity index 100%
rename from content/base/test/file_XHRResponseURL.text^headers^
rename to dom/base/test/file_XHRResponseURL.text^headers^
diff --git a/content/base/test/file_XHRResponseURL_nocors.text b/dom/base/test/file_XHRResponseURL_nocors.text
similarity index 100%
rename from content/base/test/file_XHRResponseURL_nocors.text
rename to dom/base/test/file_XHRResponseURL_nocors.text
diff --git a/content/base/test/file_XHRSendData.sjs b/dom/base/test/file_XHRSendData.sjs
similarity index 100%
rename from content/base/test/file_XHRSendData.sjs
rename to dom/base/test/file_XHRSendData.sjs
diff --git a/content/base/test/file_XHRSendData_doc.xml b/dom/base/test/file_XHRSendData_doc.xml
similarity index 100%
rename from content/base/test/file_XHRSendData_doc.xml
rename to dom/base/test/file_XHRSendData_doc.xml
diff --git a/content/base/test/file_XHRSendData_doc.xml^headers^ b/dom/base/test/file_XHRSendData_doc.xml^headers^
similarity index 100%
rename from content/base/test/file_XHRSendData_doc.xml^headers^
rename to dom/base/test/file_XHRSendData_doc.xml^headers^
diff --git a/content/base/test/file_XHR_anon.sjs b/dom/base/test/file_XHR_anon.sjs
similarity index 100%
rename from content/base/test/file_XHR_anon.sjs
rename to dom/base/test/file_XHR_anon.sjs
diff --git a/content/base/test/file_XHR_binary1.bin b/dom/base/test/file_XHR_binary1.bin
similarity index 100%
rename from content/base/test/file_XHR_binary1.bin
rename to dom/base/test/file_XHR_binary1.bin
diff --git a/content/base/test/file_XHR_binary1.bin^headers^ b/dom/base/test/file_XHR_binary1.bin^headers^
similarity index 100%
rename from content/base/test/file_XHR_binary1.bin^headers^
rename to dom/base/test/file_XHR_binary1.bin^headers^
diff --git a/content/base/test/file_XHR_binary2.bin b/dom/base/test/file_XHR_binary2.bin
similarity index 100%
rename from content/base/test/file_XHR_binary2.bin
rename to dom/base/test/file_XHR_binary2.bin
diff --git a/content/base/test/file_XHR_fail1.txt b/dom/base/test/file_XHR_fail1.txt
similarity index 100%
rename from content/base/test/file_XHR_fail1.txt
rename to dom/base/test/file_XHR_fail1.txt
diff --git a/dom/base/test/file_XHR_fail1.txt^headers^ b/dom/base/test/file_XHR_fail1.txt^headers^
new file mode 100644
index 00000000000..cc738a3fa28
--- /dev/null
+++ b/dom/base/test/file_XHR_fail1.txt^headers^
@@ -0,0 +1,2 @@
+HTTP 301 Moved Permanently
+Location: http://example.com/tests/dom/base/test/file_XHR_pass2.txt
diff --git a/content/base/test/file_XHR_fail1b.txt b/dom/base/test/file_XHR_fail1b.txt
similarity index 100%
rename from content/base/test/file_XHR_fail1b.txt
rename to dom/base/test/file_XHR_fail1b.txt
diff --git a/content/base/test/file_XHR_header.sjs b/dom/base/test/file_XHR_header.sjs
similarity index 100%
rename from content/base/test/file_XHR_header.sjs
rename to dom/base/test/file_XHR_header.sjs
diff --git a/content/base/test/file_XHR_pass1.xml b/dom/base/test/file_XHR_pass1.xml
similarity index 100%
rename from content/base/test/file_XHR_pass1.xml
rename to dom/base/test/file_XHR_pass1.xml
diff --git a/content/base/test/file_XHR_pass2.txt b/dom/base/test/file_XHR_pass2.txt
similarity index 100%
rename from content/base/test/file_XHR_pass2.txt
rename to dom/base/test/file_XHR_pass2.txt
diff --git a/content/base/test/file_XHR_pass3.txt b/dom/base/test/file_XHR_pass3.txt
similarity index 100%
rename from content/base/test/file_XHR_pass3.txt
rename to dom/base/test/file_XHR_pass3.txt
diff --git a/content/base/test/file_XHR_pass3.txt^headers^ b/dom/base/test/file_XHR_pass3.txt^headers^
similarity index 100%
rename from content/base/test/file_XHR_pass3.txt^headers^
rename to dom/base/test/file_XHR_pass3.txt^headers^
diff --git a/content/base/test/file_XHR_system_redirect.html b/dom/base/test/file_XHR_system_redirect.html
similarity index 100%
rename from content/base/test/file_XHR_system_redirect.html
rename to dom/base/test/file_XHR_system_redirect.html
diff --git a/content/base/test/file_XHR_system_redirect.html^headers^ b/dom/base/test/file_XHR_system_redirect.html^headers^
similarity index 100%
rename from content/base/test/file_XHR_system_redirect.html^headers^
rename to dom/base/test/file_XHR_system_redirect.html^headers^
diff --git a/content/base/test/file_XHR_timeout.sjs b/dom/base/test/file_XHR_timeout.sjs
similarity index 100%
rename from content/base/test/file_XHR_timeout.sjs
rename to dom/base/test/file_XHR_timeout.sjs
diff --git a/content/base/test/file_base_xbl.xml b/dom/base/test/file_base_xbl.xml
similarity index 100%
rename from content/base/test/file_base_xbl.xml
rename to dom/base/test/file_base_xbl.xml
diff --git a/content/base/test/file_bug1008126_worker.js b/dom/base/test/file_bug1008126_worker.js
similarity index 93%
rename from content/base/test/file_bug1008126_worker.js
rename to dom/base/test/file_bug1008126_worker.js
index ded719bbef3..d68bc678977 100644
--- a/content/base/test/file_bug1008126_worker.js
+++ b/dom/base/test/file_bug1008126_worker.js
@@ -3,9 +3,9 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-var gJar1 = "jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_1.txt";
-var gJar2 = "jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_2.txt";
-var gJar3 = "jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_big.txt";
+var gJar1 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt";
+var gJar2 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_2.txt";
+var gJar3 = "jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_big.txt";
 var gPaddingChar = ".";
 var gPaddingSize = 10000;
 var gPadding = "";
diff --git a/content/base/test/file_bug1011748_OK.sjs b/dom/base/test/file_bug1011748_OK.sjs
similarity index 100%
rename from content/base/test/file_bug1011748_OK.sjs
rename to dom/base/test/file_bug1011748_OK.sjs
diff --git a/content/base/test/file_bug1011748_redirect.sjs b/dom/base/test/file_bug1011748_redirect.sjs
similarity index 100%
rename from content/base/test/file_bug1011748_redirect.sjs
rename to dom/base/test/file_bug1011748_redirect.sjs
diff --git a/content/base/test/file_bug28293.sjs b/dom/base/test/file_bug28293.sjs
similarity index 100%
rename from content/base/test/file_bug28293.sjs
rename to dom/base/test/file_bug28293.sjs
diff --git a/content/base/test/file_bug326337.xml b/dom/base/test/file_bug326337.xml
similarity index 100%
rename from content/base/test/file_bug326337.xml
rename to dom/base/test/file_bug326337.xml
diff --git a/content/base/test/file_bug326337_inner.html b/dom/base/test/file_bug326337_inner.html
similarity index 100%
rename from content/base/test/file_bug326337_inner.html
rename to dom/base/test/file_bug326337_inner.html
diff --git a/content/base/test/file_bug326337_outer.html b/dom/base/test/file_bug326337_outer.html
similarity index 66%
rename from content/base/test/file_bug326337_outer.html
rename to dom/base/test/file_bug326337_outer.html
index b5b5fef0893..9d63f726324 100644
--- a/content/base/test/file_bug326337_outer.html
+++ b/dom/base/test/file_bug326337_outer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<iframe id="inner" src="http://test1.example.com/tests/content/base/test/file_bug326337_inner.html"></iframe>
+<iframe id="inner" src="http://test1.example.com/tests/dom/base/test/file_bug326337_inner.html"></iframe>
 <script>
 var t = setInterval(doCheck, 300);
 function doCheck() {
diff --git a/content/base/test/file_bug416317.xhtml b/dom/base/test/file_bug416317.xhtml
similarity index 100%
rename from content/base/test/file_bug416317.xhtml
rename to dom/base/test/file_bug416317.xhtml
diff --git a/content/base/test/file_bug426646-1.html b/dom/base/test/file_bug426646-1.html
similarity index 100%
rename from content/base/test/file_bug426646-1.html
rename to dom/base/test/file_bug426646-1.html
diff --git a/content/base/test/file_bug426646-2.html b/dom/base/test/file_bug426646-2.html
similarity index 100%
rename from content/base/test/file_bug426646-2.html
rename to dom/base/test/file_bug426646-2.html
diff --git a/content/base/test/file_bug428847-1.xhtml b/dom/base/test/file_bug428847-1.xhtml
similarity index 100%
rename from content/base/test/file_bug428847-1.xhtml
rename to dom/base/test/file_bug428847-1.xhtml
diff --git a/content/base/test/file_bug428847-2.xhtml b/dom/base/test/file_bug428847-2.xhtml
similarity index 100%
rename from content/base/test/file_bug428847-2.xhtml
rename to dom/base/test/file_bug428847-2.xhtml
diff --git a/content/base/test/file_bug498897.css b/dom/base/test/file_bug498897.css
similarity index 100%
rename from content/base/test/file_bug498897.css
rename to dom/base/test/file_bug498897.css
diff --git a/content/base/test/file_bug498897.html b/dom/base/test/file_bug498897.html
similarity index 100%
rename from content/base/test/file_bug498897.html
rename to dom/base/test/file_bug498897.html
diff --git a/content/base/test/file_bug498897.html^headers^ b/dom/base/test/file_bug498897.html^headers^
similarity index 100%
rename from content/base/test/file_bug498897.html^headers^
rename to dom/base/test/file_bug498897.html^headers^
diff --git a/content/base/test/file_bug503473-frame.sjs b/dom/base/test/file_bug503473-frame.sjs
similarity index 100%
rename from content/base/test/file_bug503473-frame.sjs
rename to dom/base/test/file_bug503473-frame.sjs
diff --git a/content/base/test/file_bug503481.sjs b/dom/base/test/file_bug503481.sjs
similarity index 100%
rename from content/base/test/file_bug503481.sjs
rename to dom/base/test/file_bug503481.sjs
diff --git a/content/base/test/file_bug503481b_inner.html b/dom/base/test/file_bug503481b_inner.html
similarity index 100%
rename from content/base/test/file_bug503481b_inner.html
rename to dom/base/test/file_bug503481b_inner.html
diff --git a/content/base/test/file_bug541937.html b/dom/base/test/file_bug541937.html
similarity index 100%
rename from content/base/test/file_bug541937.html
rename to dom/base/test/file_bug541937.html
diff --git a/content/base/test/file_bug541937.xhtml b/dom/base/test/file_bug541937.xhtml
similarity index 100%
rename from content/base/test/file_bug541937.xhtml
rename to dom/base/test/file_bug541937.xhtml
diff --git a/content/base/test/file_bug557892.html b/dom/base/test/file_bug557892.html
similarity index 100%
rename from content/base/test/file_bug557892.html
rename to dom/base/test/file_bug557892.html
diff --git a/content/base/test/file_bug562137.txt b/dom/base/test/file_bug562137.txt
similarity index 100%
rename from content/base/test/file_bug562137.txt
rename to dom/base/test/file_bug562137.txt
diff --git a/content/base/test/file_bug590812-ref.xhtml b/dom/base/test/file_bug590812-ref.xhtml
similarity index 100%
rename from content/base/test/file_bug590812-ref.xhtml
rename to dom/base/test/file_bug590812-ref.xhtml
diff --git a/content/base/test/file_bug590812.xml b/dom/base/test/file_bug590812.xml
similarity index 100%
rename from content/base/test/file_bug590812.xml
rename to dom/base/test/file_bug590812.xml
diff --git a/content/base/test/file_bug590870.html b/dom/base/test/file_bug590870.html
similarity index 100%
rename from content/base/test/file_bug590870.html
rename to dom/base/test/file_bug590870.html
diff --git a/content/base/test/file_bug601803a.html b/dom/base/test/file_bug601803a.html
similarity index 77%
rename from content/base/test/file_bug601803a.html
rename to dom/base/test/file_bug601803a.html
index 7d016558c19..c39ff7219e0 100644
--- a/content/base/test/file_bug601803a.html
+++ b/dom/base/test/file_bug601803a.html
@@ -17,6 +17,6 @@ function runTest() {
 </script>
 </head>
 <body>
-<iframe id="frame" src="http://test1.example.org/tests/content/base/test/file_bug601803b.html" onload="runTest();"></iframe>
+<iframe id="frame" src="http://test1.example.org/tests/dom/base/test/file_bug601803b.html" onload="runTest();"></iframe>
 </body>
 </html>
diff --git a/content/base/test/file_bug601803b.html b/dom/base/test/file_bug601803b.html
similarity index 100%
rename from content/base/test/file_bug601803b.html
rename to dom/base/test/file_bug601803b.html
diff --git a/content/base/test/file_bug604660-1.xml b/dom/base/test/file_bug604660-1.xml
similarity index 100%
rename from content/base/test/file_bug604660-1.xml
rename to dom/base/test/file_bug604660-1.xml
diff --git a/content/base/test/file_bug604660-2.xsl b/dom/base/test/file_bug604660-2.xsl
similarity index 100%
rename from content/base/test/file_bug604660-2.xsl
rename to dom/base/test/file_bug604660-2.xsl
diff --git a/content/base/test/file_bug604660-3.js b/dom/base/test/file_bug604660-3.js
similarity index 100%
rename from content/base/test/file_bug604660-3.js
rename to dom/base/test/file_bug604660-3.js
diff --git a/content/base/test/file_bug604660-4.js b/dom/base/test/file_bug604660-4.js
similarity index 100%
rename from content/base/test/file_bug604660-4.js
rename to dom/base/test/file_bug604660-4.js
diff --git a/content/base/test/file_bug604660-5.xml b/dom/base/test/file_bug604660-5.xml
similarity index 100%
rename from content/base/test/file_bug604660-5.xml
rename to dom/base/test/file_bug604660-5.xml
diff --git a/content/base/test/file_bug604660-6.xsl b/dom/base/test/file_bug604660-6.xsl
similarity index 100%
rename from content/base/test/file_bug604660-6.xsl
rename to dom/base/test/file_bug604660-6.xsl
diff --git a/content/base/test/file_bug622088.sjs b/dom/base/test/file_bug622088.sjs
similarity index 100%
rename from content/base/test/file_bug622088.sjs
rename to dom/base/test/file_bug622088.sjs
diff --git a/content/base/test/file_bug622088_inner.html b/dom/base/test/file_bug622088_inner.html
similarity index 100%
rename from content/base/test/file_bug622088_inner.html
rename to dom/base/test/file_bug622088_inner.html
diff --git a/content/base/test/file_bug675121.sjs b/dom/base/test/file_bug675121.sjs
similarity index 100%
rename from content/base/test/file_bug675121.sjs
rename to dom/base/test/file_bug675121.sjs
diff --git a/content/base/test/file_bug687859-16.js b/dom/base/test/file_bug687859-16.js
similarity index 100%
rename from content/base/test/file_bug687859-16.js
rename to dom/base/test/file_bug687859-16.js
diff --git a/content/base/test/file_bug687859-16.js^headers^ b/dom/base/test/file_bug687859-16.js^headers^
similarity index 100%
rename from content/base/test/file_bug687859-16.js^headers^
rename to dom/base/test/file_bug687859-16.js^headers^
diff --git a/content/base/test/file_bug687859-bom.js b/dom/base/test/file_bug687859-bom.js
similarity index 100%
rename from content/base/test/file_bug687859-bom.js
rename to dom/base/test/file_bug687859-bom.js
diff --git a/content/base/test/file_bug687859-bom.js^headers^ b/dom/base/test/file_bug687859-bom.js^headers^
similarity index 100%
rename from content/base/test/file_bug687859-bom.js^headers^
rename to dom/base/test/file_bug687859-bom.js^headers^
diff --git a/content/base/test/file_bug687859-charset.js b/dom/base/test/file_bug687859-charset.js
similarity index 100%
rename from content/base/test/file_bug687859-charset.js
rename to dom/base/test/file_bug687859-charset.js
diff --git a/content/base/test/file_bug687859-http.js b/dom/base/test/file_bug687859-http.js
similarity index 100%
rename from content/base/test/file_bug687859-http.js
rename to dom/base/test/file_bug687859-http.js
diff --git a/content/base/test/file_bug687859-http.js^headers^ b/dom/base/test/file_bug687859-http.js^headers^
similarity index 100%
rename from content/base/test/file_bug687859-http.js^headers^
rename to dom/base/test/file_bug687859-http.js^headers^
diff --git a/content/base/test/file_bug687859-inherit.js b/dom/base/test/file_bug687859-inherit.js
similarity index 100%
rename from content/base/test/file_bug687859-inherit.js
rename to dom/base/test/file_bug687859-inherit.js
diff --git a/content/base/test/file_bug692434.xml b/dom/base/test/file_bug692434.xml
similarity index 100%
rename from content/base/test/file_bug692434.xml
rename to dom/base/test/file_bug692434.xml
diff --git a/content/base/test/file_bug707142_baseline.json b/dom/base/test/file_bug707142_baseline.json
similarity index 100%
rename from content/base/test/file_bug707142_baseline.json
rename to dom/base/test/file_bug707142_baseline.json
diff --git a/content/base/test/file_bug707142_bom.json b/dom/base/test/file_bug707142_bom.json
similarity index 100%
rename from content/base/test/file_bug707142_bom.json
rename to dom/base/test/file_bug707142_bom.json
diff --git a/content/base/test/file_bug707142_utf-16.json b/dom/base/test/file_bug707142_utf-16.json
similarity index 100%
rename from content/base/test/file_bug707142_utf-16.json
rename to dom/base/test/file_bug707142_utf-16.json
diff --git a/content/base/test/file_bug708620-2.html b/dom/base/test/file_bug708620-2.html
similarity index 100%
rename from content/base/test/file_bug708620-2.html
rename to dom/base/test/file_bug708620-2.html
diff --git a/content/base/test/file_bug708620.html b/dom/base/test/file_bug708620.html
similarity index 100%
rename from content/base/test/file_bug708620.html
rename to dom/base/test/file_bug708620.html
diff --git a/content/base/test/file_bug782342.txt b/dom/base/test/file_bug782342.txt
similarity index 100%
rename from content/base/test/file_bug782342.txt
rename to dom/base/test/file_bug782342.txt
diff --git a/content/base/test/file_bug787778.sjs b/dom/base/test/file_bug787778.sjs
similarity index 100%
rename from content/base/test/file_bug787778.sjs
rename to dom/base/test/file_bug787778.sjs
diff --git a/content/base/test/file_bug804395.jar b/dom/base/test/file_bug804395.jar
similarity index 100%
rename from content/base/test/file_bug804395.jar
rename to dom/base/test/file_bug804395.jar
diff --git a/content/base/test/file_bug869432.eventsource b/dom/base/test/file_bug869432.eventsource
similarity index 100%
rename from content/base/test/file_bug869432.eventsource
rename to dom/base/test/file_bug869432.eventsource
diff --git a/content/base/test/file_bug869432.eventsource^headers^ b/dom/base/test/file_bug869432.eventsource^headers^
similarity index 100%
rename from content/base/test/file_bug869432.eventsource^headers^
rename to dom/base/test/file_bug869432.eventsource^headers^
diff --git a/content/base/test/file_bug902350.html b/dom/base/test/file_bug902350.html
similarity index 70%
rename from content/base/test/file_bug902350.html
rename to dom/base/test/file_bug902350.html
index 76b4c222319..ce87072f3ea 100644
--- a/content/base/test/file_bug902350.html
+++ b/dom/base/test/file_bug902350.html
@@ -11,7 +11,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=902350
 
 <body>
   <div id="framediv">
-    <iframe src="https://example.com/tests/content/base/test/file_bug902350_frame.html" id="testing_frame"></iframe>
+    <iframe src="https://example.com/tests/dom/base/test/file_bug902350_frame.html" id="testing_frame"></iframe>
   </div>
 </body>
 </html>
diff --git a/content/base/test/file_bug902350_frame.html b/dom/base/test/file_bug902350_frame.html
similarity index 100%
rename from content/base/test/file_bug902350_frame.html
rename to dom/base/test/file_bug902350_frame.html
diff --git a/content/base/test/file_bug907892.html b/dom/base/test/file_bug907892.html
similarity index 100%
rename from content/base/test/file_bug907892.html
rename to dom/base/test/file_bug907892.html
diff --git a/content/base/test/file_bug945152.jar b/dom/base/test/file_bug945152.jar
similarity index 100%
rename from content/base/test/file_bug945152.jar
rename to dom/base/test/file_bug945152.jar
diff --git a/content/base/test/file_bug945152_worker.js b/dom/base/test/file_bug945152_worker.js
similarity index 89%
rename from content/base/test/file_bug945152_worker.js
rename to dom/base/test/file_bug945152_worker.js
index 84f87a9153f..9cf7f3d4ee9 100644
--- a/content/base/test/file_bug945152_worker.js
+++ b/dom/base/test/file_bug945152_worker.js
@@ -29,7 +29,7 @@ self.onmessage = function onmessage(event) {
 
   function test_mapped_sync() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_1.txt', false);
+    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt', false);
     xhr.responseType = 'arraybuffer';
     xhr.send();
     if (xhr.status) {
@@ -42,7 +42,7 @@ self.onmessage = function onmessage(event) {
 
   function test_mapped_async() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_1.txt');
+    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_1.txt');
     xhr.responseType = 'arraybuffer';
     xhr.onreadystatechange = function() {
       if (xhr.readyState !== xhr.DONE) {
@@ -62,7 +62,7 @@ self.onmessage = function onmessage(event) {
   // handled by memory allocation instead of memory mapping.
   function test_non_mapped() {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-    xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug945152.jar!/data_2.txt');
+    xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug945152.jar!/data_2.txt');
     xhr.responseType = 'arraybuffer';
     xhr.onreadystatechange = function() {
       if (xhr.readyState !== xhr.DONE) {
diff --git a/content/base/test/file_general_document.html b/dom/base/test/file_general_document.html
similarity index 100%
rename from content/base/test/file_general_document.html
rename to dom/base/test/file_general_document.html
diff --git a/content/base/test/file_html_in_xhr.html b/dom/base/test/file_html_in_xhr.html
similarity index 100%
rename from content/base/test/file_html_in_xhr.html
rename to dom/base/test/file_html_in_xhr.html
diff --git a/content/base/test/file_html_in_xhr.sjs b/dom/base/test/file_html_in_xhr.sjs
similarity index 100%
rename from content/base/test/file_html_in_xhr.sjs
rename to dom/base/test/file_html_in_xhr.sjs
diff --git a/content/base/test/file_html_in_xhr2.html b/dom/base/test/file_html_in_xhr2.html
similarity index 100%
rename from content/base/test/file_html_in_xhr2.html
rename to dom/base/test/file_html_in_xhr2.html
diff --git a/content/base/test/file_html_in_xhr3.html b/dom/base/test/file_html_in_xhr3.html
similarity index 100%
rename from content/base/test/file_html_in_xhr3.html
rename to dom/base/test/file_html_in_xhr3.html
diff --git a/content/base/test/file_htmlserializer_1.html b/dom/base/test/file_htmlserializer_1.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1.html
rename to dom/base/test/file_htmlserializer_1.html
diff --git a/content/base/test/file_htmlserializer_1_bodyonly.html b/dom/base/test/file_htmlserializer_1_bodyonly.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_bodyonly.html
rename to dom/base/test/file_htmlserializer_1_bodyonly.html
diff --git a/content/base/test/file_htmlserializer_1_format.html b/dom/base/test/file_htmlserializer_1_format.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_format.html
rename to dom/base/test/file_htmlserializer_1_format.html
diff --git a/content/base/test/file_htmlserializer_1_linebreak.html b/dom/base/test/file_htmlserializer_1_linebreak.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_linebreak.html
rename to dom/base/test/file_htmlserializer_1_linebreak.html
diff --git a/content/base/test/file_htmlserializer_1_links.html b/dom/base/test/file_htmlserializer_1_links.html
similarity index 96%
rename from content/base/test/file_htmlserializer_1_links.html
rename to dom/base/test/file_htmlserializer_1_links.html
index 3625bcf3e04..f0864c940ca 100644
--- a/content/base/test/file_htmlserializer_1_links.html
+++ b/dom/base/test/file_htmlserializer_1_links.html
@@ -8,7 +8,7 @@
        Lorem ipsum dolor sit amet, <strong>consectetuer</strong> 
 adipiscing elit. Nam eu sapien. Sed viverra lacus. Donec quis ipsum. 
 Nunc cursus aliquet lectus. Nunc vitae eros. Class aptent taciti <span>sociosqu ad 
-     litora</span> torquent <a href="http://mochi.test:8888/tests/content/base/test/file_htmlserializer_1_result1.html">per conubia</a> 
+     litora</span> torquent <a href="http://mochi.test:8888/tests/dom/base/test/file_htmlserializer_1_result1.html">per conubia</a> 
 nostra, per inceptos hymenaeos. </p>
 
 
diff --git a/content/base/test/file_htmlserializer_1_nested_body.html b/dom/base/test/file_htmlserializer_1_nested_body.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_nested_body.html
rename to dom/base/test/file_htmlserializer_1_nested_body.html
diff --git a/content/base/test/file_htmlserializer_1_no_body.html b/dom/base/test/file_htmlserializer_1_no_body.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_no_body.html
rename to dom/base/test/file_htmlserializer_1_no_body.html
diff --git a/content/base/test/file_htmlserializer_1_noflag.html b/dom/base/test/file_htmlserializer_1_noflag.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_noflag.html
rename to dom/base/test/file_htmlserializer_1_noflag.html
diff --git a/content/base/test/file_htmlserializer_1_noformatpre.html b/dom/base/test/file_htmlserializer_1_noformatpre.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_noformatpre.html
rename to dom/base/test/file_htmlserializer_1_noformatpre.html
diff --git a/content/base/test/file_htmlserializer_1_raw.html b/dom/base/test/file_htmlserializer_1_raw.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_raw.html
rename to dom/base/test/file_htmlserializer_1_raw.html
diff --git a/content/base/test/file_htmlserializer_1_sibling_body.html b/dom/base/test/file_htmlserializer_1_sibling_body.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_sibling_body.html
rename to dom/base/test/file_htmlserializer_1_sibling_body.html
diff --git a/content/base/test/file_htmlserializer_1_sibling_body_only_body.html b/dom/base/test/file_htmlserializer_1_sibling_body_only_body.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_sibling_body_only_body.html
rename to dom/base/test/file_htmlserializer_1_sibling_body_only_body.html
diff --git a/content/base/test/file_htmlserializer_1_wrap.html b/dom/base/test/file_htmlserializer_1_wrap.html
similarity index 100%
rename from content/base/test/file_htmlserializer_1_wrap.html
rename to dom/base/test/file_htmlserializer_1_wrap.html
diff --git a/content/base/test/file_htmlserializer_2.html b/dom/base/test/file_htmlserializer_2.html
similarity index 100%
rename from content/base/test/file_htmlserializer_2.html
rename to dom/base/test/file_htmlserializer_2.html
diff --git a/content/base/test/file_htmlserializer_2_basic.html b/dom/base/test/file_htmlserializer_2_basic.html
similarity index 100%
rename from content/base/test/file_htmlserializer_2_basic.html
rename to dom/base/test/file_htmlserializer_2_basic.html
diff --git a/content/base/test/file_htmlserializer_2_enthtml.html b/dom/base/test/file_htmlserializer_2_enthtml.html
similarity index 100%
rename from content/base/test/file_htmlserializer_2_enthtml.html
rename to dom/base/test/file_htmlserializer_2_enthtml.html
diff --git a/content/base/test/file_htmlserializer_2_entw3c.html b/dom/base/test/file_htmlserializer_2_entw3c.html
similarity index 100%
rename from content/base/test/file_htmlserializer_2_entw3c.html
rename to dom/base/test/file_htmlserializer_2_entw3c.html
diff --git a/content/base/test/file_htmlserializer_2_latin1.html b/dom/base/test/file_htmlserializer_2_latin1.html
similarity index 100%
rename from content/base/test/file_htmlserializer_2_latin1.html
rename to dom/base/test/file_htmlserializer_2_latin1.html
diff --git a/content/base/test/file_htmlserializer_ipv6.html b/dom/base/test/file_htmlserializer_ipv6.html
similarity index 100%
rename from content/base/test/file_htmlserializer_ipv6.html
rename to dom/base/test/file_htmlserializer_ipv6.html
diff --git a/content/base/test/file_htmlserializer_ipv6_out.html b/dom/base/test/file_htmlserializer_ipv6_out.html
similarity index 100%
rename from content/base/test/file_htmlserializer_ipv6_out.html
rename to dom/base/test/file_htmlserializer_ipv6_out.html
diff --git a/content/base/test/file_mixed_content_frameNavigation.html b/dom/base/test/file_mixed_content_frameNavigation.html
similarity index 86%
rename from content/base/test/file_mixed_content_frameNavigation.html
rename to dom/base/test/file_mixed_content_frameNavigation.html
index 433f390bd54..709bd2a6c1f 100644
--- a/content/base/test/file_mixed_content_frameNavigation.html
+++ b/dom/base/test/file_mixed_content_frameNavigation.html
@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 <div id="testContent"></div>
 
 <script>
-  var baseUrlHttps = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html";
+  var baseUrlHttps = "https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html";
 
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter_test1++;
       return;
     }
-    if (loc == "http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
+    if (loc == "http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
       return;
     }
     else {
@@ -63,7 +63,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
   // Test 2: Navigate secure grandchild iframe to insecure grandchild iframe on a page that has no secure parents
   var iframe_test2 = document.createElement("iframe");
-  iframe_test2.src = "http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_grandchild.html"
+  iframe_test2.src = "http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_grandchild.html"
   iframe_test2.onerror = function() {
     parent.postMessage({"test": "insecurePage_navigate_grandchild", "msg": "got an on error alert when loading or navigating testing iframe"}, "http://mochi.test:8888");
   };
diff --git a/content/base/test/file_mixed_content_frameNavigation_blankTarget.html b/dom/base/test/file_mixed_content_frameNavigation_blankTarget.html
similarity index 85%
rename from content/base/test/file_mixed_content_frameNavigation_blankTarget.html
rename to dom/base/test/file_mixed_content_frameNavigation_blankTarget.html
index d16a8d69da9..bd2104d8610 100644
--- a/content/base/test/file_mixed_content_frameNavigation_blankTarget.html
+++ b/dom/base/test/file_mixed_content_frameNavigation_blankTarget.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=841850
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
-<a href="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?blankTarget" id="blankTarget" target="_blank">Go to http site</a>
+<a href="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?blankTarget" id="blankTarget" target="_blank">Go to http site</a>
 
 <script>
   var blankTarget = document.getElementById("blankTarget");
diff --git a/content/base/test/file_mixed_content_frameNavigation_grandchild.html b/dom/base/test/file_mixed_content_frameNavigation_grandchild.html
similarity index 83%
rename from content/base/test/file_mixed_content_frameNavigation_grandchild.html
rename to dom/base/test/file_mixed_content_frameNavigation_grandchild.html
index eb49f78073b..cb5ae00a144 100644
--- a/content/base/test/file_mixed_content_frameNavigation_grandchild.html
+++ b/dom/base/test/file_mixed_content_frameNavigation_grandchild.html
@@ -9,7 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
   <title>Tests for Mixed Content Frame Navigation</title>
 </head>
 <body>
-<iframe src="https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild" id="child"></iframe>
+<iframe src="https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild" id="child"></iframe>
 
 <script>
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter++;
       return;
     }
-    if (loc == "http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response") {
+    if (loc == "http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response") {
       return;
     }
     else {
diff --git a/content/base/test/file_mixed_content_frameNavigation_innermost.html b/dom/base/test/file_mixed_content_frameNavigation_innermost.html
similarity index 78%
rename from content/base/test/file_mixed_content_frameNavigation_innermost.html
rename to dom/base/test/file_mixed_content_frameNavigation_innermost.html
index b95389c80d3..d6e97498b74 100644
--- a/content/base/test/file_mixed_content_frameNavigation_innermost.html
+++ b/dom/base/test/file_mixed_content_frameNavigation_innermost.html
@@ -9,7 +9,7 @@
   switch (type) {
     case "insecurePage_navigate_child":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -20,7 +20,7 @@
 
     case "insecurePage_navigate_grandchild":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_grandchild_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -31,7 +31,7 @@
 
     case "securePage_navigate_child":
       document.getElementById("content").innerHTML =
-        '<a href="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_child_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_child_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
@@ -42,7 +42,7 @@
 
     case "securePage_navigate_grandchild":
       document.getElementById("content").innerHTML=
-        '<a href="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response" id="link">Testing\<\/a>';
+        '<a href="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response" id="link">Testing\<\/a>';
       document.getElementById("link").click();
       break;
 
diff --git a/content/base/test/file_mixed_content_frameNavigation_secure.html b/dom/base/test/file_mixed_content_frameNavigation_secure.html
similarity index 86%
rename from content/base/test/file_mixed_content_frameNavigation_secure.html
rename to dom/base/test/file_mixed_content_frameNavigation_secure.html
index 29a5d946eb9..d3e3624d8a9 100644
--- a/content/base/test/file_mixed_content_frameNavigation_secure.html
+++ b/dom/base/test/file_mixed_content_frameNavigation_secure.html
@@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 <div id="testContent"></div>
 
 <script>
-  var baseUrl = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html";
+  var baseUrl = "https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html";
 
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -44,7 +44,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter_test1++;
       return;
     }
-    if (loc == "http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
+    if (loc == "http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?insecurePage_navigate_child_response") {
       return;
     } else {
       if(counter_test1 < MAX_COUNT) {
@@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
   // Test 2: Open an http page in a new tab from a link click with target=_blank.
   var iframe_test3 = document.createElement("iframe");
-  iframe_test3.src = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_blankTarget.html";
+  iframe_test3.src = "https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_blankTarget.html";
   iframe_test3.onerror = function() {
     parent.postMessage({"test": "blankTarget", "msg": "got an onerror event when loading or navigating testing iframe"}, "http://mochi.test:8888");
   };
diff --git a/content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html b/dom/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
similarity index 85%
rename from content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
rename to dom/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
index 9122428f493..09c41d9009e 100644
--- a/content/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
+++ b/dom/base/test/file_mixed_content_frameNavigation_secure_grandchild.html
@@ -10,7 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 </head>
 <body>
 
-<iframe src="https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild" id="child"></iframe>
+<iframe src="https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild" id="child"></iframe>
 <script>
   // For tests that require setTimeout, set the maximum polling time to 50 x 100ms = 5 seconds.
   var MAX_COUNT = 50;
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       counter++;
       return;
     }
-    if (loc == "http://example.com/tests/content/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response") {
+    if (loc == "http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_innermost.html?securePage_navigate_grandchild_response") {
       return;
     }
     else {
diff --git a/content/base/test/file_mixed_content_main.html b/dom/base/test/file_mixed_content_main.html
similarity index 99%
rename from content/base/test/file_mixed_content_main.html
rename to dom/base/test/file_mixed_content_main.html
index d7bae1938de..791041ff2a6 100644
--- a/content/base/test/file_mixed_content_main.html
+++ b/dom/base/test/file_mixed_content_main.html
@@ -38,7 +38,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
 -->
 
 <script>
-  var baseUrl = "http://example.com/tests/content/base/test/file_mixed_content_server.sjs";
+  var baseUrl = "http://example.com/tests/dom/base/test/file_mixed_content_server.sjs";
 
   //For tests that require setTimeout, set the maximum polling time to 100 x 100ms = 10 seconds.
   var MAX_COUNT = 100;
diff --git a/content/base/test/file_mixed_content_main_bug803225.html b/dom/base/test/file_mixed_content_main_bug803225.html
similarity index 96%
rename from content/base/test/file_mixed_content_main_bug803225.html
rename to dom/base/test/file_mixed_content_main_bug803225.html
index 575afb4dc0c..351fe2e6ac6 100644
--- a/content/base/test/file_mixed_content_main_bug803225.html
+++ b/dom/base/test/file_mixed_content_main_bug803225.html
@@ -112,7 +112,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
   var webHandler = SpecialPowers.Cc["@mozilla.org/uriloader/web-handler-app;1"].
                    createInstance(SpecialPowers.Ci.nsIWebHandlerApp);
   webHandler.name = "Web Handler";
-  webHandler.uriTemplate = "http://example.com/tests/content/base/test/bug803225_test_mailto.html?s=%";
+  webHandler.uriTemplate = "http://example.com/tests/dom/base/test/bug803225_test_mailto.html?s=%";
 
   var uri = ioService.newURI("mailto:foo@bar.com", null, null);
   webHandler.launchWithURI(uri);
@@ -144,7 +144,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
 
   // Test 8: wss protocol
   var wss;
-  wss = new WebSocket("wss://example.com/tests/content/base/test/file_mixed_content_main_bug803225_websocket");
+  wss = new WebSocket("wss://example.com/tests/dom/base/test/file_mixed_content_main_bug803225_websocket");
 
   var status_wss = "started";
   wss.onopen = function(e) {
diff --git a/content/base/test/file_mixed_content_main_bug803225_websocket_wsh.py b/dom/base/test/file_mixed_content_main_bug803225_websocket_wsh.py
similarity index 100%
rename from content/base/test/file_mixed_content_main_bug803225_websocket_wsh.py
rename to dom/base/test/file_mixed_content_main_bug803225_websocket_wsh.py
diff --git a/content/base/test/file_mixed_content_server.sjs b/dom/base/test/file_mixed_content_server.sjs
similarity index 100%
rename from content/base/test/file_mixed_content_server.sjs
rename to dom/base/test/file_mixed_content_server.sjs
diff --git a/content/base/test/file_mozfiledataurl_audio.ogg b/dom/base/test/file_mozfiledataurl_audio.ogg
similarity index 100%
rename from content/base/test/file_mozfiledataurl_audio.ogg
rename to dom/base/test/file_mozfiledataurl_audio.ogg
diff --git a/content/base/test/file_mozfiledataurl_doc.html b/dom/base/test/file_mozfiledataurl_doc.html
similarity index 100%
rename from content/base/test/file_mozfiledataurl_doc.html
rename to dom/base/test/file_mozfiledataurl_doc.html
diff --git a/content/base/test/file_mozfiledataurl_img.jpg b/dom/base/test/file_mozfiledataurl_img.jpg
similarity index 100%
rename from content/base/test/file_mozfiledataurl_img.jpg
rename to dom/base/test/file_mozfiledataurl_img.jpg
diff --git a/content/base/test/file_mozfiledataurl_inner.html b/dom/base/test/file_mozfiledataurl_inner.html
similarity index 100%
rename from content/base/test/file_mozfiledataurl_inner.html
rename to dom/base/test/file_mozfiledataurl_inner.html
diff --git a/content/base/test/file_mozfiledataurl_text.txt b/dom/base/test/file_mozfiledataurl_text.txt
similarity index 100%
rename from content/base/test/file_mozfiledataurl_text.txt
rename to dom/base/test/file_mozfiledataurl_text.txt
diff --git a/content/base/test/file_restrictedEventSource.sjs b/dom/base/test/file_restrictedEventSource.sjs
similarity index 100%
rename from content/base/test/file_restrictedEventSource.sjs
rename to dom/base/test/file_restrictedEventSource.sjs
diff --git a/content/base/test/file_websocket_basic_wsh.py b/dom/base/test/file_websocket_basic_wsh.py
similarity index 100%
rename from content/base/test/file_websocket_basic_wsh.py
rename to dom/base/test/file_websocket_basic_wsh.py
diff --git a/content/base/test/file_websocket_hello_wsh.py b/dom/base/test/file_websocket_hello_wsh.py
similarity index 100%
rename from content/base/test/file_websocket_hello_wsh.py
rename to dom/base/test/file_websocket_hello_wsh.py
diff --git a/content/base/test/file_websocket_http_resource.txt b/dom/base/test/file_websocket_http_resource.txt
similarity index 100%
rename from content/base/test/file_websocket_http_resource.txt
rename to dom/base/test/file_websocket_http_resource.txt
diff --git a/content/base/test/file_websocket_wsh.py b/dom/base/test/file_websocket_wsh.py
similarity index 100%
rename from content/base/test/file_websocket_wsh.py
rename to dom/base/test/file_websocket_wsh.py
diff --git a/dom/base/test/file_x-frame-options_main.html b/dom/base/test/file_x-frame-options_main.html
new file mode 100644
index 00000000000..63a918b992d
--- /dev/null
+++ b/dom/base/test/file_x-frame-options_main.html
@@ -0,0 +1,44 @@
+<html>
+<head>
+<title>X-Frame-Options tests</title>
+<script type="text/javascript">
+// This frame loading means all subframes have either loaded or errored out.  We
+// can now tell the test harness to check each subframe for the expected result.
+window.addEventListener('load', parent.testFramesLoaded, false);
+</script>
+</head>
+<body>
+
+<iframe id="control1" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=control1"></iframe><br>
+<iframe id="control2" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=control2"></iframe><br>
+<iframe id="deny" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=deny&xfo=deny"></iframe><br>
+<iframe id="sameorigin1" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin1&xfo=sameorigin"></iframe><br>
+<iframe id="sameorigin2" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin2&xfo=sameorigin"></iframe><br>
+<iframe id="sameorigin5" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin5&xfo=sameorigin2"></iframe><br>
+<iframe id="sameorigin6" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin6&xfo=sameorigin2"></iframe><br>
+<iframe id="sameorigin7" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin7&xfo=sameorigin3"></iframe><br>
+<iframe id="sameorigin8" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin8&xfo=sameorigin3"></iframe><br>
+<iframe id="mixedpolicy" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=mixedpolicy&xfo=mixedpolicy"></iframe><br>
+<iframe id="allow-from-allow" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=allow-from-allow&xfo=afa"></iframe><br>
+<iframe id="allow-from-deny" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=allow-from-deny&xfo=afd"></iframe><br>
+<iframe id="sameorigin-multipart" src="http://example.com/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin-multipart&xfo=sameorigin&multipart=1"></iframe><br>
+<iframe id="sameorigin-multipart2" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin-multipart2&xfo=sameorigin&multipart=1"></iframe><br>
+
+<!-- added for bug 836132 -->
+<script type="text/javascript">
+
+  function addFrame(test, xfo) {
+    var baseurl = "http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs";
+    var ifr = "<iframe id='" + test + "'" + "src='" + baseurl + "?testid=" + test + "&xfo=" + xfo + "' style='border:2px solid red;'></iframe>";
+    document.write(ifr);
+  }
+
+  addFrame("allow-from-allow-1", "afa1");
+  for (var i = 1; i<=14; i++)
+    addFrame("allow-from-deny-"+i, "afd"+i);
+
+</script>
+
+
+</body>
+</html>
diff --git a/content/base/test/file_x-frame-options_page.sjs b/dom/base/test/file_x-frame-options_page.sjs
similarity index 100%
rename from content/base/test/file_x-frame-options_page.sjs
rename to dom/base/test/file_x-frame-options_page.sjs
diff --git a/content/base/test/file_xhtmlserializer_1.xhtml b/dom/base/test/file_xhtmlserializer_1.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1.xhtml
rename to dom/base/test/file_xhtmlserializer_1.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_bodyonly.xhtml b/dom/base/test/file_xhtmlserializer_1_bodyonly.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_bodyonly.xhtml
rename to dom/base/test/file_xhtmlserializer_1_bodyonly.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_format.xhtml b/dom/base/test/file_xhtmlserializer_1_format.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_format.xhtml
rename to dom/base/test/file_xhtmlserializer_1_format.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_linebreak.xhtml b/dom/base/test/file_xhtmlserializer_1_linebreak.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_linebreak.xhtml
rename to dom/base/test/file_xhtmlserializer_1_linebreak.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_links.xhtml b/dom/base/test/file_xhtmlserializer_1_links.xhtml
similarity index 97%
rename from content/base/test/file_xhtmlserializer_1_links.xhtml
rename to dom/base/test/file_xhtmlserializer_1_links.xhtml
index ff32e947574..0c2814311bf 100644
--- a/content/base/test/file_xhtmlserializer_1_links.xhtml
+++ b/dom/base/test/file_xhtmlserializer_1_links.xhtml
@@ -12,7 +12,7 @@
        Lorem ipsum dolor sit amet, <strong>consectetuer</strong> 
 adipiscing elit. Nam eu sapien. Sed viverra lacus. Donec quis ipsum. 
 Nunc cursus aliquet lectus. Nunc vitae eros. Class aptent taciti <span>sociosqu ad 
-     litora</span> torquent <a href="http://mochi.test:8888/tests/content/base/test/file_htmlserializer_1_result1.html">per conubia</a> 
+     litora</span> torquent <a href="http://mochi.test:8888/tests/dom/base/test/file_htmlserializer_1_result1.html">per conubia</a> 
 nostra, per inceptos hymenaeos. </p>
 
 
diff --git a/content/base/test/file_xhtmlserializer_1_nested_body.xhtml b/dom/base/test/file_xhtmlserializer_1_nested_body.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_nested_body.xhtml
rename to dom/base/test/file_xhtmlserializer_1_nested_body.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_no_body.xhtml b/dom/base/test/file_xhtmlserializer_1_no_body.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_no_body.xhtml
rename to dom/base/test/file_xhtmlserializer_1_no_body.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_noflag.xhtml b/dom/base/test/file_xhtmlserializer_1_noflag.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_noflag.xhtml
rename to dom/base/test/file_xhtmlserializer_1_noflag.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_noformatpre.xhtml b/dom/base/test/file_xhtmlserializer_1_noformatpre.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_noformatpre.xhtml
rename to dom/base/test/file_xhtmlserializer_1_noformatpre.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_raw.xhtml b/dom/base/test/file_xhtmlserializer_1_raw.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_raw.xhtml
rename to dom/base/test/file_xhtmlserializer_1_raw.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_sibling_body.xhtml b/dom/base/test/file_xhtmlserializer_1_sibling_body.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_sibling_body.xhtml
rename to dom/base/test/file_xhtmlserializer_1_sibling_body.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml b/dom/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml
rename to dom/base/test/file_xhtmlserializer_1_sibling_body_only_body.xhtml
diff --git a/content/base/test/file_xhtmlserializer_1_wrap.xhtml b/dom/base/test/file_xhtmlserializer_1_wrap.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_1_wrap.xhtml
rename to dom/base/test/file_xhtmlserializer_1_wrap.xhtml
diff --git a/content/base/test/file_xhtmlserializer_2.xhtml b/dom/base/test/file_xhtmlserializer_2.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_2.xhtml
rename to dom/base/test/file_xhtmlserializer_2.xhtml
diff --git a/content/base/test/file_xhtmlserializer_2_basic.xhtml b/dom/base/test/file_xhtmlserializer_2_basic.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_2_basic.xhtml
rename to dom/base/test/file_xhtmlserializer_2_basic.xhtml
diff --git a/content/base/test/file_xhtmlserializer_2_enthtml.xhtml b/dom/base/test/file_xhtmlserializer_2_enthtml.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_2_enthtml.xhtml
rename to dom/base/test/file_xhtmlserializer_2_enthtml.xhtml
diff --git a/content/base/test/file_xhtmlserializer_2_entw3c.xhtml b/dom/base/test/file_xhtmlserializer_2_entw3c.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_2_entw3c.xhtml
rename to dom/base/test/file_xhtmlserializer_2_entw3c.xhtml
diff --git a/content/base/test/file_xhtmlserializer_2_latin1.xhtml b/dom/base/test/file_xhtmlserializer_2_latin1.xhtml
similarity index 100%
rename from content/base/test/file_xhtmlserializer_2_latin1.xhtml
rename to dom/base/test/file_xhtmlserializer_2_latin1.xhtml
diff --git a/content/base/test/fileutils.js b/dom/base/test/fileutils.js
similarity index 100%
rename from content/base/test/fileutils.js
rename to dom/base/test/fileutils.js
diff --git a/content/base/test/forRemoval.resource b/dom/base/test/forRemoval.resource
similarity index 100%
rename from content/base/test/forRemoval.resource
rename to dom/base/test/forRemoval.resource
diff --git a/content/base/test/forRemoval.resource^headers^ b/dom/base/test/forRemoval.resource^headers^
similarity index 100%
rename from content/base/test/forRemoval.resource^headers^
rename to dom/base/test/forRemoval.resource^headers^
diff --git a/content/base/test/formReset.html b/dom/base/test/formReset.html
similarity index 100%
rename from content/base/test/formReset.html
rename to dom/base/test/formReset.html
diff --git a/content/base/test/invalid_accesscontrol.resource b/dom/base/test/invalid_accesscontrol.resource
similarity index 100%
rename from content/base/test/invalid_accesscontrol.resource
rename to dom/base/test/invalid_accesscontrol.resource
diff --git a/content/base/test/invalid_accesscontrol.resource^headers^ b/dom/base/test/invalid_accesscontrol.resource^headers^
similarity index 100%
rename from content/base/test/invalid_accesscontrol.resource^headers^
rename to dom/base/test/invalid_accesscontrol.resource^headers^
diff --git a/content/base/test/mochitest-child-permissions.ini b/dom/base/test/mochitest-child-permissions.ini
similarity index 100%
rename from content/base/test/mochitest-child-permissions.ini
rename to dom/base/test/mochitest-child-permissions.ini
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 96e0919beb7..405013fa9cc 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -11,6 +11,233 @@ support-files =
   file_empty.html
   iframe_postMessage_solidus.html
   file_setname.html
+  345339_iframe.html
+  Ahem.ttf
+  accesscontrol.resource
+  accesscontrol.resource^headers^
+  badContentType.eventsource
+  badContentType.eventsource^headers^
+  badHTTPResponseCode.eventsource
+  badHTTPResponseCode.eventsource^headers^
+  badMessageEvent.eventsource
+  badMessageEvent.eventsource^headers^
+  badMessageEvent2.eventsource
+  badMessageEvent2.eventsource^headers^
+  bug282547.sjs
+  bug298064-subframe.html
+  bug313646.txt
+  bug382113_object.html
+  bug419132.html
+  bug426308-redirect.sjs
+  bug435425.sjs
+  bug435425_redirect.sjs
+  bug444322.js
+  bug444322.txt
+  bug455629-helper.svg
+  bug457746.sjs
+  bug461735-post-redirect.js
+  bug461735-redirect1.sjs
+  bug461735-redirect2.sjs
+  bug466080.sjs
+  bug466409-empty.css
+  bug466409-page.html
+  bug475156.sjs
+  bug482935.sjs
+  bug540854.sjs
+  bug578096LoadChromeScript.js
+  bug638112-response.txt
+  bug638112.sjs
+  bug682592-subframe-ref.html
+  bug682592-subframe.html
+  bug696301-script-1.js
+  bug696301-script-1.js^headers^
+  bug696301-script-2.js
+  bug803225_test_mailto.html
+  bug819051.sjs
+  copypaste.js
+  delayedServerEvents.sjs
+  eventsource.resource
+  eventsource.resource^headers^
+  eventsource_redirect.resource
+  eventsource_redirect.resource^headers^
+  eventsource_redirect_to.resource
+  eventsource_redirect_to.resource^headers^
+  file_CrossSiteXHR_cache_server.sjs
+  file_CrossSiteXHR_inner.html
+  file_CrossSiteXHR_inner.jar
+  file_CrossSiteXHR_inner_data.sjs
+  file_CrossSiteXHR_server.sjs
+  file_XHRDocURI.text
+  file_XHRDocURI.text^headers^
+  file_XHRDocURI.xml
+  file_XHRDocURI.xml^headers^
+  file_XHRDocURI.html
+  file_XHRDocURI.html^headers^
+  file_XHRDocURI.sjs
+  file_XHRResponseURL.js
+  file_XHRResponseURL.sjs
+  file_XHRResponseURL.text
+  file_XHRResponseURL.text^headers^
+  file_XHRResponseURL_nocors.text
+  file_XHRSendData.sjs
+  file_XHRSendData_doc.xml
+  file_XHRSendData_doc.xml^headers^
+  file_XHR_anon.sjs
+  file_XHR_binary1.bin
+  file_XHR_binary1.bin^headers^
+  file_XHR_binary2.bin
+  file_XHR_fail1.txt
+  file_XHR_fail1.txt^headers^
+  file_XHR_header.sjs
+  file_XHR_pass1.xml
+  file_XHR_pass2.txt
+  file_XHR_pass3.txt
+  file_XHR_pass3.txt^headers^
+  file_XHR_system_redirect.html
+  file_XHR_system_redirect.html^headers^
+  file_XHR_timeout.sjs
+  file_base_xbl.xml
+  file_bug28293.sjs
+  file_bug326337.xml
+  file_bug326337_inner.html
+  file_bug326337_outer.html
+  file_bug416317.xhtml
+  file_bug426646-1.html
+  file_bug426646-2.html
+  file_bug428847-1.xhtml
+  file_bug428847-2.xhtml
+  file_bug498897.css
+  file_bug498897.html
+  file_bug498897.html^headers^
+  file_bug503481.sjs
+  file_bug503481b_inner.html
+  file_bug541937.html
+  file_bug541937.xhtml
+  file_bug557892.html
+  file_bug562137.txt
+  file_bug590812-ref.xhtml
+  file_bug590812.xml
+  file_bug590870.html
+  file_bug601803a.html
+  file_bug601803b.html
+  file_bug604660-1.xml
+  file_bug604660-2.xsl
+  file_bug604660-3.js
+  file_bug604660-4.js
+  file_bug604660-5.xml
+  file_bug604660-6.xsl
+  file_bug622088.sjs
+  file_bug622088_inner.html
+  file_bug675121.sjs
+  file_bug687859-16.js
+  file_bug687859-16.js^headers^
+  file_bug687859-bom.js
+  file_bug687859-bom.js^headers^
+  file_bug687859-charset.js
+  file_bug687859-http.js
+  file_bug687859-http.js^headers^
+  file_bug687859-inherit.js
+  file_bug692434.xml
+  file_bug707142_baseline.json
+  file_bug707142_bom.json
+  file_bug707142_utf-16.json
+  file_bug708620-2.html
+  file_bug708620.html
+  file_bug782342.txt
+  file_bug787778.sjs
+  file_bug804395.jar
+  file_bug869432.eventsource
+  file_bug869432.eventsource^headers^
+  file_bug902350.html
+  file_bug902350_frame.html
+  file_bug907892.html
+  file_bug945152.jar
+  file_bug945152_worker.js
+  file_bug1008126_worker.js
+  file_general_document.html
+  file_html_in_xhr.html
+  file_html_in_xhr.sjs
+  file_html_in_xhr2.html
+  file_html_in_xhr3.html
+  file_htmlserializer_1.html
+  file_htmlserializer_1_bodyonly.html
+  file_htmlserializer_1_format.html
+  file_htmlserializer_1_linebreak.html
+  file_htmlserializer_1_links.html
+  file_htmlserializer_1_nested_body.html
+  file_htmlserializer_1_no_body.html
+  file_htmlserializer_1_noflag.html
+  file_htmlserializer_1_noformatpre.html
+  file_htmlserializer_1_raw.html
+  file_htmlserializer_1_sibling_body.html
+  file_htmlserializer_1_sibling_body_only_body.html
+  file_htmlserializer_1_wrap.html
+  file_htmlserializer_2.html
+  file_htmlserializer_2_basic.html
+  file_htmlserializer_2_enthtml.html
+  file_htmlserializer_2_entw3c.html
+  file_htmlserializer_2_latin1.html
+  file_htmlserializer_ipv6.html
+  file_htmlserializer_ipv6_out.html
+  file_mixed_content_frameNavigation.html
+  file_mixed_content_frameNavigation_blankTarget.html
+  file_mixed_content_frameNavigation_grandchild.html
+  file_mixed_content_frameNavigation_innermost.html
+  file_mixed_content_frameNavigation_secure.html
+  file_mixed_content_frameNavigation_secure_grandchild.html
+  file_mixed_content_main.html
+  file_mixed_content_main_bug803225.html
+  file_mixed_content_main_bug803225_websocket_wsh.py
+  file_mixed_content_server.sjs
+  file_mozfiledataurl_audio.ogg
+  file_mozfiledataurl_doc.html
+  file_mozfiledataurl_img.jpg
+  file_mozfiledataurl_inner.html
+  file_mozfiledataurl_text.txt
+  file_restrictedEventSource.sjs
+  file_websocket_basic_wsh.py
+  file_websocket_hello_wsh.py
+  file_websocket_http_resource.txt
+  file_websocket_wsh.py
+  file_x-frame-options_main.html
+  file_x-frame-options_page.sjs
+  file_xhtmlserializer_1.xhtml
+  file_xhtmlserializer_1_bodyonly.xhtml
+  file_xhtmlserializer_1_format.xhtml
+  file_xhtmlserializer_1_linebreak.xhtml
+  file_xhtmlserializer_1_links.xhtml
+  file_xhtmlserializer_1_nested_body.xhtml
+  file_xhtmlserializer_1_no_body.xhtml
+  file_xhtmlserializer_1_noflag.xhtml
+  file_xhtmlserializer_1_noformatpre.xhtml
+  file_xhtmlserializer_1_raw.xhtml
+  file_xhtmlserializer_1_sibling_body.xhtml
+  file_xhtmlserializer_1_sibling_body_only_body.xhtml
+  file_xhtmlserializer_1_wrap.xhtml
+  file_xhtmlserializer_2.xhtml
+  file_xhtmlserializer_2_basic.xhtml
+  file_xhtmlserializer_2_enthtml.xhtml
+  file_xhtmlserializer_2_entw3c.xhtml
+  file_xhtmlserializer_2_latin1.xhtml
+  fileutils.js
+  forRemoval.resource
+  forRemoval.resource^headers^
+  formReset.html
+  invalid_accesscontrol.resource
+  invalid_accesscontrol.resource^headers^
+  mutationobserver_dialog.html
+  progressserver.sjs
+  responseIdentical.sjs
+  script-1_bug597345.sjs
+  script-2_bug597345.js
+  script_bug602838.sjs
+  send_gzip_content.sjs
+  somedatas.resource
+  somedatas.resource^headers^
+  variable_style_sheet.sjs
+  viewport_helpers.js
+  w3element_traversal.svg
+  wholeTexty-helper.xml
 
 [test_appname_override.html]
 [test_audioWindowUtils.html]
@@ -89,3 +316,439 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
 [test_window_named_frame_enumeration.html]
 [test_writable-replaceable.html]
 [test_navigatorPrefOverride.html]
+[test_CrossSiteXHR.html]
+[test_CrossSiteXHR_cache.html]
+[test_CrossSiteXHR_origin.html]
+skip-if = buildapp == 'b2g' || e10s # last test fails to trigger onload on e10s/b2g
+[test_DOMException.html]
+[test_EventSource_redirects.html]
+[test_NodeIterator_basics_filters.xhtml]
+[test_NodeIterator_mutations_1.xhtml]
+[test_NodeIterator_mutations_2.html]
+[test_NodeIterator_mutations_3.html]
+[test_XHR.html]
+[test_XHRDocURI.html]
+[test_XHRResponseURL.html]
+[test_XHRSendData.html]
+skip-if = buildapp == 'b2g' || e10s # b2g(seems to stall) b2g-debug(seems to stall) b2g-desktop(seems to stall)
+[test_XHR_anon.html]
+[test_XHR_header.html]
+[test_XHR_onuploadprogress.html]
+[test_XHR_parameters.html]
+skip-if = buildapp == 'b2g' # b2g(86 total, 4 failing - testing mozAnon - got false, expected true) b2g-debug(86 total, 4 failing - testing mozAnon - got false, expected true) b2g-desktop(86 total, 4 failing - testing mozAnon - got false, expected true)
+[test_XHR_system.html]
+skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(12 total, 2 failing - .mozSystem == true - got false, expected true + ) b2g-desktop(12 total, 2 failing - .mozSystem == true - got false, expected true + )
+[test_XHR_timeout.html]
+skip-if = buildapp == 'b2g' # b2g(flaky on B2G, bug 960743) b2g-debug(flaky on B2G, bug 960743) b2g-desktop(flaky on B2G, bug 960743)
+[test_XHR_timeout.js]
+[test_base.xhtml]
+[test_blobconstructor.html]
+[test_bug166235.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
+[test_bug199959.html]
+[test_bug218236.html]
+[test_bug218277.html]
+[test_bug238409.html]
+[test_bug254337.html]
+[test_bug270145.xhtml]
+[test_bug276037-1.html]
+[test_bug276037-2.xhtml]
+[test_bug282547.html]
+skip-if = e10s
+[test_bug28293.html]
+[test_bug28293.xhtml]
+[test_bug298064.html]
+[test_bug300992.html]
+[test_bug311681.xml]
+[test_bug313646.html]
+[test_bug320799.html]
+[test_bug322317.html]
+[test_bug326337.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
+[test_bug330925.xhtml]
+[test_bug331959.html]
+[test_bug333198.html]
+[test_bug333673.html]
+[test_bug337631.html]
+[test_bug338541.xhtml]
+[test_bug338583.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(43 total - bug 901343, specialpowers.wrap issue createsystemxhr)
+[test_bug338679.html]
+[test_bug339494.html]
+[test_bug339494.xhtml]
+[test_bug340571.html]
+[test_bug343596.html]
+[test_bug345339.html]
+skip-if = e10s # Bug 1081453 - shutdown leaks with e10s and WebIDL dom::File
+[test_bug346485.html]
+[test_bug352728.html]
+[test_bug352728.xhtml]
+[test_bug353334.html]
+[test_bug355026.html]
+[test_bug357450.html]
+[test_bug357450.js]
+[test_bug357450.xhtml]
+[test_bug357450_svg.xhtml]
+[test_bug357509.html]
+[test_bug358660.html]
+[test_bug362391.xhtml]
+[test_bug364092.xhtml]
+[test_bug364413.xhtml]
+[test_bug366944.html]
+[test_bug366946.html]
+[test_bug367164.html]
+[test_bug368972.html]
+[test_bug371576-2.html]
+[test_bug371576-3.html]
+[test_bug371576-4.html]
+[test_bug371576-5.html]
+[test_bug372086.html]
+[test_bug372964-2.html]
+[test_bug372964.html]
+[test_bug373181.xhtml]
+[test_bug375314.html]
+[test_bug378969.html]
+[test_bug380418.html]
+[test_bug380418.html^headers^]
+[test_bug382113.html]
+[test_bug382871.html]
+[test_bug384003.xhtml]
+[test_bug390219.html]
+[test_bug390735.html]
+[test_bug392318.html]
+[test_bug392511.html]
+[test_bug393968.html]
+[test_bug395915.html]
+[test_bug397234.html]
+[test_bug398243.html]
+[test_bug401662.html]
+[test_bug402150.html]
+[test_bug402150.html^headers^]
+[test_bug403841.html]
+[test_bug403852.html]
+skip-if = e10s
+[test_bug403868.xml]
+[test_bug405182.html]
+[test_bug409380.html]
+[test_bug410229.html]
+[test_bug413974.html]
+[test_bug414190.html]
+[test_bug415860.html]
+[test_bug416317-1.html]
+[test_bug416317-2.html]
+[test_bug416383.html]
+[test_bug417255.html]
+[test_bug417384.html]
+[test_bug418214.html]
+[test_bug419132.html]
+[test_bug419527.xhtml]
+[test_bug420609.xhtml]
+[test_bug420700.html]
+[test_bug421602.html]
+[test_bug422403-1.html]
+skip-if = buildapp == 'b2g' # b2g(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-debug(bug 901343, specialpowers.wrap issue [nsIChannel.open]) b2g-desktop(bug 901343, specialpowers.wrap issue [nsIChannel.open])
+[test_bug422403-2.xhtml]
+skip-if = buildapp == 'b2g'
+[test_bug422537.html]
+[test_bug424212.html]
+[test_bug424359-1.html]
+skip-if = buildapp == 'b2g'
+[test_bug424359-2.html]
+skip-if = buildapp == 'b2g'
+[test_bug425013.html]
+[test_bug426308.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk')
+[test_bug426646.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
+[test_bug428847.html]
+[test_bug429157.html]
+[test_bug431082.html]
+[test_bug431701.html]
+[test_bug431833.html]
+[test_bug433533.html]
+[test_bug433662.html]
+[test_bug435425.html]
+[test_bug438519.html]
+[test_bug444030.xhtml]
+[test_bug444322.html]
+[test_bug444722.html]
+[test_bug448993.html]
+[test_bug450160.html]
+[test_bug451376.html]
+[test_bug453521.html]
+[test_bug453736.html]
+[test_bug454325.html]
+[test_bug454326.html]
+[test_bug455472.html]
+[test_bug455629.html]
+[test_bug456262.html]
+[test_bug457746.html]
+[test_bug459424.html]
+[test_bug461555.html]
+[test_bug461735.html]
+[test_bug465767.html]
+[test_bug466080.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(bug 901356, also fails on android) b2g-debug(bug 901356, also fails on android) b2g-desktop(bug 901356, also fails on android)
+[test_bug466409.html]
+skip-if = buildapp == 'b2g'
+[test_bug466751.xhtml]
+[test_bug469020.html]
+[test_bug469304.html]
+[test_bug473162-1.html]
+[test_bug473162-2.html]
+[test_bug475156.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762 # b2g(36 total - bug 902611) b2g-debug(36 total - bug 902611) b2g-desktop(36 total - bug 902611)
+[test_bug482935.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 855762
+[test_bug484396.html]
+[test_bug493881.html]
+[test_bug493881.js]
+[test_bug498240.html]
+[test_bug498433.html]
+skip-if = buildapp == 'b2g'
+[test_bug498897.html]
+[test_bug499656.html]
+[test_bug499656.xhtml]
+[test_bug500937.html]
+[test_bug503481.html]
+skip-if = toolkit == 'android' #TIMED_OUT
+[test_bug503481b.html]
+skip-if = toolkit == 'android' #TIMED_OUT
+[test_bug505783.html]
+skip-if = toolkit == 'android' #TIMED_OUT
+[test_bug51034.html]
+[test_bug513194.html]
+[test_bug5141.html]
+[test_bug514487.html]
+[test_bug515401.html]
+[test_bug518104.html]
+[test_bug527896.html]
+[test_bug540854.html]
+[test_bug541937.html]
+[test_bug544642.html]
+[test_bug545644.html]
+[test_bug545644.xhtml]
+[test_bug548463.html]
+[test_bug553896.xhtml]
+[test_bug557892.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
+[test_bug558726.html]
+[test_bug559526.html]
+[test_bug560780.html]
+[test_bug562137.html]
+[test_bug562169-1.html]
+[test_bug562169-2.html]
+[test_bug562652.html]
+[test_bug564047.html]
+[test_bug564863.xhtml]
+[test_bug567350.html]
+[test_bug578096.html]
+skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s # b2g-debug(debug-only failure; crash) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
+[test_bug585978.html]
+skip-if = (toolkit == 'gonk' && debug) #debug-only timeout
+[test_bug587931.html]
+[test_bug588990.html]
+[test_bug590812.html]
+skip-if = toolkit == 'android' #bug 687032
+[test_bug590870.html]
+[test_bug592366.html]
+[test_bug592829.html]
+[test_bug597345.html]
+[test_bug599588.html]
+[test_bug601803.html]
+[test_bug602838.html]
+[test_bug604592.html]
+[test_bug604660.html]
+[test_bug605982.html]
+[test_bug606729.html]
+[test_bug614058.html]
+[test_bug614583.html]
+[test_bug622088.html]
+[test_bug622117.html]
+[test_bug622246.html]
+[test_bug625722.html]
+[test_bug626262.html]
+[test_bug628938.html]
+[test_bug631615.html]
+[test_bug638112.html]
+[test_bug647518.html]
+[test_bug650001.html]
+[test_bug656283.html]
+[test_bug664916.html]
+[test_bug666604.html]
+skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
+[test_bug675121.html]
+skip-if = buildapp == 'b2g' # b2g(bug 901378) b2g-debug(bug 901378) b2g-desktop(bug 901378)
+[test_bug675166.html]
+[test_bug682463.html]
+[test_bug682554.html]
+[test_bug682592.html]
+skip-if = buildapp == 'b2g'
+[test_bug684671.html]
+[test_bug685798.html]
+[test_bug686449.xhtml]
+[test_bug687859.html]
+[test_bug690056.html]
+[test_bug692434.html]
+[test_bug693615.html]
+[test_bug693875.html]
+[test_bug694754.xhtml]
+[test_bug696301-1.html]
+[test_bug696301-2.html]
+[test_bug698381.html]
+[test_bug698384.html]
+[test_bug704063.html]
+[test_bug707142.html]
+[test_bug708620.html]
+[test_bug711047.html]
+[test_bug711180.html]
+[test_bug719533.html]
+[test_bug726364.html]
+[test_bug737087.html]
+[test_bug737565.html]
+[test_bug737612.html]
+[test_bug738108.html]
+[test_bug744830.html]
+[test_bug749367.html]
+[test_bug753278.html]
+[test_bug761120.html]
+[test_bug782342.html]
+[test_bug787778.html]
+[test_bug789856.html]
+[test_bug804395.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 901343, specialpowers.wrap issue createsystemxhr
+[test_bug809003.html]
+[test_bug810494.html]
+[test_bug811701.html]
+[test_bug811701.xhtml]
+[test_bug813919.html]
+[test_bug814576.html]
+[test_bug819051.html]
+[test_bug820909.html]
+[test_bug827160.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #needs plugin support # b2g(needs plugin support) b2g-debug(debug-only failure) b2g-desktop(needs plugin support)
+[test_bug840098.html]
+[test_bug864595.html]
+[test_bug868999.html]
+[test_bug869000.html]
+[test_bug869002.html]
+[test_bug869006.html]
+[test_bug876282.html]
+[test_bug890580.html]
+[test_bug891952.html]
+[test_bug894874.html]
+[test_bug895239.html]
+[test_bug895974.html]
+[test_bug902847.html]
+[test_bug907892.html]
+[test_bug922681.html]
+[test_bug927196.html]
+[test_bug945152.html]
+run-if = os == 'linux'
+[test_bug982153.html]
+[test_bug1008126.html]
+run-if = os == 'linux'
+[test_bug1057176.html]
+[test_caretPositionFromPoint.html]
+[test_classList.html]
+# This test fails on the Mac for some reason
+[test_copyimage.html]
+skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit != 'gtk2' && toolkit != 'gtk3' && toolkit != 'windows' || e10s #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
+[test_copypaste.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 904183 # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
+[test_copypaste.xhtml]
+skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183) b2g-debug(bug 904183) b2g-desktop(bug 904183)
+[test_createHTMLDocument.html]
+[test_declare_stylesheet_obsolete.html]
+[test_document_constructor.html]
+[test_domparser_null_char.html]
+[test_domparsing.html]
+[test_elementTraversal.html]
+[test_element_closest.html]
+[test_encodeToStringWithMaxLength.html]
+[test_fileapi.html]
+skip-if = e10s
+[test_fileapi_slice.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 775227
+[test_getElementById.html]
+[test_html_colors_quirks.html]
+[test_html_colors_standards.html]
+[test_html_in_xhr.html]
+[test_htmlcopyencoder.html]
+[test_htmlcopyencoder.xhtml]
+[test_ipc_messagemanager_blob.html]
+skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 936226
+[test_meta_viewport0.html]
+[test_meta_viewport1.html]
+[test_meta_viewport2.html]
+[test_meta_viewport3.html]
+[test_meta_viewport4.html]
+[test_meta_viewport5.html]
+[test_meta_viewport6.html]
+[test_mixed_content_blocker.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
+[test_mixed_content_blocker_bug803225.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
+[test_mixed_content_blocker_frameNavigation.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
+[test_mozfiledataurl.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
+[test_mozMatchesSelector.html]
+[test_mutationobservers.html]
+skip-if = buildapp == 'b2g' || e10s # b2g(bug 901385, showmodaldialog) b2g-debug(bug 901385, showmodaldialog) b2g-desktop(bug 901385, showmodaldialog)
+[test_nodelist_holes.html]
+[test_object.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support)
+[test_plugin_freezing.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #CLICK_TO_PLAY
+[test_processing_instruction_update_stylesheet.xhtml]
+[test_progress_events_for_gzip_data.html]
+[test_range_bounds.html]
+skip-if = toolkit == 'android' || e10s
+[test_reentrant_flush.html]
+skip-if = toolkit == 'android' || e10s #RANDOM
+[test_sync_xhr_timer.xhtml]
+skip-if = toolkit == 'android' || e10s #RANDOM
+[test_text_wholeText.html]
+[test_textnode_normalize_in_selection.html]
+[test_textnode_split_in_selection.html]
+[test_title.html]
+[test_treewalker_nextsibling.xml]
+[test_viewport_scroll.html]
+[test_viewsource_forbidden_in_object.html]
+[test_w3element_traversal.html]
+[test_w3element_traversal.xhtml]
+[test_w3element_traversal_svg.html]
+[test_websocket.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
+[test_websocket_basic.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android'
+[test_websocket_hello.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android'
+[test_x-frame-options.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(observerservice issue) b2g-debug(observerservice issue) b2g-desktop(observerservice issue)
+[test_xbl_userdata.xhtml]
+[test_xhr_abort_after_load.html]
+skip-if = toolkit == 'android'
+[test_xhr_forbidden_headers.html]
+[test_xhr_progressevents.html]
+skip-if = toolkit == 'android'
+[test_xhr_send_readystate.html]
+[test_xhr_withCredentials.html]
+[test_file_from_blob.html]
+[test_warning_for_blocked_cross_site_request.html]
+[test_bug444546.html]
+disabled = Disabled for now. Mochitest isn't reliable enough for these.
+support-files = bug444546.sjs
+[test_bug503473.html]
+disabled = Disabled due to making the harness time out
+support-files = file_bug503473-frame.sjs
+[test_bug1011748.html]
+skip-if = buildapp == 'b2g' || e10s
+support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs
+[test_bug1025933.html]
+[test_element.matches.html]
+[test_user_select.html]
+skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+[test_bug1081686.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
diff --git a/content/base/test/moz.build b/dom/base/test/moz.build
similarity index 100%
rename from content/base/test/moz.build
rename to dom/base/test/moz.build
diff --git a/content/base/test/mutationobserver_dialog.html b/dom/base/test/mutationobserver_dialog.html
similarity index 100%
rename from content/base/test/mutationobserver_dialog.html
rename to dom/base/test/mutationobserver_dialog.html
diff --git a/content/base/test/progressserver.sjs b/dom/base/test/progressserver.sjs
similarity index 90%
rename from content/base/test/progressserver.sjs
rename to dom/base/test/progressserver.sjs
index 054090644c5..c206676aedb 100644
--- a/content/base/test/progressserver.sjs
+++ b/dom/base/test/progressserver.sjs
@@ -4,12 +4,12 @@ const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",
                              "setInputStream");
 
 function setReq(req) {
-  setObjectState("content/base/test/progressserver", req);
+  setObjectState("dom/base/test/progressserver", req);
 }
 
 function getReq() {
   var req;
-  getObjectState("content/base/test/progressserver", function(v) {
+  getObjectState("dom/base/test/progressserver", function(v) {
     req = v;
   });
   return req;
diff --git a/content/base/test/reftest/mixed-bmp-png.ico b/dom/base/test/reftest/mixed-bmp-png.ico
similarity index 100%
rename from content/base/test/reftest/mixed-bmp-png.ico
rename to dom/base/test/reftest/mixed-bmp-png.ico
diff --git a/content/base/test/reftest/reftest.list b/dom/base/test/reftest/reftest.list
similarity index 100%
rename from content/base/test/reftest/reftest.list
rename to dom/base/test/reftest/reftest.list
diff --git a/content/base/test/reftest/test_bug920877-ref.html b/dom/base/test/reftest/test_bug920877-ref.html
similarity index 100%
rename from content/base/test/reftest/test_bug920877-ref.html
rename to dom/base/test/reftest/test_bug920877-ref.html
diff --git a/content/base/test/reftest/test_bug920877.html b/dom/base/test/reftest/test_bug920877.html
similarity index 100%
rename from content/base/test/reftest/test_bug920877.html
rename to dom/base/test/reftest/test_bug920877.html
diff --git a/content/base/test/responseIdentical.sjs b/dom/base/test/responseIdentical.sjs
similarity index 100%
rename from content/base/test/responseIdentical.sjs
rename to dom/base/test/responseIdentical.sjs
diff --git a/content/base/test/script-1_bug597345.sjs b/dom/base/test/script-1_bug597345.sjs
similarity index 100%
rename from content/base/test/script-1_bug597345.sjs
rename to dom/base/test/script-1_bug597345.sjs
diff --git a/content/base/test/script-2_bug597345.js b/dom/base/test/script-2_bug597345.js
similarity index 100%
rename from content/base/test/script-2_bug597345.js
rename to dom/base/test/script-2_bug597345.js
diff --git a/content/base/test/script_bug602838.sjs b/dom/base/test/script_bug602838.sjs
similarity index 100%
rename from content/base/test/script_bug602838.sjs
rename to dom/base/test/script_bug602838.sjs
diff --git a/content/base/test/send_gzip_content.sjs b/dom/base/test/send_gzip_content.sjs
similarity index 100%
rename from content/base/test/send_gzip_content.sjs
rename to dom/base/test/send_gzip_content.sjs
diff --git a/content/base/test/somedatas.resource b/dom/base/test/somedatas.resource
similarity index 100%
rename from content/base/test/somedatas.resource
rename to dom/base/test/somedatas.resource
diff --git a/content/base/test/somedatas.resource^headers^ b/dom/base/test/somedatas.resource^headers^
similarity index 100%
rename from content/base/test/somedatas.resource^headers^
rename to dom/base/test/somedatas.resource^headers^
diff --git a/content/base/test/test_CrossSiteXHR.html b/dom/base/test/test_CrossSiteXHR.html
similarity index 99%
rename from content/base/test/test_CrossSiteXHR.html
rename to dom/base/test/test_CrossSiteXHR.html
index 3cff52d2db7..c9e63861895 100644
--- a/content/base/test/test_CrossSiteXHR.html
+++ b/dom/base/test/test_CrossSiteXHR.html
@@ -44,11 +44,11 @@ function runTest() {
   loader.onload = function () { gen.next() };
 
   // Test preflight-less requests
-  basePath = "/tests/content/base/test/file_CrossSiteXHR_server.sjs?"
+  basePath = "/tests/dom/base/test/file_CrossSiteXHR_server.sjs?"
   baseURL = "http://mochi.test:8888" + basePath;
 
   // Test preflighted requests
-  loader.src = "http://example.org/tests/content/base/test/file_CrossSiteXHR_inner.html";
+  loader.src = "http://example.org/tests/dom/base/test/file_CrossSiteXHR_inner.html";
   origin = "http://example.org";
   yield undefined;
 
@@ -874,7 +874,7 @@ function runTest() {
 
 
   // Test redirects
-  is(loader.src, "http://example.org/tests/content/base/test/file_CrossSiteXHR_inner.html");
+  is(loader.src, "http://example.org/tests/dom/base/test/file_CrossSiteXHR_inner.html");
   is(origin, "http://example.org");
 
   tests = [{ pass: 1,
diff --git a/content/base/test/test_CrossSiteXHR_cache.html b/dom/base/test/test_CrossSiteXHR_cache.html
similarity index 98%
rename from content/base/test/test_CrossSiteXHR_cache.html
rename to dom/base/test/test_CrossSiteXHR_cache.html
index 130a9d6835c..77371044f32 100644
--- a/content/base/test/test_CrossSiteXHR_cache.html
+++ b/dom/base/test/test_CrossSiteXHR_cache.html
@@ -30,7 +30,7 @@ function runTest() {
   var loaderWindow = loader.contentWindow;
   loader.onload = function () { gen.next() };
 
-  loader.src = "http://example.org/tests/content/base/test/file_CrossSiteXHR_inner.html";
+  loader.src = "http://example.org/tests/dom/base/test/file_CrossSiteXHR_inner.html";
   origin = "http://example.org";
   yield undefined;
 
@@ -428,7 +428,7 @@ function runTest() {
                });
   }
 
-  baseURL = "http://mochi.test:8888/tests/content/base/test/" +
+  baseURL = "http://mochi.test:8888/tests/dom/base/test/" +
              "file_CrossSiteXHR_cache_server.sjs?";
   setStateURL = baseURL + "setState=";
 
diff --git a/content/base/test/test_CrossSiteXHR_origin.html b/dom/base/test/test_CrossSiteXHR_origin.html
similarity index 92%
rename from content/base/test/test_CrossSiteXHR_origin.html
rename to dom/base/test/test_CrossSiteXHR_origin.html
index f5556a622ea..09fd81502b2 100644
--- a/content/base/test/test_CrossSiteXHR_origin.html
+++ b/dom/base/test/test_CrossSiteXHR_origin.html
@@ -39,10 +39,10 @@ var origins =
      origin: 'http://xn--hxajbheg2az3al.xn--jxalpdlp'
    },
    { origin: 'http://example.org',
-     file: 'jar:http://example.org/tests/content/base/test/file_CrossSiteXHR_inner.jar!/file_CrossSiteXHR_inner.html'
+     file: 'jar:http://example.org/tests/dom/base/test/file_CrossSiteXHR_inner.jar!/file_CrossSiteXHR_inner.html'
    },
    { origin: 'null',
-     file: 'http://example.org/tests/content/base/test/file_CrossSiteXHR_inner_data.sjs'
+     file: 'http://example.org/tests/dom/base/test/file_CrossSiteXHR_inner_data.sjs'
    },
    ];
 
@@ -61,14 +61,14 @@ function runTest() {
   loader.onload = function () { gen.next() };
 
   // Test preflight-less requests
-  basePath = "/tests/content/base/test/file_CrossSiteXHR_server.sjs?"
+  basePath = "/tests/dom/base/test/file_CrossSiteXHR_server.sjs?"
   baseURL = "http://mochi.test:8888" + basePath;
 
   for (originEntry of origins) {
     origin = originEntry.origin || originEntry.server;
 
     loader.src = originEntry.file ||
-                 (originEntry.server + "/tests/content/base/test/file_CrossSiteXHR_inner.html");
+                 (originEntry.server + "/tests/dom/base/test/file_CrossSiteXHR_inner.html");
     yield undefined;
 
     var isNullOrigin = origin == "null";
diff --git a/content/base/test/test_DOMException.html b/dom/base/test/test_DOMException.html
similarity index 100%
rename from content/base/test/test_DOMException.html
rename to dom/base/test/test_DOMException.html
diff --git a/content/base/test/test_EventSource_redirects.html b/dom/base/test/test_EventSource_redirects.html
similarity index 92%
rename from content/base/test/test_EventSource_redirects.html
rename to dom/base/test/test_EventSource_redirects.html
index aa491d873aa..0d18fa4706a 100644
--- a/content/base/test/test_EventSource_redirects.html
+++ b/dom/base/test/test_EventSource_redirects.html
@@ -27,7 +27,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=716841
     ok(true, "here we go");
 
     source = new EventSource("eventsource_redirect.resource");
-    ok(source.url == "http://mochi.test:8888/tests/content/base/test/eventsource_redirect.resource", "Test failed.");
+    ok(source.url == "http://mochi.test:8888/tests/dom/base/test/eventsource_redirect.resource", "Test failed.");
     ok(source.readyState == 0 || source.readyState == 1, "Test failed.");
 
     source.onopen = function (event) {
diff --git a/content/base/test/test_NodeIterator_basics_filters.xhtml b/dom/base/test/test_NodeIterator_basics_filters.xhtml
similarity index 100%
rename from content/base/test/test_NodeIterator_basics_filters.xhtml
rename to dom/base/test/test_NodeIterator_basics_filters.xhtml
diff --git a/content/base/test/test_NodeIterator_mutations_1.xhtml b/dom/base/test/test_NodeIterator_mutations_1.xhtml
similarity index 100%
rename from content/base/test/test_NodeIterator_mutations_1.xhtml
rename to dom/base/test/test_NodeIterator_mutations_1.xhtml
diff --git a/content/base/test/test_NodeIterator_mutations_2.html b/dom/base/test/test_NodeIterator_mutations_2.html
similarity index 100%
rename from content/base/test/test_NodeIterator_mutations_2.html
rename to dom/base/test/test_NodeIterator_mutations_2.html
diff --git a/content/base/test/test_NodeIterator_mutations_3.html b/dom/base/test/test_NodeIterator_mutations_3.html
similarity index 100%
rename from content/base/test/test_NodeIterator_mutations_3.html
rename to dom/base/test/test_NodeIterator_mutations_3.html
diff --git a/content/base/test/test_XHR.html b/dom/base/test/test_XHR.html
similarity index 99%
rename from content/base/test/test_XHR.html
rename to dom/base/test/test_XHR.html
index 4cfac27cfb0..519876c1e39 100644
--- a/content/base/test/test_XHR.html
+++ b/dom/base/test/test_XHR.html
@@ -20,7 +20,7 @@ function continueTest() { gen.next(); }
 
 function runTests() {
 
-var path = "/tests/content/base/test/";
+var path = "/tests/dom/base/test/";
 
 var passFiles = [['file_XHR_pass1.xml', 'GET', 200, 'OK', 'text/xml'],
                  ['file_XHR_pass2.txt', 'GET', 200, 'OK', 'text/plain'],
diff --git a/content/base/test/test_XHRDocURI.html b/dom/base/test/test_XHRDocURI.html
similarity index 71%
rename from content/base/test/test_XHRDocURI.html
rename to dom/base/test/test_XHRDocURI.html
index bb8235991da..f80e4c90783 100644
--- a/content/base/test/test_XHRDocURI.html
+++ b/dom/base/test/test_XHRDocURI.html
@@ -99,14 +99,14 @@ function runTest() {
 
   // use content XHR and access URI properties from content privileged script
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     testXMLDocURI(xhr.responseXML, expects);
@@ -118,15 +118,15 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html"
     };
     testHTMLDocURI(xhr.response, expects);
     if (xhr.readyState == 4) {
@@ -137,7 +137,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.text");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.text");
   xhr.onreadystatechange = function(e) {
     is(xhr.responseXML, null, "should not have document");
     if (xhr.readyState == 4) {
@@ -148,14 +148,14 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     testXMLDocURI(xhr.responseXML, expects);
@@ -167,15 +167,15 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html"
     };
     testHTMLDocURI(xhr.response, expects);
     if (xhr.readyState == 4) {
@@ -186,14 +186,14 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     testXMLDocURI(xhr.responseXML, expects);
@@ -205,15 +205,15 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html"
     };
     testHTMLDocURI(xhr.response, expects);
     if (xhr.readyState == 4) {
@@ -224,7 +224,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.text");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.text");
   xhr.onreadystatechange = function(e) {
     is(xhr.responseXML, null, "should not have document");
     if (xhr.readyState == 4) {
@@ -238,14 +238,14 @@ function runTest() {
   // use content XHR and access URI properties from chrome privileged script
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     var xml = SpecialPowers.wrap(xhr.responseXML);
@@ -259,18 +259,18 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html"
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html", expects);
     testCloneDocURI(doc);
     if (xhr.readyState == 4) {
       gen.next();
@@ -280,7 +280,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
@@ -301,7 +301,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
@@ -312,7 +312,7 @@ function runTest() {
       baseURI: document.baseURI
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://example.com/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://example.com/tests/dom/base/test/file_XHRDocURI.html", expects);
     testCloneDocURI(doc);
     if (xhr.readyState == 4) {
       gen.next();
@@ -322,7 +322,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
@@ -343,7 +343,7 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest;
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
@@ -354,7 +354,7 @@ function runTest() {
       baseURI: document.baseURI
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://example.com/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://example.com/tests/dom/base/test/file_XHRDocURI.html", expects);
     testCloneDocURI(doc);
     if (xhr.readyState == 4) {
       gen.next();
@@ -367,14 +367,14 @@ function runTest() {
   // use chrome XHR and access URI properties from chrome privileged script
   SpecialPowers.addPermission("systemXHR", true, document);
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     var xml = SpecialPowers.wrap(xhr.responseXML);
@@ -387,18 +387,18 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html"
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.html", expects);
     if (xhr.readyState == 4) {
       gen.next();
     }
@@ -407,14 +407,14 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     var xml = SpecialPowers.wrap(xhr.responseXML);
@@ -427,18 +427,18 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html"
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://example.com/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://example.com/tests/dom/base/test/file_XHRDocURI.html", expects);
     if (xhr.readyState == 4) {
       gen.next();
     }
@@ -447,14 +447,14 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.xml");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.xml");
   xhr.onreadystatechange = function(e) {
     if (!xhr.responseXML) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.xml",
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.xml",
       elementBaseURI: "http://www.example.com/"
     };
     var xml = SpecialPowers.wrap(xhr.responseXML);
@@ -467,18 +467,18 @@ function runTest() {
   yield undefined;
 
   xhr = new XMLHttpRequest({mozAnon: false, mozSystem: true});
-  xhr.open("GET", "http://mochi.test:8888/tests/content/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/content/base/test/file_XHRDocURI.html");
+  xhr.open("GET", "http://mochi.test:8888/tests/dom/base/test/file_XHRDocURI.sjs?url=http://example.com/tests/dom/base/test/file_XHRDocURI.html");
   xhr.responseType = "document";
   xhr.onreadystatechange = function(e) {
     if (!xhr.response) {
       return;
     }
     var expects = {
-      documentURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html",
-      baseURI: "http://example.com/tests/content/base/test/file_XHRDocURI.html"
+      documentURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html",
+      baseURI: "http://example.com/tests/dom/base/test/file_XHRDocURI.html"
     };
     var doc = SpecialPowers.wrap(xhr.response);
-    testChromeHTMLDocURI(doc, "http://example.com/tests/content/base/test/file_XHRDocURI.html", expects);
+    testChromeHTMLDocURI(doc, "http://example.com/tests/dom/base/test/file_XHRDocURI.html", expects);
     if (xhr.readyState == 4) {
       gen.next();
     }
diff --git a/content/base/test/test_XHRResponseURL.html b/dom/base/test/test_XHRResponseURL.html
similarity index 100%
rename from content/base/test/test_XHRResponseURL.html
rename to dom/base/test/test_XHRResponseURL.html
diff --git a/content/base/test/test_XHRSendData.html b/dom/base/test/test_XHRSendData.html
similarity index 100%
rename from content/base/test/test_XHRSendData.html
rename to dom/base/test/test_XHRSendData.html
diff --git a/content/base/test/test_XHR_anon.html b/dom/base/test/test_XHR_anon.html
similarity index 98%
rename from content/base/test/test_XHR_anon.html
rename to dom/base/test/test_XHR_anon.html
index e2c8872c945..06fe0553832 100644
--- a/content/base/test/test_XHR_anon.html
+++ b/dom/base/test/test_XHR_anon.html
@@ -17,7 +17,7 @@
 <script class="testbody" type="application/javascript;version=1.8">
 
 // An XHR with the anon flag set will not send cookie and auth information.
-const TEST_URL = "http://example.com/tests/content/base/test/file_XHR_anon.sjs";
+const TEST_URL = "http://example.com/tests/dom/base/test/file_XHR_anon.sjs";
 document.cookie = "foo=bar";
 
 let am = {
diff --git a/content/base/test/test_XHR_header.html b/dom/base/test/test_XHR_header.html
similarity index 100%
rename from content/base/test/test_XHR_header.html
rename to dom/base/test/test_XHR_header.html
diff --git a/content/base/test/test_XHR_onuploadprogress.html b/dom/base/test/test_XHR_onuploadprogress.html
similarity index 100%
rename from content/base/test/test_XHR_onuploadprogress.html
rename to dom/base/test/test_XHR_onuploadprogress.html
diff --git a/content/base/test/test_XHR_parameters.html b/dom/base/test/test_XHR_parameters.html
similarity index 100%
rename from content/base/test/test_XHR_parameters.html
rename to dom/base/test/test_XHR_parameters.html
diff --git a/content/base/test/test_XHR_system.html b/dom/base/test/test_XHR_system.html
similarity index 94%
rename from content/base/test/test_XHR_system.html
rename to dom/base/test/test_XHR_system.html
index 31fef6d64b2..81d405cf6f1 100644
--- a/content/base/test/test_XHR_system.html
+++ b/dom/base/test/test_XHR_system.html
@@ -18,8 +18,8 @@
 let tests = [];
 
 const PROTECTED_URL = "file:///etc/passwd";
-const REDIRECT_URL = window.location.protocol + "//" + window.location.host + "/tests/content/base/test/file_XHR_system_redirect.html";
-const CROSSSITE_URL = "http://example.com/tests/content/base/test/test_XHR_system.html";
+const REDIRECT_URL = window.location.protocol + "//" + window.location.host + "/tests/dom/base/test/file_XHR_system_redirect.html";
+const CROSSSITE_URL = "http://example.com/tests/dom/base/test/test_XHR_system.html";
 
 tests.push(function test_cross_origin() {
   // System XHR can load cross-origin resources.
diff --git a/content/base/test/test_XHR_timeout.html b/dom/base/test/test_XHR_timeout.html
similarity index 100%
rename from content/base/test/test_XHR_timeout.html
rename to dom/base/test/test_XHR_timeout.html
diff --git a/content/base/test/test_XHR_timeout.js b/dom/base/test/test_XHR_timeout.js
similarity index 100%
rename from content/base/test/test_XHR_timeout.js
rename to dom/base/test/test_XHR_timeout.js
diff --git a/content/base/test/test_base.xhtml b/dom/base/test/test_base.xhtml
similarity index 58%
rename from content/base/test/test_base.xhtml
rename to dom/base/test/test_base.xhtml
index 6eda59889b6..e4aba6ebe1c 100644
--- a/content/base/test/test_base.xhtml
+++ b/dom/base/test/test_base.xhtml
@@ -3,7 +3,7 @@
   <title>Test for base URIs</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <base href="/tests/content/base/" />
+  <base href="/tests/dom/base/" />
   <style>
     #bound { -moz-binding: url("test/file_base_xbl.xml#test"); }
   </style>
@@ -15,18 +15,18 @@
 <script type="application/javascript">
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
-  is(document.baseURI, "http://mochi.test:8888/tests/content/base/",
+  is(document.baseURI, "http://mochi.test:8888/tests/dom/base/",
      "document base");
-  is(document.body.baseURI, "http://mochi.test:8888/tests/content/base/",
+  is(document.body.baseURI, "http://mochi.test:8888/tests/dom/base/",
      "body base");
 
   var expected =
-    ["http://mochi.test:8888/tests/content/base/supercalifragilisticexpialidocious",
-     "http://mochi.test:8888/tests/content/base/supercalifragilisticexpialidocious",
-     "http://mochi.test:8888/tests/content/base/hello/",
-     "http://mochi.test:8888/tests/content/base/hello/world",
-     "http://mochi.test:8888/tests/content/base/hello/world#iamtheverymodelofamodernmajorgeneral",
-     "http://mochi.test:8888/tests/content/base/hello/world#iamtheverymodelofamodernmajorgeneral",
+    ["http://mochi.test:8888/tests/dom/base/supercalifragilisticexpialidocious",
+     "http://mochi.test:8888/tests/dom/base/supercalifragilisticexpialidocious",
+     "http://mochi.test:8888/tests/dom/base/hello/",
+     "http://mochi.test:8888/tests/dom/base/hello/world",
+     "http://mochi.test:8888/tests/dom/base/hello/world#iamtheverymodelofamodernmajorgeneral",
+     "http://mochi.test:8888/tests/dom/base/hello/world#iamtheverymodelofamodernmajorgeneral",
      ];
   var node = document.getElementById("1");
   while(node) {
@@ -36,9 +36,9 @@ addLoadEvent(function() {
   is(expected.length, 0, "found all expected nodes");
 
   var svgExpected =
-    ["http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml",
-     "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml",
-     "http://mochi.test:8888/tests/content/base/test/file_base_xbl.xml#shesellsseashellsbytheseashore",
+    ["http://mochi.test:8888/tests/dom/base/test/file_base_xbl.xml",
+     "http://mochi.test:8888/tests/dom/base/test/file_base_xbl.xml",
+     "http://mochi.test:8888/tests/dom/base/test/file_base_xbl.xml#shesellsseashellsbytheseashore",
      ];
   node = SpecialPowers.wrap(document).getAnonymousNodes(document.getElementById("bound"))[0];
   while(node) {
diff --git a/content/base/test/test_blobconstructor.html b/dom/base/test/test_blobconstructor.html
similarity index 100%
rename from content/base/test/test_blobconstructor.html
rename to dom/base/test/test_blobconstructor.html
diff --git a/content/base/test/test_bug1008126.html b/dom/base/test/test_bug1008126.html
similarity index 100%
rename from content/base/test/test_bug1008126.html
rename to dom/base/test/test_bug1008126.html
diff --git a/content/base/test/test_bug1011748.html b/dom/base/test/test_bug1011748.html
similarity index 100%
rename from content/base/test/test_bug1011748.html
rename to dom/base/test/test_bug1011748.html
diff --git a/content/base/test/test_bug1025933.html b/dom/base/test/test_bug1025933.html
similarity index 100%
rename from content/base/test/test_bug1025933.html
rename to dom/base/test/test_bug1025933.html
diff --git a/content/base/test/test_bug1057176.html b/dom/base/test/test_bug1057176.html
similarity index 100%
rename from content/base/test/test_bug1057176.html
rename to dom/base/test/test_bug1057176.html
diff --git a/content/base/test/test_bug1081686.html b/dom/base/test/test_bug1081686.html
similarity index 86%
rename from content/base/test/test_bug1081686.html
rename to dom/base/test/test_bug1081686.html
index 824b9002542..822f4fbf544 100644
--- a/content/base/test/test_bug1081686.html
+++ b/dom/base/test/test_bug1081686.html
@@ -27,7 +27,7 @@ function forcegc()
 }
 
 function testWebSocket () {
-  ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket_hello");
+  ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
   ws.onopen = function(e) {
     ws.send("data");
   }
@@ -39,7 +39,7 @@ function testWebSocket () {
       is(ws.binaryType, 'blob', 'WebSocket.binaryType is blob');
       ws.binaryType = 'arraybuffer';
       is(ws.binaryType, 'arraybuffer', 'WebSocket.binaryType is arraybuffer');
-      is(ws.url, 'ws://mochi.test:8888/tests/content/base/test/file_websocket_hello', 'WebSocket.url is correct');
+      is(ws.url, 'ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello', 'WebSocket.url is correct');
       ws.close();
       ws.send('foobar');
       SimpleTest.finish();
diff --git a/content/base/test/test_bug166235.html b/dom/base/test/test_bug166235.html
similarity index 100%
rename from content/base/test/test_bug166235.html
rename to dom/base/test/test_bug166235.html
diff --git a/content/base/test/test_bug199959.html b/dom/base/test/test_bug199959.html
similarity index 100%
rename from content/base/test/test_bug199959.html
rename to dom/base/test/test_bug199959.html
diff --git a/content/base/test/test_bug218236.html b/dom/base/test/test_bug218236.html
similarity index 100%
rename from content/base/test/test_bug218236.html
rename to dom/base/test/test_bug218236.html
diff --git a/content/base/test/test_bug218277.html b/dom/base/test/test_bug218277.html
similarity index 100%
rename from content/base/test/test_bug218277.html
rename to dom/base/test/test_bug218277.html
diff --git a/content/base/test/test_bug238409.html b/dom/base/test/test_bug238409.html
similarity index 100%
rename from content/base/test/test_bug238409.html
rename to dom/base/test/test_bug238409.html
diff --git a/content/base/test/test_bug254337.html b/dom/base/test/test_bug254337.html
similarity index 100%
rename from content/base/test/test_bug254337.html
rename to dom/base/test/test_bug254337.html
diff --git a/content/base/test/test_bug270145.xhtml b/dom/base/test/test_bug270145.xhtml
similarity index 100%
rename from content/base/test/test_bug270145.xhtml
rename to dom/base/test/test_bug270145.xhtml
diff --git a/content/base/test/test_bug276037-1.html b/dom/base/test/test_bug276037-1.html
similarity index 100%
rename from content/base/test/test_bug276037-1.html
rename to dom/base/test/test_bug276037-1.html
diff --git a/content/base/test/test_bug276037-2.xhtml b/dom/base/test/test_bug276037-2.xhtml
similarity index 100%
rename from content/base/test/test_bug276037-2.xhtml
rename to dom/base/test/test_bug276037-2.xhtml
diff --git a/content/base/test/test_bug282547.html b/dom/base/test/test_bug282547.html
similarity index 96%
rename from content/base/test/test_bug282547.html
rename to dom/base/test/test_bug282547.html
index 0329633f942..054785abef7 100644
--- a/content/base/test/test_bug282547.html
+++ b/dom/base/test/test_bug282547.html
@@ -67,7 +67,7 @@ function xhr_auth_header_async() {
 
 function xhr_crossorigin_sync() {
   var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'http://example.com/tests/content/base/test/bug282547.sjs', true);
+  xhr.open('GET', 'http://example.com/tests/dom/base/test/bug282547.sjs', true);
   xhr.withCredentials = true;
 
   xhr.onreadystatechange = function() {
diff --git a/content/base/test/test_bug28293.html b/dom/base/test/test_bug28293.html
similarity index 100%
rename from content/base/test/test_bug28293.html
rename to dom/base/test/test_bug28293.html
diff --git a/content/base/test/test_bug28293.xhtml b/dom/base/test/test_bug28293.xhtml
similarity index 100%
rename from content/base/test/test_bug28293.xhtml
rename to dom/base/test/test_bug28293.xhtml
diff --git a/content/base/test/test_bug298064.html b/dom/base/test/test_bug298064.html
similarity index 100%
rename from content/base/test/test_bug298064.html
rename to dom/base/test/test_bug298064.html
diff --git a/content/base/test/test_bug300992.html b/dom/base/test/test_bug300992.html
similarity index 100%
rename from content/base/test/test_bug300992.html
rename to dom/base/test/test_bug300992.html
diff --git a/content/base/test/test_bug311681.xml b/dom/base/test/test_bug311681.xml
similarity index 100%
rename from content/base/test/test_bug311681.xml
rename to dom/base/test/test_bug311681.xml
diff --git a/content/base/test/test_bug313646.html b/dom/base/test/test_bug313646.html
similarity index 97%
rename from content/base/test/test_bug313646.html
rename to dom/base/test/test_bug313646.html
index d3d57514ea7..c4d59b197fd 100644
--- a/content/base/test/test_bug313646.html
+++ b/dom/base/test/test_bug313646.html
@@ -19,7 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=313646
 
 /** Test for Bug 313646 **/
 
-// content/base/test/bug313646.txt
+// dom/base/test/bug313646.txt
 
 SimpleTest.waitForExplicitFinish();
 
diff --git a/content/base/test/test_bug320799.html b/dom/base/test/test_bug320799.html
similarity index 100%
rename from content/base/test/test_bug320799.html
rename to dom/base/test/test_bug320799.html
diff --git a/content/base/test/test_bug322317.html b/dom/base/test/test_bug322317.html
similarity index 100%
rename from content/base/test/test_bug322317.html
rename to dom/base/test/test_bug322317.html
diff --git a/content/base/test/test_bug326337.html b/dom/base/test/test_bug326337.html
similarity index 100%
rename from content/base/test/test_bug326337.html
rename to dom/base/test/test_bug326337.html
diff --git a/content/base/test/test_bug330925.xhtml b/dom/base/test/test_bug330925.xhtml
similarity index 100%
rename from content/base/test/test_bug330925.xhtml
rename to dom/base/test/test_bug330925.xhtml
diff --git a/content/base/test/test_bug331959.html b/dom/base/test/test_bug331959.html
similarity index 100%
rename from content/base/test/test_bug331959.html
rename to dom/base/test/test_bug331959.html
diff --git a/content/base/test/test_bug333198.html b/dom/base/test/test_bug333198.html
similarity index 100%
rename from content/base/test/test_bug333198.html
rename to dom/base/test/test_bug333198.html
diff --git a/content/base/test/test_bug333673.html b/dom/base/test/test_bug333673.html
similarity index 100%
rename from content/base/test/test_bug333673.html
rename to dom/base/test/test_bug333673.html
diff --git a/content/base/test/test_bug337631.html b/dom/base/test/test_bug337631.html
similarity index 100%
rename from content/base/test/test_bug337631.html
rename to dom/base/test/test_bug337631.html
diff --git a/content/base/test/test_bug338541.xhtml b/dom/base/test/test_bug338541.xhtml
similarity index 100%
rename from content/base/test/test_bug338541.xhtml
rename to dom/base/test/test_bug338541.xhtml
diff --git a/content/base/test/test_bug338583.html b/dom/base/test/test_bug338583.html
similarity index 95%
rename from content/base/test/test_bug338583.html
rename to dom/base/test/test_bug338583.html
index b63810b09d2..a66a9f2acd4 100644
--- a/content/base/test/test_bug338583.html
+++ b/dom/base/test/test_bug338583.html
@@ -122,7 +122,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
 
   function doTest1(test_id) {
     gEventSourceObj1 = new EventSource("eventsource.resource");
-    ok(gEventSourceObj1.url == "http://mochi.test:8888/tests/content/base/test/eventsource.resource", "Test 1.a failed.");
+    ok(gEventSourceObj1.url == "http://mochi.test:8888/tests/dom/base/test/eventsource.resource", "Test 1.a failed.");
     ok(gEventSourceObj1.readyState == 0 || gEventSourceObj1.readyState == 1, "Test 1.a failed.");
 
     doTest1_b(test_id);
@@ -233,7 +233,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
 //   h) EventSource which last message doesn't end with an empty line. See bug 710546
 
   function doTest3(test_id) {
-    gEventSourceObj3_a = new EventSource("http://example.org/tests/content/base/test/eventsource.resource");
+    gEventSourceObj3_a = new EventSource("http://example.org/tests/dom/base/test/eventsource.resource");
 
     gEventSourceObj3_a.onmessage = fn_onmessage;
     gEventSourceObj3_a.hits = [];
@@ -434,7 +434,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
 
   function doTest5(test_id)
   {
-    gEventSourceObj5_a = new EventSource("http://example.org/tests/content/base/test/accesscontrol.resource");
+    gEventSourceObj5_a = new EventSource("http://example.org/tests/dom/base/test/accesscontrol.resource");
 
     gEventSourceObj5_a.onmessage = fn_onmessage;
     gEventSourceObj5_a.hits = [];
@@ -449,7 +449,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
 
   function doTest5_b(test_id)
   {
-    gEventSourceObj5_b = new EventSource("http://example.org/tests/content/base/test/invalid_accesscontrol.resource");
+    gEventSourceObj5_b = new EventSource("http://example.org/tests/dom/base/test/invalid_accesscontrol.resource");
 
     gEventSourceObj5_b.onmessage = fn_onmessage;
     gEventSourceObj5_b.hits = [];
@@ -468,12 +468,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
     xhr.withCredentials = true;
     // also, test mixed mode UI
-    xhr.open("GET", "https://example.com/tests/content/base/test/file_restrictedEventSource.sjs?test=user1_xhr", true, "user 1", "password 1");
+    xhr.open("GET", "https://example.com/tests/dom/base/test/file_restrictedEventSource.sjs?test=user1_xhr", true, "user 1", "password 1");
     xhr.send();
     xhr.onloadend = function() {
       ok(xhr.status == 200, "Failed to set credentials in test 5.c");
 
-      gEventSourceObj5_c = new EventSource("https://example.com/tests/content/base/test/file_restrictedEventSource.sjs?test=user1_evtsrc",
+      gEventSourceObj5_c = new EventSource("https://example.com/tests/dom/base/test/file_restrictedEventSource.sjs?test=user1_evtsrc",
                                            { withCredentials: true } );
       ok(gEventSourceObj5_c.withCredentials, "Wrong withCredentials in test 5.c");
 
@@ -496,12 +496,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
   {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
     xhr.withCredentials = true;
-    xhr.open("GET", "https://example.com/tests/content/base/test/file_restrictedEventSource.sjs?test=user2_xhr", true, "user 2", "password 2");
+    xhr.open("GET", "https://example.com/tests/dom/base/test/file_restrictedEventSource.sjs?test=user2_xhr", true, "user 2", "password 2");
     xhr.send();
     xhr.onloadend = function() {
       ok(xhr.status == 200, "Failed to set credentials in test 5.d");
   
-      gEventSourceObj5_d = new EventSource("https://example.com/tests/content/base/test/file_restrictedEventSource.sjs?test=user2_evtsrc");
+      gEventSourceObj5_d = new EventSource("https://example.com/tests/dom/base/test/file_restrictedEventSource.sjs?test=user2_evtsrc");
       ok(!gEventSourceObj5_d.withCredentials, "Wrong withCredentials in test 5.d");
   
       gEventSourceObj5_d.onmessage = function(e) {
@@ -524,12 +524,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
     // credentials using the auth cache
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
     xhr.withCredentials = true;
-    xhr.open("GET", "http://example.org/tests/content/base/test/file_restrictedEventSource.sjs?test=user1_xhr", true, "user 1", "password 1");
+    xhr.open("GET", "http://example.org/tests/dom/base/test/file_restrictedEventSource.sjs?test=user1_xhr", true, "user 1", "password 1");
     xhr.send();
     xhr.onloadend = function() {
       ok(xhr.status == 200, "Failed to set credentials in test 5.e");
 
-      gEventSourceObj5_e = new EventSource("http://example.org/tests/content/base/test/file_restrictedEventSource.sjs?test=user1_evtsrc",
+      gEventSourceObj5_e = new EventSource("http://example.org/tests/dom/base/test/file_restrictedEventSource.sjs?test=user1_evtsrc",
                                            { get withCredentials() { return true; } } );
       ok(gEventSourceObj5_e.withCredentials, "Wrong withCredentials in test 5.e");
 
@@ -552,12 +552,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338583
   {
     var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
     xhr.withCredentials = true;
-    xhr.open("GET", "http://example.org/tests/content/base/test/file_restrictedEventSource.sjs?test=user2_xhr", true, "user 2", "password 2");
+    xhr.open("GET", "http://example.org/tests/dom/base/test/file_restrictedEventSource.sjs?test=user2_xhr", true, "user 2", "password 2");
     xhr.send();
     xhr.onloadend = function() {
       ok(xhr.status == 200, "Failed to set credentials in test 5.f");
 
-      gEventSourceObj5_f = new EventSource("http://example.org/tests/content/base/test/file_restrictedEventSource.sjs?test=user2_evtsrc",
+      gEventSourceObj5_f = new EventSource("http://example.org/tests/dom/base/test/file_restrictedEventSource.sjs?test=user2_evtsrc",
                                            { });
       ok(!gEventSourceObj5_f.withCredentials, "Wrong withCredentials in test 5.f");
 
diff --git a/content/base/test/test_bug338679.html b/dom/base/test/test_bug338679.html
similarity index 100%
rename from content/base/test/test_bug338679.html
rename to dom/base/test/test_bug338679.html
diff --git a/content/base/test/test_bug339494.html b/dom/base/test/test_bug339494.html
similarity index 100%
rename from content/base/test/test_bug339494.html
rename to dom/base/test/test_bug339494.html
diff --git a/content/base/test/test_bug339494.xhtml b/dom/base/test/test_bug339494.xhtml
similarity index 100%
rename from content/base/test/test_bug339494.xhtml
rename to dom/base/test/test_bug339494.xhtml
diff --git a/content/base/test/test_bug340571.html b/dom/base/test/test_bug340571.html
similarity index 100%
rename from content/base/test/test_bug340571.html
rename to dom/base/test/test_bug340571.html
diff --git a/content/base/test/test_bug343596.html b/dom/base/test/test_bug343596.html
similarity index 100%
rename from content/base/test/test_bug343596.html
rename to dom/base/test/test_bug343596.html
diff --git a/content/base/test/test_bug345339.html b/dom/base/test/test_bug345339.html
similarity index 96%
rename from content/base/test/test_bug345339.html
rename to dom/base/test/test_bug345339.html
index 4025d572e80..2a5d05f24f9 100644
--- a/content/base/test/test_bug345339.html
+++ b/dom/base/test/test_bug345339.html
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=345339
 <div id="content" style="display: none">
 </div>
  <iframe id="testframe"
-         src="http://mochi.test:8888/tests/content/base/test/345339_iframe.html">
+         src="http://mochi.test:8888/tests/dom/base/test/345339_iframe.html">
  </iframe>
 <pre id="test">
 <script class="testbody" type="text/javascript">
diff --git a/content/base/test/test_bug346485.html b/dom/base/test/test_bug346485.html
similarity index 100%
rename from content/base/test/test_bug346485.html
rename to dom/base/test/test_bug346485.html
diff --git a/content/base/test/test_bug352728.html b/dom/base/test/test_bug352728.html
similarity index 100%
rename from content/base/test/test_bug352728.html
rename to dom/base/test/test_bug352728.html
diff --git a/content/base/test/test_bug352728.xhtml b/dom/base/test/test_bug352728.xhtml
similarity index 100%
rename from content/base/test/test_bug352728.xhtml
rename to dom/base/test/test_bug352728.xhtml
diff --git a/content/base/test/test_bug353334.html b/dom/base/test/test_bug353334.html
similarity index 100%
rename from content/base/test/test_bug353334.html
rename to dom/base/test/test_bug353334.html
diff --git a/content/base/test/test_bug355026.html b/dom/base/test/test_bug355026.html
similarity index 100%
rename from content/base/test/test_bug355026.html
rename to dom/base/test/test_bug355026.html
diff --git a/content/base/test/test_bug357450.html b/dom/base/test/test_bug357450.html
similarity index 100%
rename from content/base/test/test_bug357450.html
rename to dom/base/test/test_bug357450.html
diff --git a/content/base/test/test_bug357450.js b/dom/base/test/test_bug357450.js
similarity index 100%
rename from content/base/test/test_bug357450.js
rename to dom/base/test/test_bug357450.js
diff --git a/content/base/test/test_bug357450.xhtml b/dom/base/test/test_bug357450.xhtml
similarity index 100%
rename from content/base/test/test_bug357450.xhtml
rename to dom/base/test/test_bug357450.xhtml
diff --git a/content/base/test/test_bug357450_svg.xhtml b/dom/base/test/test_bug357450_svg.xhtml
similarity index 100%
rename from content/base/test/test_bug357450_svg.xhtml
rename to dom/base/test/test_bug357450_svg.xhtml
diff --git a/content/base/test/test_bug357509.html b/dom/base/test/test_bug357509.html
similarity index 100%
rename from content/base/test/test_bug357509.html
rename to dom/base/test/test_bug357509.html
diff --git a/content/base/test/test_bug358660.html b/dom/base/test/test_bug358660.html
similarity index 100%
rename from content/base/test/test_bug358660.html
rename to dom/base/test/test_bug358660.html
diff --git a/content/base/test/test_bug362391.xhtml b/dom/base/test/test_bug362391.xhtml
similarity index 100%
rename from content/base/test/test_bug362391.xhtml
rename to dom/base/test/test_bug362391.xhtml
diff --git a/content/base/test/test_bug364092.xhtml b/dom/base/test/test_bug364092.xhtml
similarity index 100%
rename from content/base/test/test_bug364092.xhtml
rename to dom/base/test/test_bug364092.xhtml
diff --git a/content/base/test/test_bug364413.xhtml b/dom/base/test/test_bug364413.xhtml
similarity index 100%
rename from content/base/test/test_bug364413.xhtml
rename to dom/base/test/test_bug364413.xhtml
diff --git a/content/base/test/test_bug366944.html b/dom/base/test/test_bug366944.html
similarity index 100%
rename from content/base/test/test_bug366944.html
rename to dom/base/test/test_bug366944.html
diff --git a/content/base/test/test_bug366946.html b/dom/base/test/test_bug366946.html
similarity index 100%
rename from content/base/test/test_bug366946.html
rename to dom/base/test/test_bug366946.html
diff --git a/content/base/test/test_bug367164.html b/dom/base/test/test_bug367164.html
similarity index 100%
rename from content/base/test/test_bug367164.html
rename to dom/base/test/test_bug367164.html
diff --git a/content/base/test/test_bug368972.html b/dom/base/test/test_bug368972.html
similarity index 100%
rename from content/base/test/test_bug368972.html
rename to dom/base/test/test_bug368972.html
diff --git a/content/base/test/test_bug371576-2.html b/dom/base/test/test_bug371576-2.html
similarity index 100%
rename from content/base/test/test_bug371576-2.html
rename to dom/base/test/test_bug371576-2.html
diff --git a/content/base/test/test_bug371576-3.html b/dom/base/test/test_bug371576-3.html
similarity index 100%
rename from content/base/test/test_bug371576-3.html
rename to dom/base/test/test_bug371576-3.html
diff --git a/content/base/test/test_bug371576-4.html b/dom/base/test/test_bug371576-4.html
similarity index 100%
rename from content/base/test/test_bug371576-4.html
rename to dom/base/test/test_bug371576-4.html
diff --git a/content/base/test/test_bug371576-5.html b/dom/base/test/test_bug371576-5.html
similarity index 100%
rename from content/base/test/test_bug371576-5.html
rename to dom/base/test/test_bug371576-5.html
diff --git a/content/base/test/test_bug372086.html b/dom/base/test/test_bug372086.html
similarity index 100%
rename from content/base/test/test_bug372086.html
rename to dom/base/test/test_bug372086.html
diff --git a/content/base/test/test_bug372964-2.html b/dom/base/test/test_bug372964-2.html
similarity index 100%
rename from content/base/test/test_bug372964-2.html
rename to dom/base/test/test_bug372964-2.html
diff --git a/content/base/test/test_bug372964.html b/dom/base/test/test_bug372964.html
similarity index 100%
rename from content/base/test/test_bug372964.html
rename to dom/base/test/test_bug372964.html
diff --git a/content/base/test/test_bug373181.xhtml b/dom/base/test/test_bug373181.xhtml
similarity index 100%
rename from content/base/test/test_bug373181.xhtml
rename to dom/base/test/test_bug373181.xhtml
diff --git a/content/base/test/test_bug375314.html b/dom/base/test/test_bug375314.html
similarity index 100%
rename from content/base/test/test_bug375314.html
rename to dom/base/test/test_bug375314.html
diff --git a/content/base/test/test_bug378969.html b/dom/base/test/test_bug378969.html
similarity index 100%
rename from content/base/test/test_bug378969.html
rename to dom/base/test/test_bug378969.html
diff --git a/content/base/test/test_bug380418.html b/dom/base/test/test_bug380418.html
similarity index 100%
rename from content/base/test/test_bug380418.html
rename to dom/base/test/test_bug380418.html
diff --git a/content/base/test/test_bug380418.html^headers^ b/dom/base/test/test_bug380418.html^headers^
similarity index 100%
rename from content/base/test/test_bug380418.html^headers^
rename to dom/base/test/test_bug380418.html^headers^
diff --git a/content/base/test/test_bug382113.html b/dom/base/test/test_bug382113.html
similarity index 100%
rename from content/base/test/test_bug382113.html
rename to dom/base/test/test_bug382113.html
diff --git a/content/base/test/test_bug382871.html b/dom/base/test/test_bug382871.html
similarity index 100%
rename from content/base/test/test_bug382871.html
rename to dom/base/test/test_bug382871.html
diff --git a/content/base/test/test_bug384003.xhtml b/dom/base/test/test_bug384003.xhtml
similarity index 100%
rename from content/base/test/test_bug384003.xhtml
rename to dom/base/test/test_bug384003.xhtml
diff --git a/content/base/test/test_bug390219.html b/dom/base/test/test_bug390219.html
similarity index 100%
rename from content/base/test/test_bug390219.html
rename to dom/base/test/test_bug390219.html
diff --git a/content/base/test/test_bug390735.html b/dom/base/test/test_bug390735.html
similarity index 100%
rename from content/base/test/test_bug390735.html
rename to dom/base/test/test_bug390735.html
diff --git a/content/base/test/test_bug392318.html b/dom/base/test/test_bug392318.html
similarity index 100%
rename from content/base/test/test_bug392318.html
rename to dom/base/test/test_bug392318.html
diff --git a/content/base/test/test_bug392511.html b/dom/base/test/test_bug392511.html
similarity index 100%
rename from content/base/test/test_bug392511.html
rename to dom/base/test/test_bug392511.html
diff --git a/content/base/test/test_bug393968.html b/dom/base/test/test_bug393968.html
similarity index 100%
rename from content/base/test/test_bug393968.html
rename to dom/base/test/test_bug393968.html
diff --git a/content/base/test/test_bug395915.html b/dom/base/test/test_bug395915.html
similarity index 100%
rename from content/base/test/test_bug395915.html
rename to dom/base/test/test_bug395915.html
diff --git a/content/base/test/test_bug397234.html b/dom/base/test/test_bug397234.html
similarity index 100%
rename from content/base/test/test_bug397234.html
rename to dom/base/test/test_bug397234.html
diff --git a/content/base/test/test_bug398243.html b/dom/base/test/test_bug398243.html
similarity index 94%
rename from content/base/test/test_bug398243.html
rename to dom/base/test/test_bug398243.html
index 5259b8e33ed..3b5d7400cf0 100644
--- a/content/base/test/test_bug398243.html
+++ b/dom/base/test/test_bug398243.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=398243
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
- <iframe id="testframe" src="http://mochi.test:8888/tests/content/base/test/formReset.html"></iframe>  
+ <iframe id="testframe" src="http://mochi.test:8888/tests/dom/base/test/formReset.html"></iframe>  
 <pre id="test">
 <script class="testbody" type="text/javascript">
 /** Test for Bug 398243 **/
diff --git a/content/base/test/test_bug401662.html b/dom/base/test/test_bug401662.html
similarity index 100%
rename from content/base/test/test_bug401662.html
rename to dom/base/test/test_bug401662.html
diff --git a/content/base/test/test_bug402150.html b/dom/base/test/test_bug402150.html
similarity index 100%
rename from content/base/test/test_bug402150.html
rename to dom/base/test/test_bug402150.html
diff --git a/content/base/test/test_bug402150.html^headers^ b/dom/base/test/test_bug402150.html^headers^
similarity index 100%
rename from content/base/test/test_bug402150.html^headers^
rename to dom/base/test/test_bug402150.html^headers^
diff --git a/content/base/test/test_bug403841.html b/dom/base/test/test_bug403841.html
similarity index 100%
rename from content/base/test/test_bug403841.html
rename to dom/base/test/test_bug403841.html
diff --git a/content/base/test/test_bug403852.html b/dom/base/test/test_bug403852.html
similarity index 100%
rename from content/base/test/test_bug403852.html
rename to dom/base/test/test_bug403852.html
diff --git a/content/base/test/test_bug403868.xml b/dom/base/test/test_bug403868.xml
similarity index 100%
rename from content/base/test/test_bug403868.xml
rename to dom/base/test/test_bug403868.xml
diff --git a/content/base/test/test_bug405182.html b/dom/base/test/test_bug405182.html
similarity index 100%
rename from content/base/test/test_bug405182.html
rename to dom/base/test/test_bug405182.html
diff --git a/content/base/test/test_bug409380.html b/dom/base/test/test_bug409380.html
similarity index 100%
rename from content/base/test/test_bug409380.html
rename to dom/base/test/test_bug409380.html
diff --git a/content/base/test/test_bug410229.html b/dom/base/test/test_bug410229.html
similarity index 100%
rename from content/base/test/test_bug410229.html
rename to dom/base/test/test_bug410229.html
diff --git a/content/base/test/test_bug413974.html b/dom/base/test/test_bug413974.html
similarity index 100%
rename from content/base/test/test_bug413974.html
rename to dom/base/test/test_bug413974.html
diff --git a/content/base/test/test_bug414190.html b/dom/base/test/test_bug414190.html
similarity index 100%
rename from content/base/test/test_bug414190.html
rename to dom/base/test/test_bug414190.html
diff --git a/content/base/test/test_bug415860.html b/dom/base/test/test_bug415860.html
similarity index 100%
rename from content/base/test/test_bug415860.html
rename to dom/base/test/test_bug415860.html
diff --git a/content/base/test/test_bug416317-1.html b/dom/base/test/test_bug416317-1.html
similarity index 100%
rename from content/base/test/test_bug416317-1.html
rename to dom/base/test/test_bug416317-1.html
diff --git a/content/base/test/test_bug416317-2.html b/dom/base/test/test_bug416317-2.html
similarity index 100%
rename from content/base/test/test_bug416317-2.html
rename to dom/base/test/test_bug416317-2.html
diff --git a/content/base/test/test_bug416383.html b/dom/base/test/test_bug416383.html
similarity index 100%
rename from content/base/test/test_bug416383.html
rename to dom/base/test/test_bug416383.html
diff --git a/content/base/test/test_bug417255.html b/dom/base/test/test_bug417255.html
similarity index 100%
rename from content/base/test/test_bug417255.html
rename to dom/base/test/test_bug417255.html
diff --git a/content/base/test/test_bug417384.html b/dom/base/test/test_bug417384.html
similarity index 100%
rename from content/base/test/test_bug417384.html
rename to dom/base/test/test_bug417384.html
diff --git a/content/base/test/test_bug418214.html b/dom/base/test/test_bug418214.html
similarity index 100%
rename from content/base/test/test_bug418214.html
rename to dom/base/test/test_bug418214.html
diff --git a/content/base/test/test_bug419132.html b/dom/base/test/test_bug419132.html
similarity index 100%
rename from content/base/test/test_bug419132.html
rename to dom/base/test/test_bug419132.html
diff --git a/content/base/test/test_bug419527.xhtml b/dom/base/test/test_bug419527.xhtml
similarity index 100%
rename from content/base/test/test_bug419527.xhtml
rename to dom/base/test/test_bug419527.xhtml
diff --git a/content/base/test/test_bug420609.xhtml b/dom/base/test/test_bug420609.xhtml
similarity index 100%
rename from content/base/test/test_bug420609.xhtml
rename to dom/base/test/test_bug420609.xhtml
diff --git a/content/base/test/test_bug420700.html b/dom/base/test/test_bug420700.html
similarity index 100%
rename from content/base/test/test_bug420700.html
rename to dom/base/test/test_bug420700.html
diff --git a/content/base/test/test_bug421602.html b/dom/base/test/test_bug421602.html
similarity index 100%
rename from content/base/test/test_bug421602.html
rename to dom/base/test/test_bug421602.html
diff --git a/content/base/test/test_bug422403-1.html b/dom/base/test/test_bug422403-1.html
similarity index 100%
rename from content/base/test/test_bug422403-1.html
rename to dom/base/test/test_bug422403-1.html
diff --git a/content/base/test/test_bug422403-2.xhtml b/dom/base/test/test_bug422403-2.xhtml
similarity index 100%
rename from content/base/test/test_bug422403-2.xhtml
rename to dom/base/test/test_bug422403-2.xhtml
diff --git a/content/base/test/test_bug422537.html b/dom/base/test/test_bug422537.html
similarity index 100%
rename from content/base/test/test_bug422537.html
rename to dom/base/test/test_bug422537.html
diff --git a/content/base/test/test_bug424212.html b/dom/base/test/test_bug424212.html
similarity index 100%
rename from content/base/test/test_bug424212.html
rename to dom/base/test/test_bug424212.html
diff --git a/content/base/test/test_bug424359-1.html b/dom/base/test/test_bug424359-1.html
similarity index 100%
rename from content/base/test/test_bug424359-1.html
rename to dom/base/test/test_bug424359-1.html
diff --git a/content/base/test/test_bug424359-2.html b/dom/base/test/test_bug424359-2.html
similarity index 100%
rename from content/base/test/test_bug424359-2.html
rename to dom/base/test/test_bug424359-2.html
diff --git a/content/base/test/test_bug425013.html b/dom/base/test/test_bug425013.html
similarity index 100%
rename from content/base/test/test_bug425013.html
rename to dom/base/test/test_bug425013.html
diff --git a/content/base/test/test_bug426308.html b/dom/base/test/test_bug426308.html
similarity index 92%
rename from content/base/test/test_bug426308.html
rename to dom/base/test/test_bug426308.html
index 70a93fef0e3..29367adc14a 100644
--- a/content/base/test/test_bug426308.html
+++ b/dom/base/test/test_bug426308.html
@@ -19,7 +19,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=426308
 
 /** Test for Bug 426308 **/
 
-const SJS_URL = "http://example.org:80/tests/content/base/test/bug426308-redirect.sjs";
+const SJS_URL = "http://example.org:80/tests/dom/base/test/bug426308-redirect.sjs";
 
 function startTest() {
   var req = new XMLHttpRequest({mozAnon: true, mozSystem: true});
diff --git a/content/base/test/test_bug426646.html b/dom/base/test/test_bug426646.html
similarity index 100%
rename from content/base/test/test_bug426646.html
rename to dom/base/test/test_bug426646.html
diff --git a/content/base/test/test_bug428847.html b/dom/base/test/test_bug428847.html
similarity index 100%
rename from content/base/test/test_bug428847.html
rename to dom/base/test/test_bug428847.html
diff --git a/content/base/test/test_bug429157.html b/dom/base/test/test_bug429157.html
similarity index 100%
rename from content/base/test/test_bug429157.html
rename to dom/base/test/test_bug429157.html
diff --git a/content/base/test/test_bug431082.html b/dom/base/test/test_bug431082.html
similarity index 100%
rename from content/base/test/test_bug431082.html
rename to dom/base/test/test_bug431082.html
diff --git a/content/base/test/test_bug431701.html b/dom/base/test/test_bug431701.html
similarity index 100%
rename from content/base/test/test_bug431701.html
rename to dom/base/test/test_bug431701.html
diff --git a/content/base/test/test_bug431833.html b/dom/base/test/test_bug431833.html
similarity index 100%
rename from content/base/test/test_bug431833.html
rename to dom/base/test/test_bug431833.html
diff --git a/content/base/test/test_bug433533.html b/dom/base/test/test_bug433533.html
similarity index 100%
rename from content/base/test/test_bug433533.html
rename to dom/base/test/test_bug433533.html
diff --git a/content/base/test/test_bug433662.html b/dom/base/test/test_bug433662.html
similarity index 100%
rename from content/base/test/test_bug433662.html
rename to dom/base/test/test_bug433662.html
diff --git a/content/base/test/test_bug435425.html b/dom/base/test/test_bug435425.html
similarity index 100%
rename from content/base/test/test_bug435425.html
rename to dom/base/test/test_bug435425.html
diff --git a/content/base/test/test_bug438519.html b/dom/base/test/test_bug438519.html
similarity index 100%
rename from content/base/test/test_bug438519.html
rename to dom/base/test/test_bug438519.html
diff --git a/content/base/test/test_bug444030.xhtml b/dom/base/test/test_bug444030.xhtml
similarity index 100%
rename from content/base/test/test_bug444030.xhtml
rename to dom/base/test/test_bug444030.xhtml
diff --git a/content/base/test/test_bug444322.html b/dom/base/test/test_bug444322.html
similarity index 100%
rename from content/base/test/test_bug444322.html
rename to dom/base/test/test_bug444322.html
diff --git a/content/base/test/test_bug444546.html b/dom/base/test/test_bug444546.html
similarity index 100%
rename from content/base/test/test_bug444546.html
rename to dom/base/test/test_bug444546.html
diff --git a/content/base/test/test_bug444722.html b/dom/base/test/test_bug444722.html
similarity index 100%
rename from content/base/test/test_bug444722.html
rename to dom/base/test/test_bug444722.html
diff --git a/content/base/test/test_bug448993.html b/dom/base/test/test_bug448993.html
similarity index 100%
rename from content/base/test/test_bug448993.html
rename to dom/base/test/test_bug448993.html
diff --git a/content/base/test/test_bug450160.html b/dom/base/test/test_bug450160.html
similarity index 100%
rename from content/base/test/test_bug450160.html
rename to dom/base/test/test_bug450160.html
diff --git a/content/base/test/test_bug451376.html b/dom/base/test/test_bug451376.html
similarity index 100%
rename from content/base/test/test_bug451376.html
rename to dom/base/test/test_bug451376.html
diff --git a/content/base/test/test_bug453521.html b/dom/base/test/test_bug453521.html
similarity index 100%
rename from content/base/test/test_bug453521.html
rename to dom/base/test/test_bug453521.html
diff --git a/content/base/test/test_bug453736.html b/dom/base/test/test_bug453736.html
similarity index 100%
rename from content/base/test/test_bug453736.html
rename to dom/base/test/test_bug453736.html
diff --git a/content/base/test/test_bug454325.html b/dom/base/test/test_bug454325.html
similarity index 100%
rename from content/base/test/test_bug454325.html
rename to dom/base/test/test_bug454325.html
diff --git a/content/base/test/test_bug454326.html b/dom/base/test/test_bug454326.html
similarity index 100%
rename from content/base/test/test_bug454326.html
rename to dom/base/test/test_bug454326.html
diff --git a/content/base/test/test_bug455472.html b/dom/base/test/test_bug455472.html
similarity index 100%
rename from content/base/test/test_bug455472.html
rename to dom/base/test/test_bug455472.html
diff --git a/content/base/test/test_bug455629.html b/dom/base/test/test_bug455629.html
similarity index 90%
rename from content/base/test/test_bug455629.html
rename to dom/base/test/test_bug455629.html
index ad81569dd17..eab16d67ef5 100644
--- a/content/base/test/test_bug455629.html
+++ b/dom/base/test/test_bug455629.html
@@ -49,13 +49,13 @@ function doTest(name) {
 <object id="obj"
         type="image/svg+xml"
         onload="doTest('obj')"
-        data="http://example.org/tests/content/base/test/bug455629-helper.svg">
+        data="http://example.org/tests/dom/base/test/bug455629-helper.svg">
 </object>
 
 <embed id="emb"
        type="image/svg+xml"
        onload="doTest('emb')"
-       src="http://example.org/tests/content/base/test/bug455629-helper.svg">
+       src="http://example.org/tests/dom/base/test/bug455629-helper.svg">
 </embed>
 
 </pre>
diff --git a/content/base/test/test_bug456262.html b/dom/base/test/test_bug456262.html
similarity index 100%
rename from content/base/test/test_bug456262.html
rename to dom/base/test/test_bug456262.html
diff --git a/content/base/test/test_bug457746.html b/dom/base/test/test_bug457746.html
similarity index 100%
rename from content/base/test/test_bug457746.html
rename to dom/base/test/test_bug457746.html
diff --git a/content/base/test/test_bug459424.html b/dom/base/test/test_bug459424.html
similarity index 100%
rename from content/base/test/test_bug459424.html
rename to dom/base/test/test_bug459424.html
diff --git a/content/base/test/test_bug461555.html b/dom/base/test/test_bug461555.html
similarity index 100%
rename from content/base/test/test_bug461555.html
rename to dom/base/test/test_bug461555.html
diff --git a/content/base/test/test_bug461735.html b/dom/base/test/test_bug461735.html
similarity index 90%
rename from content/base/test/test_bug461735.html
rename to dom/base/test/test_bug461735.html
index 8ffd93a2ef7..630c572f8a7 100644
--- a/content/base/test/test_bug461735.html
+++ b/dom/base/test/test_bug461735.html
@@ -20,7 +20,7 @@ var errorFired = false;
 window.onerror = function(message, uri, line) {
   is(message, "Script error.", "Should have empty error message");
   is(uri,
-     "http://mochi.test:8888/tests/content/base/test/bug461735-redirect1.sjs",
+     "http://mochi.test:8888/tests/dom/base/test/bug461735-redirect1.sjs",
      "Should have pre-redirect error location URI");
   is(line, 0, "Shouldn't have a line here");
   errorFired = true;
@@ -35,7 +35,7 @@ window.onerror = function(message, uri, line) {
 window.onerror = function(message, uri, line) {
   is(message, "ReferenceError: c is not defined", "Should have correct error message");
   is(uri,
-     "http://mochi.test:8888/tests/content/base/test/bug461735-redirect2.sjs",
+     "http://mochi.test:8888/tests/dom/base/test/bug461735-redirect2.sjs",
      "Unexpected error location URI");
   is(line, 3, "Should have a line here");
   errorFired = true;
diff --git a/content/base/test/test_bug465767.html b/dom/base/test/test_bug465767.html
similarity index 100%
rename from content/base/test/test_bug465767.html
rename to dom/base/test/test_bug465767.html
diff --git a/content/base/test/test_bug466080.html b/dom/base/test/test_bug466080.html
similarity index 84%
rename from content/base/test/test_bug466080.html
rename to dom/base/test/test_bug466080.html
index b613d63fa20..b889e899ffe 100644
--- a/content/base/test/test_bug466080.html
+++ b/dom/base/test/test_bug466080.html
@@ -7,7 +7,7 @@
 </head>
 <body onload="onWindowLoad()">
 <iframe id="frame1"
-        src="https://requireclientcert.example.com/tests/content/base/test/bug466080.sjs"
+        src="https://requireclientcert.example.com/tests/dom/base/test/bug466080.sjs"
         onload="document.iframeWasLoaded = true">
  
  This iframe should load the resource via the src-attribute from
@@ -38,41 +38,41 @@ var alltests = [
     error:"XHR loading non-existing resource"},
 
 // load resource from cross-site non-secure server
-  { url:"http://test1.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"http://test1.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"==200",
     error:"XHR from cross-site plaintext server"},
 
 // load resource from cross-site secure server - should work since no credentials are needed
-  { url:"https://test1.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://test1.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"==200",
     error:"XHR from cross-site secure server"},
 
 // load resource from cross-site secure server - should work since the server just requests certs
-  { url:"https://requestclientcert.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://requestclientcert.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"==200",
     error:"XHR from cross-site secure server requesting certificate"},
 
 // load resource from cross-site secure server - should NOT work since the server requires cert
 // note that this is the url which is used in the iframe.src above
-  { url:"https://requireclientcert.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://requireclientcert.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"!=200",
     error:"XHR from cross-site secure server requiring certificate"},
 
 // repeat previous,  - should NOT work
-  { url:"https://requireclientcert.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://requireclientcert.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"==200",
     error:"XHR w/ credentials from cross-site secure server requiring certificate",
     withCredentials:"true"},
     
 // repeat previous, but with credentials - should work
-  { url:"https://requireclientcert.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://requireclientcert.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"==200",
     error:"XHR w/ credentials from cross-site secure server requiring certificate",
     withCredentials:"true"},
 
 // repeat previous, withCredentials but using a weird method to force preflight
 // should NOT work since our preflight is anonymous and will fail with our simple server
-  { url:"https://requireclientcert.example.com/tests/content/base/test/bug466080.sjs",
+  { url:"https://requireclientcert.example.com/tests/dom/base/test/bug466080.sjs",
     status_check:"!=200",
     error:"XHR PREFLIGHT from cross-site secure server requiring certificate",
     withCredentials:"true",
diff --git a/content/base/test/test_bug466409.html b/dom/base/test/test_bug466409.html
similarity index 100%
rename from content/base/test/test_bug466409.html
rename to dom/base/test/test_bug466409.html
diff --git a/content/base/test/test_bug466751.xhtml b/dom/base/test/test_bug466751.xhtml
similarity index 100%
rename from content/base/test/test_bug466751.xhtml
rename to dom/base/test/test_bug466751.xhtml
diff --git a/content/base/test/test_bug469020.html b/dom/base/test/test_bug469020.html
similarity index 100%
rename from content/base/test/test_bug469020.html
rename to dom/base/test/test_bug469020.html
diff --git a/content/base/test/test_bug469304.html b/dom/base/test/test_bug469304.html
similarity index 100%
rename from content/base/test/test_bug469304.html
rename to dom/base/test/test_bug469304.html
diff --git a/content/base/test/test_bug473162-1.html b/dom/base/test/test_bug473162-1.html
similarity index 100%
rename from content/base/test/test_bug473162-1.html
rename to dom/base/test/test_bug473162-1.html
diff --git a/content/base/test/test_bug473162-2.html b/dom/base/test/test_bug473162-2.html
similarity index 100%
rename from content/base/test/test_bug473162-2.html
rename to dom/base/test/test_bug473162-2.html
diff --git a/content/base/test/test_bug475156.html b/dom/base/test/test_bug475156.html
similarity index 99%
rename from content/base/test/test_bug475156.html
rename to dom/base/test/test_bug475156.html
index 1700754a4b2..56e68084a02 100644
--- a/content/base/test/test_bug475156.html
+++ b/dom/base/test/test_bug475156.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=475156
 
 SimpleTest.waitForExplicitFinish();
 
-var path = "http://mochi.test:8888/tests/content/base/test/";
+var path = "http://mochi.test:8888/tests/dom/base/test/";
 
 function fromCache(xhr)
 {
diff --git a/content/base/test/test_bug482935.html b/dom/base/test/test_bug482935.html
similarity index 100%
rename from content/base/test/test_bug482935.html
rename to dom/base/test/test_bug482935.html
diff --git a/content/base/test/test_bug484396.html b/dom/base/test/test_bug484396.html
similarity index 100%
rename from content/base/test/test_bug484396.html
rename to dom/base/test/test_bug484396.html
diff --git a/content/base/test/test_bug493881.html b/dom/base/test/test_bug493881.html
similarity index 100%
rename from content/base/test/test_bug493881.html
rename to dom/base/test/test_bug493881.html
diff --git a/content/base/test/test_bug493881.js b/dom/base/test/test_bug493881.js
similarity index 100%
rename from content/base/test/test_bug493881.js
rename to dom/base/test/test_bug493881.js
diff --git a/content/base/test/test_bug498240.html b/dom/base/test/test_bug498240.html
similarity index 100%
rename from content/base/test/test_bug498240.html
rename to dom/base/test/test_bug498240.html
diff --git a/content/base/test/test_bug498433.html b/dom/base/test/test_bug498433.html
similarity index 100%
rename from content/base/test/test_bug498433.html
rename to dom/base/test/test_bug498433.html
diff --git a/content/base/test/test_bug498897.html b/dom/base/test/test_bug498897.html
similarity index 100%
rename from content/base/test/test_bug498897.html
rename to dom/base/test/test_bug498897.html
diff --git a/content/base/test/test_bug499656.html b/dom/base/test/test_bug499656.html
similarity index 100%
rename from content/base/test/test_bug499656.html
rename to dom/base/test/test_bug499656.html
diff --git a/content/base/test/test_bug499656.xhtml b/dom/base/test/test_bug499656.xhtml
similarity index 100%
rename from content/base/test/test_bug499656.xhtml
rename to dom/base/test/test_bug499656.xhtml
diff --git a/content/base/test/test_bug500937.html b/dom/base/test/test_bug500937.html
similarity index 100%
rename from content/base/test/test_bug500937.html
rename to dom/base/test/test_bug500937.html
diff --git a/content/base/test/test_bug503473.html b/dom/base/test/test_bug503473.html
similarity index 100%
rename from content/base/test/test_bug503473.html
rename to dom/base/test/test_bug503473.html
diff --git a/content/base/test/test_bug503481.html b/dom/base/test/test_bug503481.html
similarity index 100%
rename from content/base/test/test_bug503481.html
rename to dom/base/test/test_bug503481.html
diff --git a/content/base/test/test_bug503481b.html b/dom/base/test/test_bug503481b.html
similarity index 100%
rename from content/base/test/test_bug503481b.html
rename to dom/base/test/test_bug503481b.html
diff --git a/content/base/test/test_bug505783.html b/dom/base/test/test_bug505783.html
similarity index 100%
rename from content/base/test/test_bug505783.html
rename to dom/base/test/test_bug505783.html
diff --git a/content/base/test/test_bug51034.html b/dom/base/test/test_bug51034.html
similarity index 100%
rename from content/base/test/test_bug51034.html
rename to dom/base/test/test_bug51034.html
diff --git a/content/base/test/test_bug513194.html b/dom/base/test/test_bug513194.html
similarity index 100%
rename from content/base/test/test_bug513194.html
rename to dom/base/test/test_bug513194.html
diff --git a/content/base/test/test_bug5141.html b/dom/base/test/test_bug5141.html
similarity index 100%
rename from content/base/test/test_bug5141.html
rename to dom/base/test/test_bug5141.html
diff --git a/content/base/test/test_bug514487.html b/dom/base/test/test_bug514487.html
similarity index 100%
rename from content/base/test/test_bug514487.html
rename to dom/base/test/test_bug514487.html
diff --git a/content/base/test/test_bug515401.html b/dom/base/test/test_bug515401.html
similarity index 98%
rename from content/base/test/test_bug515401.html
rename to dom/base/test/test_bug515401.html
index 977e046f345..d3e1884d7c4 100644
--- a/content/base/test/test_bug515401.html
+++ b/dom/base/test/test_bug515401.html
@@ -49,7 +49,7 @@ is(awtarget.target, "a_target", "yet still specified target");
 // link hrefs
 var basehref = $('basehref');
 var basehref2 = $('basehref2');
-var pre = "http://mochi.test:8888/tests/content/base/test/";
+var pre = "http://mochi.test:8888/tests/dom/base/test/";
 function verifyBase(base, test) {
   if (base == "") {
     is(document.baseURI, document.URL, "document base when " + test);
diff --git a/content/base/test/test_bug518104.html b/dom/base/test/test_bug518104.html
similarity index 100%
rename from content/base/test/test_bug518104.html
rename to dom/base/test/test_bug518104.html
diff --git a/content/base/test/test_bug527896.html b/dom/base/test/test_bug527896.html
similarity index 100%
rename from content/base/test/test_bug527896.html
rename to dom/base/test/test_bug527896.html
diff --git a/content/base/test/test_bug540854.html b/dom/base/test/test_bug540854.html
similarity index 100%
rename from content/base/test/test_bug540854.html
rename to dom/base/test/test_bug540854.html
diff --git a/content/base/test/test_bug541937.html b/dom/base/test/test_bug541937.html
similarity index 100%
rename from content/base/test/test_bug541937.html
rename to dom/base/test/test_bug541937.html
diff --git a/content/base/test/test_bug544642.html b/dom/base/test/test_bug544642.html
similarity index 100%
rename from content/base/test/test_bug544642.html
rename to dom/base/test/test_bug544642.html
diff --git a/content/base/test/test_bug545644.html b/dom/base/test/test_bug545644.html
similarity index 100%
rename from content/base/test/test_bug545644.html
rename to dom/base/test/test_bug545644.html
diff --git a/content/base/test/test_bug545644.xhtml b/dom/base/test/test_bug545644.xhtml
similarity index 100%
rename from content/base/test/test_bug545644.xhtml
rename to dom/base/test/test_bug545644.xhtml
diff --git a/content/base/test/test_bug548463.html b/dom/base/test/test_bug548463.html
similarity index 100%
rename from content/base/test/test_bug548463.html
rename to dom/base/test/test_bug548463.html
diff --git a/content/base/test/test_bug553896.xhtml b/dom/base/test/test_bug553896.xhtml
similarity index 100%
rename from content/base/test/test_bug553896.xhtml
rename to dom/base/test/test_bug553896.xhtml
diff --git a/content/base/test/test_bug557892.html b/dom/base/test/test_bug557892.html
similarity index 100%
rename from content/base/test/test_bug557892.html
rename to dom/base/test/test_bug557892.html
diff --git a/content/base/test/test_bug558726.html b/dom/base/test/test_bug558726.html
similarity index 100%
rename from content/base/test/test_bug558726.html
rename to dom/base/test/test_bug558726.html
diff --git a/content/base/test/test_bug559526.html b/dom/base/test/test_bug559526.html
similarity index 100%
rename from content/base/test/test_bug559526.html
rename to dom/base/test/test_bug559526.html
diff --git a/content/base/test/test_bug560780.html b/dom/base/test/test_bug560780.html
similarity index 100%
rename from content/base/test/test_bug560780.html
rename to dom/base/test/test_bug560780.html
diff --git a/content/base/test/test_bug562137.html b/dom/base/test/test_bug562137.html
similarity index 100%
rename from content/base/test/test_bug562137.html
rename to dom/base/test/test_bug562137.html
diff --git a/content/base/test/test_bug562169-1.html b/dom/base/test/test_bug562169-1.html
similarity index 100%
rename from content/base/test/test_bug562169-1.html
rename to dom/base/test/test_bug562169-1.html
diff --git a/content/base/test/test_bug562169-2.html b/dom/base/test/test_bug562169-2.html
similarity index 100%
rename from content/base/test/test_bug562169-2.html
rename to dom/base/test/test_bug562169-2.html
diff --git a/content/base/test/test_bug562652.html b/dom/base/test/test_bug562652.html
similarity index 100%
rename from content/base/test/test_bug562652.html
rename to dom/base/test/test_bug562652.html
diff --git a/content/base/test/test_bug564047.html b/dom/base/test/test_bug564047.html
similarity index 100%
rename from content/base/test/test_bug564047.html
rename to dom/base/test/test_bug564047.html
diff --git a/content/base/test/test_bug564863.xhtml b/dom/base/test/test_bug564863.xhtml
similarity index 100%
rename from content/base/test/test_bug564863.xhtml
rename to dom/base/test/test_bug564863.xhtml
diff --git a/content/base/test/test_bug567350.html b/dom/base/test/test_bug567350.html
similarity index 100%
rename from content/base/test/test_bug567350.html
rename to dom/base/test/test_bug567350.html
diff --git a/content/base/test/test_bug578096.html b/dom/base/test/test_bug578096.html
similarity index 100%
rename from content/base/test/test_bug578096.html
rename to dom/base/test/test_bug578096.html
diff --git a/content/base/test/test_bug585978.html b/dom/base/test/test_bug585978.html
similarity index 100%
rename from content/base/test/test_bug585978.html
rename to dom/base/test/test_bug585978.html
diff --git a/content/base/test/test_bug587931.html b/dom/base/test/test_bug587931.html
similarity index 100%
rename from content/base/test/test_bug587931.html
rename to dom/base/test/test_bug587931.html
diff --git a/content/base/test/test_bug588990.html b/dom/base/test/test_bug588990.html
similarity index 100%
rename from content/base/test/test_bug588990.html
rename to dom/base/test/test_bug588990.html
diff --git a/content/base/test/test_bug590812.html b/dom/base/test/test_bug590812.html
similarity index 92%
rename from content/base/test/test_bug590812.html
rename to dom/base/test/test_bug590812.html
index f2f1e60a304..834fa38f858 100644
--- a/content/base/test/test_bug590812.html
+++ b/dom/base/test/test_bug590812.html
@@ -9,7 +9,7 @@
 <body onload="runTest()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=590812">Mozilla Bug 590812</a>
 <p id="display"></p>
-<iframe src="http://noxul.example.com/tests/content/base/test/file_bug590812.xml"></iframe>
+<iframe src="http://noxul.example.com/tests/dom/base/test/file_bug590812.xml"></iframe>
 <iframe src="file_bug590812.xml"></iframe>
 <iframe src="file_bug590812-ref.xhtml"></iframe>
 <pre id="test">
diff --git a/content/base/test/test_bug590870.html b/dom/base/test/test_bug590870.html
similarity index 91%
rename from content/base/test/test_bug590870.html
rename to dom/base/test/test_bug590870.html
index a398cf5e919..0faa2f4b608 100644
--- a/content/base/test/test_bug590870.html
+++ b/dom/base/test/test_bug590870.html
@@ -21,7 +21,7 @@ var gen = runTest();
 
 function runTest() {
   var iframe = $('iframe');
-  iframe.src = "http://noxul.example.com/tests/content/base/test/file_bug590870.html";
+  iframe.src = "http://noxul.example.com/tests/dom/base/test/file_bug590870.html";
   is((yield), true, "shouldn't be able to create XUL elements");
 
   iframe.src = "file_bug590870.html";
diff --git a/content/base/test/test_bug592366.html b/dom/base/test/test_bug592366.html
similarity index 100%
rename from content/base/test/test_bug592366.html
rename to dom/base/test/test_bug592366.html
diff --git a/content/base/test/test_bug592829.html b/dom/base/test/test_bug592829.html
similarity index 100%
rename from content/base/test/test_bug592829.html
rename to dom/base/test/test_bug592829.html
diff --git a/content/base/test/test_bug597345.html b/dom/base/test/test_bug597345.html
similarity index 100%
rename from content/base/test/test_bug597345.html
rename to dom/base/test/test_bug597345.html
diff --git a/content/base/test/test_bug599588.html b/dom/base/test/test_bug599588.html
similarity index 100%
rename from content/base/test/test_bug599588.html
rename to dom/base/test/test_bug599588.html
diff --git a/content/base/test/test_bug601803.html b/dom/base/test/test_bug601803.html
similarity index 95%
rename from content/base/test/test_bug601803.html
rename to dom/base/test/test_bug601803.html
index 2882dd00d10..cbc15a22c3e 100644
--- a/content/base/test/test_bug601803.html
+++ b/dom/base/test/test_bug601803.html
@@ -25,7 +25,7 @@ window.onmessage = function (event) {
     SimpleTest.finish();
 }
 
-document.getElementById("frame").src = "http://example.org/tests/content/base/test/file_bug601803a.html";
+document.getElementById("frame").src = "http://example.org/tests/dom/base/test/file_bug601803a.html";
 
 
 
diff --git a/content/base/test/test_bug602838.html b/dom/base/test/test_bug602838.html
similarity index 100%
rename from content/base/test/test_bug602838.html
rename to dom/base/test/test_bug602838.html
diff --git a/content/base/test/test_bug604592.html b/dom/base/test/test_bug604592.html
similarity index 100%
rename from content/base/test/test_bug604592.html
rename to dom/base/test/test_bug604592.html
diff --git a/content/base/test/test_bug604660.html b/dom/base/test/test_bug604660.html
similarity index 100%
rename from content/base/test/test_bug604660.html
rename to dom/base/test/test_bug604660.html
diff --git a/content/base/test/test_bug605982.html b/dom/base/test/test_bug605982.html
similarity index 100%
rename from content/base/test/test_bug605982.html
rename to dom/base/test/test_bug605982.html
diff --git a/content/base/test/test_bug606729.html b/dom/base/test/test_bug606729.html
similarity index 100%
rename from content/base/test/test_bug606729.html
rename to dom/base/test/test_bug606729.html
diff --git a/content/base/test/test_bug614058.html b/dom/base/test/test_bug614058.html
similarity index 100%
rename from content/base/test/test_bug614058.html
rename to dom/base/test/test_bug614058.html
diff --git a/content/base/test/test_bug614583.html b/dom/base/test/test_bug614583.html
similarity index 100%
rename from content/base/test/test_bug614583.html
rename to dom/base/test/test_bug614583.html
diff --git a/content/base/test/test_bug622088.html b/dom/base/test/test_bug622088.html
similarity index 100%
rename from content/base/test/test_bug622088.html
rename to dom/base/test/test_bug622088.html
diff --git a/content/base/test/test_bug622117.html b/dom/base/test/test_bug622117.html
similarity index 100%
rename from content/base/test/test_bug622117.html
rename to dom/base/test/test_bug622117.html
diff --git a/content/base/test/test_bug622246.html b/dom/base/test/test_bug622246.html
similarity index 100%
rename from content/base/test/test_bug622246.html
rename to dom/base/test/test_bug622246.html
diff --git a/content/base/test/test_bug625722.html b/dom/base/test/test_bug625722.html
similarity index 100%
rename from content/base/test/test_bug625722.html
rename to dom/base/test/test_bug625722.html
diff --git a/content/base/test/test_bug626262.html b/dom/base/test/test_bug626262.html
similarity index 100%
rename from content/base/test/test_bug626262.html
rename to dom/base/test/test_bug626262.html
diff --git a/content/base/test/test_bug628938.html b/dom/base/test/test_bug628938.html
similarity index 100%
rename from content/base/test/test_bug628938.html
rename to dom/base/test/test_bug628938.html
diff --git a/content/base/test/test_bug631615.html b/dom/base/test/test_bug631615.html
similarity index 100%
rename from content/base/test/test_bug631615.html
rename to dom/base/test/test_bug631615.html
diff --git a/content/base/test/test_bug638112.html b/dom/base/test/test_bug638112.html
similarity index 100%
rename from content/base/test/test_bug638112.html
rename to dom/base/test/test_bug638112.html
diff --git a/content/base/test/test_bug647518.html b/dom/base/test/test_bug647518.html
similarity index 100%
rename from content/base/test/test_bug647518.html
rename to dom/base/test/test_bug647518.html
diff --git a/content/base/test/test_bug650001.html b/dom/base/test/test_bug650001.html
similarity index 100%
rename from content/base/test/test_bug650001.html
rename to dom/base/test/test_bug650001.html
diff --git a/content/base/test/test_bug656283.html b/dom/base/test/test_bug656283.html
similarity index 100%
rename from content/base/test/test_bug656283.html
rename to dom/base/test/test_bug656283.html
diff --git a/content/base/test/test_bug664916.html b/dom/base/test/test_bug664916.html
similarity index 100%
rename from content/base/test/test_bug664916.html
rename to dom/base/test/test_bug664916.html
diff --git a/content/base/test/test_bug666604.html b/dom/base/test/test_bug666604.html
similarity index 100%
rename from content/base/test/test_bug666604.html
rename to dom/base/test/test_bug666604.html
diff --git a/content/base/test/test_bug675121.html b/dom/base/test/test_bug675121.html
similarity index 100%
rename from content/base/test/test_bug675121.html
rename to dom/base/test/test_bug675121.html
diff --git a/content/base/test/test_bug675166.html b/dom/base/test/test_bug675166.html
similarity index 100%
rename from content/base/test/test_bug675166.html
rename to dom/base/test/test_bug675166.html
diff --git a/content/base/test/test_bug682463.html b/dom/base/test/test_bug682463.html
similarity index 100%
rename from content/base/test/test_bug682463.html
rename to dom/base/test/test_bug682463.html
diff --git a/content/base/test/test_bug682554.html b/dom/base/test/test_bug682554.html
similarity index 100%
rename from content/base/test/test_bug682554.html
rename to dom/base/test/test_bug682554.html
diff --git a/content/base/test/test_bug682592.html b/dom/base/test/test_bug682592.html
similarity index 100%
rename from content/base/test/test_bug682592.html
rename to dom/base/test/test_bug682592.html
diff --git a/content/base/test/test_bug684671.html b/dom/base/test/test_bug684671.html
similarity index 100%
rename from content/base/test/test_bug684671.html
rename to dom/base/test/test_bug684671.html
diff --git a/content/base/test/test_bug685798.html b/dom/base/test/test_bug685798.html
similarity index 100%
rename from content/base/test/test_bug685798.html
rename to dom/base/test/test_bug685798.html
diff --git a/content/base/test/test_bug686449.xhtml b/dom/base/test/test_bug686449.xhtml
similarity index 100%
rename from content/base/test/test_bug686449.xhtml
rename to dom/base/test/test_bug686449.xhtml
diff --git a/content/base/test/test_bug687859.html b/dom/base/test/test_bug687859.html
similarity index 100%
rename from content/base/test/test_bug687859.html
rename to dom/base/test/test_bug687859.html
diff --git a/content/base/test/test_bug690056.html b/dom/base/test/test_bug690056.html
similarity index 100%
rename from content/base/test/test_bug690056.html
rename to dom/base/test/test_bug690056.html
diff --git a/content/base/test/test_bug692434.html b/dom/base/test/test_bug692434.html
similarity index 100%
rename from content/base/test/test_bug692434.html
rename to dom/base/test/test_bug692434.html
diff --git a/content/base/test/test_bug693615.html b/dom/base/test/test_bug693615.html
similarity index 100%
rename from content/base/test/test_bug693615.html
rename to dom/base/test/test_bug693615.html
diff --git a/content/base/test/test_bug693875.html b/dom/base/test/test_bug693875.html
similarity index 100%
rename from content/base/test/test_bug693875.html
rename to dom/base/test/test_bug693875.html
diff --git a/content/base/test/test_bug694754.xhtml b/dom/base/test/test_bug694754.xhtml
similarity index 100%
rename from content/base/test/test_bug694754.xhtml
rename to dom/base/test/test_bug694754.xhtml
diff --git a/content/base/test/test_bug696301-1.html b/dom/base/test/test_bug696301-1.html
similarity index 84%
rename from content/base/test/test_bug696301-1.html
rename to dom/base/test/test_bug696301-1.html
index 3867aefe99a..2fb4c3c97c7 100644
--- a/content/base/test/test_bug696301-1.html
+++ b/dom/base/test/test_bug696301-1.html
@@ -22,13 +22,13 @@ var global = "";
 window.onerror = function(message, uri, line) {
   is(message, "Script error.", "Should have empty error message");
   is(uri,
-     "http://example.com/tests/content/base/test/bug696301-script-1.js",
+     "http://example.com/tests/dom/base/test/bug696301-script-1.js",
      "Should have correct script URI");
   is(line, 0, "Shouldn't have a line here");
   errorFired = true;
 }
 </script>
-<script src="http://example.com/tests/content/base/test/bug696301-script-1.js"></script>
+<script src="http://example.com/tests/dom/base/test/bug696301-script-1.js"></script>
 <script>
   is(errorFired, true, "Should have error in different origin script");
   is(global, "ran", "Different origin script should have run");
@@ -40,13 +40,13 @@ global = "";
 window.onerror = function(message, uri, line) {
   is(message, "ReferenceError: c is not defined", "Should have correct error message");
   is(uri,
-     "http://example.com/tests/content/base/test/bug696301-script-1.js",
+     "http://example.com/tests/dom/base/test/bug696301-script-1.js",
      "Should also have correct script URI");
   is(line, 3, "Should have a line here");
   errorFired = true;
 }
 </script>
-<script src="http://example.com/tests/content/base/test/bug696301-script-1.js"
+<script src="http://example.com/tests/dom/base/test/bug696301-script-1.js"
         crossorigin></script>
 <script>
   is(errorFired, true, "Should have error in different origin script with CORS");
@@ -65,7 +65,7 @@ window.addEventListener("error", function(e) {
   errorFired = true;
 }, true);
 </script>
-<script src="http://example.com/tests/content/base/test/bug696301-script-2.js"
+<script src="http://example.com/tests/dom/base/test/bug696301-script-2.js"
         crossorigin></script>
 <script>
   is(errorFired, true,
diff --git a/content/base/test/test_bug696301-2.html b/dom/base/test/test_bug696301-2.html
similarity index 84%
rename from content/base/test/test_bug696301-2.html
rename to dom/base/test/test_bug696301-2.html
index e7f75a87c1f..c27b8a55567 100644
--- a/content/base/test/test_bug696301-2.html
+++ b/dom/base/test/test_bug696301-2.html
@@ -24,13 +24,13 @@ var global = "";
 window.onerror = function(message, uri, line) {
   is(message, "Script error.", "Should have empty error message");
   is(uri,
-     "http://example.com/tests/content/base/test/bug696301-script-1.js",
+     "http://example.com/tests/dom/base/test/bug696301-script-1.js",
      "Should have correct script URI");
   is(line, 0, "Shouldn't have a line here");
   errorFired = true;
 }
 </script>
-<script xlink:href="http://example.com/tests/content/base/test/bug696301-script-1.js"></script>
+<script xlink:href="http://example.com/tests/dom/base/test/bug696301-script-1.js"></script>
 <script>
   is(errorFired, true, "Should have error in different origin script");
   is(global, "ran", "Different origin script should have run");
@@ -42,13 +42,13 @@ global = "";
 window.onerror = function(message, uri, line) {
   is(message, "ReferenceError: c is not defined", "Should have correct error message");
   is(uri,
-     "http://example.com/tests/content/base/test/bug696301-script-1.js",
+     "http://example.com/tests/dom/base/test/bug696301-script-1.js",
      "Should also have correct script URI");
   is(line, 3, "Should have a line here");
   errorFired = true;
 }
 </script>
-<script xlink:href="http://example.com/tests/content/base/test/bug696301-script-1.js"
+<script xlink:href="http://example.com/tests/dom/base/test/bug696301-script-1.js"
         crossorigin></script>
 <script>
   is(errorFired, true, "Should have error in different origin script with CORS");
@@ -67,7 +67,7 @@ window.addEventListener("error", function(e) {
   errorFired = true;
 }, true);
 </script>
-<script xlink:href="http://example.com/tests/content/base/test/bug696301-script-2.js"
+<script xlink:href="http://example.com/tests/dom/base/test/bug696301-script-2.js"
         crossorigin></script>
 <script>
   is(errorFired, true,
diff --git a/content/base/test/test_bug698381.html b/dom/base/test/test_bug698381.html
similarity index 100%
rename from content/base/test/test_bug698381.html
rename to dom/base/test/test_bug698381.html
diff --git a/content/base/test/test_bug698384.html b/dom/base/test/test_bug698384.html
similarity index 100%
rename from content/base/test/test_bug698384.html
rename to dom/base/test/test_bug698384.html
diff --git a/content/base/test/test_bug704063.html b/dom/base/test/test_bug704063.html
similarity index 100%
rename from content/base/test/test_bug704063.html
rename to dom/base/test/test_bug704063.html
diff --git a/content/base/test/test_bug707142.html b/dom/base/test/test_bug707142.html
similarity index 100%
rename from content/base/test/test_bug707142.html
rename to dom/base/test/test_bug707142.html
diff --git a/content/base/test/test_bug708620.html b/dom/base/test/test_bug708620.html
similarity index 100%
rename from content/base/test/test_bug708620.html
rename to dom/base/test/test_bug708620.html
diff --git a/content/base/test/test_bug711047.html b/dom/base/test/test_bug711047.html
similarity index 100%
rename from content/base/test/test_bug711047.html
rename to dom/base/test/test_bug711047.html
diff --git a/content/base/test/test_bug711180.html b/dom/base/test/test_bug711180.html
similarity index 100%
rename from content/base/test/test_bug711180.html
rename to dom/base/test/test_bug711180.html
diff --git a/content/base/test/test_bug719533.html b/dom/base/test/test_bug719533.html
similarity index 100%
rename from content/base/test/test_bug719533.html
rename to dom/base/test/test_bug719533.html
diff --git a/content/base/test/test_bug726364.html b/dom/base/test/test_bug726364.html
similarity index 100%
rename from content/base/test/test_bug726364.html
rename to dom/base/test/test_bug726364.html
diff --git a/content/base/test/test_bug737087.html b/dom/base/test/test_bug737087.html
similarity index 100%
rename from content/base/test/test_bug737087.html
rename to dom/base/test/test_bug737087.html
diff --git a/content/base/test/test_bug737565.html b/dom/base/test/test_bug737565.html
similarity index 100%
rename from content/base/test/test_bug737565.html
rename to dom/base/test/test_bug737565.html
diff --git a/content/base/test/test_bug737612.html b/dom/base/test/test_bug737612.html
similarity index 100%
rename from content/base/test/test_bug737612.html
rename to dom/base/test/test_bug737612.html
diff --git a/content/base/test/test_bug738108.html b/dom/base/test/test_bug738108.html
similarity index 100%
rename from content/base/test/test_bug738108.html
rename to dom/base/test/test_bug738108.html
diff --git a/content/base/test/test_bug744830.html b/dom/base/test/test_bug744830.html
similarity index 100%
rename from content/base/test/test_bug744830.html
rename to dom/base/test/test_bug744830.html
diff --git a/content/base/test/test_bug749367.html b/dom/base/test/test_bug749367.html
similarity index 100%
rename from content/base/test/test_bug749367.html
rename to dom/base/test/test_bug749367.html
diff --git a/content/base/test/test_bug753278.html b/dom/base/test/test_bug753278.html
similarity index 100%
rename from content/base/test/test_bug753278.html
rename to dom/base/test/test_bug753278.html
diff --git a/content/base/test/test_bug761120.html b/dom/base/test/test_bug761120.html
similarity index 100%
rename from content/base/test/test_bug761120.html
rename to dom/base/test/test_bug761120.html
diff --git a/content/base/test/test_bug782342.html b/dom/base/test/test_bug782342.html
similarity index 100%
rename from content/base/test/test_bug782342.html
rename to dom/base/test/test_bug782342.html
diff --git a/content/base/test/test_bug787778.html b/dom/base/test/test_bug787778.html
similarity index 100%
rename from content/base/test/test_bug787778.html
rename to dom/base/test/test_bug787778.html
diff --git a/content/base/test/test_bug789856.html b/dom/base/test/test_bug789856.html
similarity index 100%
rename from content/base/test/test_bug789856.html
rename to dom/base/test/test_bug789856.html
diff --git a/content/base/test/test_bug804395.html b/dom/base/test/test_bug804395.html
similarity index 84%
rename from content/base/test/test_bug804395.html
rename to dom/base/test/test_bug804395.html
index 61cbcbab650..bf61d45b5ad 100644
--- a/content/base/test/test_bug804395.html
+++ b/dom/base/test/test_bug804395.html
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=804395
 
 function test200() {
   var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-  xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug804395.jar!/foo.bar', true);
+  xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug804395.jar!/foo.bar', true);
   xhr.onreadystatechange = function() {
     if (xhr.readyState == 4) {
       ok(xhr.status == 200, "Existing file must have Status 200!");
@@ -32,7 +32,7 @@ function test200() {
 
 function test404() {
   var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-  xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug804395.jar!/foo.do_not_exist', true);
+  xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug804395.jar!/foo.do_not_exist', true);
   xhr.onreadystatechange = function() {
     if (xhr.readyState == 4) {
       ok(xhr.status == 404, "Non existing file must have Status 404!");
@@ -44,7 +44,7 @@ function test404() {
 
 function test0() {
   var xhr = new XMLHttpRequest({mozAnon: true, mozSystem: true});
-  xhr.open('GET', 'jar:http://example.org/tests/content/base/test/file_bug804395.jar!/foo.bar', true);
+  xhr.open('GET', 'jar:http://example.org/tests/dom/base/test/file_bug804395.jar!/foo.bar', true);
   ok(xhr.status == 0, "Not Sent request must have status 0");
   runTests();
 }
diff --git a/content/base/test/test_bug809003.html b/dom/base/test/test_bug809003.html
similarity index 100%
rename from content/base/test/test_bug809003.html
rename to dom/base/test/test_bug809003.html
diff --git a/content/base/test/test_bug810494.html b/dom/base/test/test_bug810494.html
similarity index 100%
rename from content/base/test/test_bug810494.html
rename to dom/base/test/test_bug810494.html
diff --git a/content/base/test/test_bug811701.html b/dom/base/test/test_bug811701.html
similarity index 100%
rename from content/base/test/test_bug811701.html
rename to dom/base/test/test_bug811701.html
diff --git a/content/base/test/test_bug811701.xhtml b/dom/base/test/test_bug811701.xhtml
similarity index 100%
rename from content/base/test/test_bug811701.xhtml
rename to dom/base/test/test_bug811701.xhtml
diff --git a/content/base/test/test_bug813919.html b/dom/base/test/test_bug813919.html
similarity index 100%
rename from content/base/test/test_bug813919.html
rename to dom/base/test/test_bug813919.html
diff --git a/content/base/test/test_bug814576.html b/dom/base/test/test_bug814576.html
similarity index 100%
rename from content/base/test/test_bug814576.html
rename to dom/base/test/test_bug814576.html
diff --git a/content/base/test/test_bug819051.html b/dom/base/test/test_bug819051.html
similarity index 95%
rename from content/base/test/test_bug819051.html
rename to dom/base/test/test_bug819051.html
index 21a9c8fc36d..bb4f152043c 100644
--- a/content/base/test/test_bug819051.html
+++ b/dom/base/test/test_bug819051.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=819051
 
 SimpleTest.waitForExplicitFinish();
 
-var url = "http://mochi.test:8888/tests/content/base/test/bug819051.sjs";
+var url = "http://mochi.test:8888/tests/dom/base/test/bug819051.sjs";
 
 function test_headers_append()
 {
diff --git a/content/base/test/test_bug820909.html b/dom/base/test/test_bug820909.html
similarity index 100%
rename from content/base/test/test_bug820909.html
rename to dom/base/test/test_bug820909.html
diff --git a/content/base/test/test_bug827160.html b/dom/base/test/test_bug827160.html
similarity index 100%
rename from content/base/test/test_bug827160.html
rename to dom/base/test/test_bug827160.html
diff --git a/content/base/test/test_bug840098.html b/dom/base/test/test_bug840098.html
similarity index 100%
rename from content/base/test/test_bug840098.html
rename to dom/base/test/test_bug840098.html
diff --git a/content/base/test/test_bug864595.html b/dom/base/test/test_bug864595.html
similarity index 100%
rename from content/base/test/test_bug864595.html
rename to dom/base/test/test_bug864595.html
diff --git a/content/base/test/test_bug868999.html b/dom/base/test/test_bug868999.html
similarity index 100%
rename from content/base/test/test_bug868999.html
rename to dom/base/test/test_bug868999.html
diff --git a/content/base/test/test_bug869000.html b/dom/base/test/test_bug869000.html
similarity index 100%
rename from content/base/test/test_bug869000.html
rename to dom/base/test/test_bug869000.html
diff --git a/content/base/test/test_bug869002.html b/dom/base/test/test_bug869002.html
similarity index 100%
rename from content/base/test/test_bug869002.html
rename to dom/base/test/test_bug869002.html
diff --git a/content/base/test/test_bug869006.html b/dom/base/test/test_bug869006.html
similarity index 100%
rename from content/base/test/test_bug869006.html
rename to dom/base/test/test_bug869006.html
diff --git a/content/base/test/test_bug876282.html b/dom/base/test/test_bug876282.html
similarity index 100%
rename from content/base/test/test_bug876282.html
rename to dom/base/test/test_bug876282.html
diff --git a/content/base/test/test_bug890580.html b/dom/base/test/test_bug890580.html
similarity index 100%
rename from content/base/test/test_bug890580.html
rename to dom/base/test/test_bug890580.html
diff --git a/content/base/test/test_bug891952.html b/dom/base/test/test_bug891952.html
similarity index 100%
rename from content/base/test/test_bug891952.html
rename to dom/base/test/test_bug891952.html
diff --git a/content/base/test/test_bug894874.html b/dom/base/test/test_bug894874.html
similarity index 100%
rename from content/base/test/test_bug894874.html
rename to dom/base/test/test_bug894874.html
diff --git a/content/base/test/test_bug895239.html b/dom/base/test/test_bug895239.html
similarity index 100%
rename from content/base/test/test_bug895239.html
rename to dom/base/test/test_bug895239.html
diff --git a/content/base/test/test_bug895974.html b/dom/base/test/test_bug895974.html
similarity index 100%
rename from content/base/test/test_bug895974.html
rename to dom/base/test/test_bug895974.html
diff --git a/content/base/test/test_bug902847.html b/dom/base/test/test_bug902847.html
similarity index 100%
rename from content/base/test/test_bug902847.html
rename to dom/base/test/test_bug902847.html
diff --git a/content/base/test/test_bug907892.html b/dom/base/test/test_bug907892.html
similarity index 88%
rename from content/base/test/test_bug907892.html
rename to dom/base/test/test_bug907892.html
index 5aecc7e372f..a62cf90a176 100644
--- a/content/base/test/test_bug907892.html
+++ b/dom/base/test/test_bug907892.html
@@ -37,10 +37,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=907892
 <!-- Set all the sandbox flags to "allow" to make sure we cover that case -->
 <iframe
    sandbox="allow-same-origin allow-scripts allow-forms allow-top-navigation alllow-pointer-lock"
-   src="http://test1.example.org/tests/content/base/test/file_bug907892.html?sandboxed">
+   src="http://test1.example.org/tests/dom/base/test/file_bug907892.html?sandboxed">
 </iframe>
 <iframe
-   src="http://test1.example.org/tests/content/base/test/file_bug907892.html?normal">
+   src="http://test1.example.org/tests/dom/base/test/file_bug907892.html?normal">
 </iframe>
 </div>
 <pre id="test">
diff --git a/content/base/test/test_bug922681.html b/dom/base/test/test_bug922681.html
similarity index 100%
rename from content/base/test/test_bug922681.html
rename to dom/base/test/test_bug922681.html
diff --git a/content/base/test/test_bug927196.html b/dom/base/test/test_bug927196.html
similarity index 100%
rename from content/base/test/test_bug927196.html
rename to dom/base/test/test_bug927196.html
diff --git a/content/base/test/test_bug945152.html b/dom/base/test/test_bug945152.html
similarity index 100%
rename from content/base/test/test_bug945152.html
rename to dom/base/test/test_bug945152.html
diff --git a/content/base/test/test_bug982153.html b/dom/base/test/test_bug982153.html
similarity index 100%
rename from content/base/test/test_bug982153.html
rename to dom/base/test/test_bug982153.html
diff --git a/content/base/test/test_caretPositionFromPoint.html b/dom/base/test/test_caretPositionFromPoint.html
similarity index 100%
rename from content/base/test/test_caretPositionFromPoint.html
rename to dom/base/test/test_caretPositionFromPoint.html
diff --git a/content/base/test/test_child_process_shutdown_message.html b/dom/base/test/test_child_process_shutdown_message.html
similarity index 100%
rename from content/base/test/test_child_process_shutdown_message.html
rename to dom/base/test/test_child_process_shutdown_message.html
diff --git a/content/base/test/test_classList.html b/dom/base/test/test_classList.html
similarity index 100%
rename from content/base/test/test_classList.html
rename to dom/base/test/test_classList.html
diff --git a/content/base/test/test_copyimage.html b/dom/base/test/test_copyimage.html
similarity index 100%
rename from content/base/test/test_copyimage.html
rename to dom/base/test/test_copyimage.html
diff --git a/content/base/test/test_copypaste.html b/dom/base/test/test_copypaste.html
similarity index 100%
rename from content/base/test/test_copypaste.html
rename to dom/base/test/test_copypaste.html
diff --git a/content/base/test/test_copypaste.xhtml b/dom/base/test/test_copypaste.xhtml
similarity index 100%
rename from content/base/test/test_copypaste.xhtml
rename to dom/base/test/test_copypaste.xhtml
diff --git a/content/base/test/test_copypaste.xul b/dom/base/test/test_copypaste.xul
similarity index 100%
rename from content/base/test/test_copypaste.xul
rename to dom/base/test/test_copypaste.xul
diff --git a/content/base/test/test_createHTMLDocument.html b/dom/base/test/test_createHTMLDocument.html
similarity index 100%
rename from content/base/test/test_createHTMLDocument.html
rename to dom/base/test/test_createHTMLDocument.html
diff --git a/content/base/test/test_declare_stylesheet_obsolete.html b/dom/base/test/test_declare_stylesheet_obsolete.html
similarity index 100%
rename from content/base/test/test_declare_stylesheet_obsolete.html
rename to dom/base/test/test_declare_stylesheet_obsolete.html
diff --git a/content/base/test/test_document_constructor.html b/dom/base/test/test_document_constructor.html
similarity index 100%
rename from content/base/test/test_document_constructor.html
rename to dom/base/test/test_document_constructor.html
diff --git a/content/base/test/test_domparser_null_char.html b/dom/base/test/test_domparser_null_char.html
similarity index 100%
rename from content/base/test/test_domparser_null_char.html
rename to dom/base/test/test_domparser_null_char.html
diff --git a/content/base/test/test_domparsing.html b/dom/base/test/test_domparsing.html
similarity index 100%
rename from content/base/test/test_domparsing.html
rename to dom/base/test/test_domparsing.html
diff --git a/content/base/test/test_element.matches.html b/dom/base/test/test_element.matches.html
similarity index 100%
rename from content/base/test/test_element.matches.html
rename to dom/base/test/test_element.matches.html
diff --git a/content/base/test/test_elementTraversal.html b/dom/base/test/test_elementTraversal.html
similarity index 100%
rename from content/base/test/test_elementTraversal.html
rename to dom/base/test/test_elementTraversal.html
diff --git a/content/base/test/test_element_closest.html b/dom/base/test/test_element_closest.html
similarity index 100%
rename from content/base/test/test_element_closest.html
rename to dom/base/test/test_element_closest.html
diff --git a/content/base/test/test_encodeToStringWithMaxLength.html b/dom/base/test/test_encodeToStringWithMaxLength.html
similarity index 100%
rename from content/base/test/test_encodeToStringWithMaxLength.html
rename to dom/base/test/test_encodeToStringWithMaxLength.html
diff --git a/content/base/test/test_file_from_blob.html b/dom/base/test/test_file_from_blob.html
similarity index 100%
rename from content/base/test/test_file_from_blob.html
rename to dom/base/test/test_file_from_blob.html
diff --git a/content/base/test/test_fileapi.html b/dom/base/test/test_fileapi.html
similarity index 100%
rename from content/base/test/test_fileapi.html
rename to dom/base/test/test_fileapi.html
diff --git a/content/base/test/test_fileapi_slice.html b/dom/base/test/test_fileapi_slice.html
similarity index 100%
rename from content/base/test/test_fileapi_slice.html
rename to dom/base/test/test_fileapi_slice.html
diff --git a/content/base/test/test_getElementById.html b/dom/base/test/test_getElementById.html
similarity index 100%
rename from content/base/test/test_getElementById.html
rename to dom/base/test/test_getElementById.html
diff --git a/content/base/test/test_html_colors_quirks.html b/dom/base/test/test_html_colors_quirks.html
similarity index 100%
rename from content/base/test/test_html_colors_quirks.html
rename to dom/base/test/test_html_colors_quirks.html
diff --git a/content/base/test/test_html_colors_standards.html b/dom/base/test/test_html_colors_standards.html
similarity index 100%
rename from content/base/test/test_html_colors_standards.html
rename to dom/base/test/test_html_colors_standards.html
diff --git a/content/base/test/test_html_in_xhr.html b/dom/base/test/test_html_in_xhr.html
similarity index 100%
rename from content/base/test/test_html_in_xhr.html
rename to dom/base/test/test_html_in_xhr.html
diff --git a/content/base/test/test_htmlcopyencoder.html b/dom/base/test/test_htmlcopyencoder.html
similarity index 100%
rename from content/base/test/test_htmlcopyencoder.html
rename to dom/base/test/test_htmlcopyencoder.html
diff --git a/content/base/test/test_htmlcopyencoder.xhtml b/dom/base/test/test_htmlcopyencoder.xhtml
similarity index 100%
rename from content/base/test/test_htmlcopyencoder.xhtml
rename to dom/base/test/test_htmlcopyencoder.xhtml
diff --git a/content/base/test/test_ipc_messagemanager_blob.html b/dom/base/test/test_ipc_messagemanager_blob.html
similarity index 100%
rename from content/base/test/test_ipc_messagemanager_blob.html
rename to dom/base/test/test_ipc_messagemanager_blob.html
diff --git a/content/base/test/test_messagemanager_assertpermission.html b/dom/base/test/test_messagemanager_assertpermission.html
similarity index 100%
rename from content/base/test/test_messagemanager_assertpermission.html
rename to dom/base/test/test_messagemanager_assertpermission.html
diff --git a/content/base/test/test_messagemanager_principal.html b/dom/base/test/test_messagemanager_principal.html
similarity index 100%
rename from content/base/test/test_messagemanager_principal.html
rename to dom/base/test/test_messagemanager_principal.html
diff --git a/content/base/test/test_messagemanager_send_principal.html b/dom/base/test/test_messagemanager_send_principal.html
similarity index 100%
rename from content/base/test/test_messagemanager_send_principal.html
rename to dom/base/test/test_messagemanager_send_principal.html
diff --git a/content/base/test/test_meta_viewport0.html b/dom/base/test/test_meta_viewport0.html
similarity index 100%
rename from content/base/test/test_meta_viewport0.html
rename to dom/base/test/test_meta_viewport0.html
diff --git a/content/base/test/test_meta_viewport1.html b/dom/base/test/test_meta_viewport1.html
similarity index 100%
rename from content/base/test/test_meta_viewport1.html
rename to dom/base/test/test_meta_viewport1.html
diff --git a/content/base/test/test_meta_viewport2.html b/dom/base/test/test_meta_viewport2.html
similarity index 100%
rename from content/base/test/test_meta_viewport2.html
rename to dom/base/test/test_meta_viewport2.html
diff --git a/content/base/test/test_meta_viewport3.html b/dom/base/test/test_meta_viewport3.html
similarity index 100%
rename from content/base/test/test_meta_viewport3.html
rename to dom/base/test/test_meta_viewport3.html
diff --git a/content/base/test/test_meta_viewport4.html b/dom/base/test/test_meta_viewport4.html
similarity index 100%
rename from content/base/test/test_meta_viewport4.html
rename to dom/base/test/test_meta_viewport4.html
diff --git a/content/base/test/test_meta_viewport5.html b/dom/base/test/test_meta_viewport5.html
similarity index 100%
rename from content/base/test/test_meta_viewport5.html
rename to dom/base/test/test_meta_viewport5.html
diff --git a/content/base/test/test_meta_viewport6.html b/dom/base/test/test_meta_viewport6.html
similarity index 100%
rename from content/base/test/test_meta_viewport6.html
rename to dom/base/test/test_meta_viewport6.html
diff --git a/content/base/test/test_mixed_content_blocker.html b/dom/base/test/test_mixed_content_blocker.html
similarity index 98%
rename from content/base/test/test_mixed_content_blocker.html
rename to dom/base/test/test_mixed_content_blocker.html
index e523c2377cb..0119326426e 100644
--- a/content/base/test/test_mixed_content_blocker.html
+++ b/dom/base/test/test_mixed_content_blocker.html
@@ -62,7 +62,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=62178
   }
 
   function reloadFrame() {
-    document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/content/base/test/file_mixed_content_main.html"></iframe>';
+    document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/base/test/file_mixed_content_main.html"></iframe>';
   }
 
   function checkTestsCompleted() {
diff --git a/content/base/test/test_mixed_content_blocker_bug803225.html b/dom/base/test/test_mixed_content_blocker_bug803225.html
similarity index 95%
rename from content/base/test/test_mixed_content_blocker_bug803225.html
rename to dom/base/test/test_mixed_content_blocker_bug803225.html
index 683338c1d09..677324e10ea 100644
--- a/content/base/test/test_mixed_content_blocker_bug803225.html
+++ b/dom/base/test/test_mixed_content_blocker_bug803225.html
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
       changePrefs(counter);
       counter++;
       log("\nblockDisplay set to "+blockDisplay+", blockActive set to "+blockActive+".");
-      document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/content/base/test/file_mixed_content_main_bug803225.html"></iframe>';
+      document.getElementById('framediv').innerHTML = '<iframe id="testHarness" src="https://example.com/tests/dom/base/test/file_mixed_content_main_bug803225.html"></iframe>';
     }
     else {
       //set the prefs back to what they were set to originally
@@ -141,7 +141,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=803225
 
 <body>
   <div id="framediv">
-    <iframe id="testHarness" src="https://example.com/tests/content/base/test/file_mixed_content_main_bug803225.html"></iframe>
+    <iframe id="testHarness" src="https://example.com/tests/dom/base/test/file_mixed_content_main_bug803225.html"></iframe>
   </div>
   <pre id="log"></pre>
 </body>
diff --git a/content/base/test/test_mixed_content_blocker_frameNavigation.html b/dom/base/test/test_mixed_content_blocker_frameNavigation.html
similarity index 92%
rename from content/base/test/test_mixed_content_blocker_frameNavigation.html
rename to dom/base/test/test_mixed_content_blocker_frameNavigation.html
index f35ad06d62f..52638ddc053 100644
--- a/content/base/test/test_mixed_content_blocker_frameNavigation.html
+++ b/dom/base/test/test_mixed_content_blocker_frameNavigation.html
@@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
     // If we are here, all the insecure tests have run.
     // If we haven't changed the iframe to run the secure tests, change it now.
     if (!secureTestsStarted) {
-      document.getElementById('testing_frame').src = "https://example.com/tests/content/base/test/file_mixed_content_frameNavigation_secure.html";
+      document.getElementById('testing_frame').src = "https://example.com/tests/dom/base/test/file_mixed_content_frameNavigation_secure.html";
       secureTestsStarted = true;
     }
     for (var prop in testsToRunSecure) {
@@ -64,7 +64,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
       blockActive = SpecialPowers.getBoolPref("security.mixed_content.block_active_content");
       log("blockActive set to "+blockActive+".");
       secureTestsStarted = false;
-      document.getElementById('framediv').innerHTML = '<iframe src="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>';
+      document.getElementById('framediv').innerHTML = '<iframe src="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>';
     }
     else {
       //set the prefs back to what they were set to originally
@@ -119,7 +119,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388
 
 <body>
   <div id="framediv">
-    <iframe src="http://example.com/tests/content/base/test/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>
+    <iframe src="http://example.com/tests/dom/base/test/file_mixed_content_frameNavigation.html" id="testing_frame"></iframe>
   </div>
 
   <pre id="log"></pre>
diff --git a/content/base/test/test_mozMatchesSelector.html b/dom/base/test/test_mozMatchesSelector.html
similarity index 100%
rename from content/base/test/test_mozMatchesSelector.html
rename to dom/base/test/test_mozMatchesSelector.html
diff --git a/content/base/test/test_mozfiledataurl.html b/dom/base/test/test_mozfiledataurl.html
similarity index 98%
rename from content/base/test/test_mozfiledataurl.html
rename to dom/base/test/test_mozfiledataurl.html
index d2d728078b6..d9988d98394 100644
--- a/content/base/test/test_mozfiledataurl.html
+++ b/dom/base/test/test_mozfiledataurl.html
@@ -29,7 +29,7 @@ window.addEventListener("message", function(e) {
 }, false);
 
 const innerSameSiteURI = "file_mozfiledataurl_inner.html";
-const innerCrossSiteURI = "http://example.com/tests/content/base/test/file_mozfiledataurl_inner.html"
+const innerCrossSiteURI = "http://example.com/tests/dom/base/test/file_mozfiledataurl_inner.html"
 
 gen = runTest();
 SimpleTest.waitForExplicitFinish();
diff --git a/content/base/test/test_mutationobservers.html b/dom/base/test/test_mutationobservers.html
similarity index 100%
rename from content/base/test/test_mutationobservers.html
rename to dom/base/test/test_mutationobservers.html
diff --git a/content/base/test/test_nodelist_holes.html b/dom/base/test/test_nodelist_holes.html
similarity index 100%
rename from content/base/test/test_nodelist_holes.html
rename to dom/base/test/test_nodelist_holes.html
diff --git a/content/base/test/test_object.html b/dom/base/test/test_object.html
similarity index 100%
rename from content/base/test/test_object.html
rename to dom/base/test/test_object.html
diff --git a/content/base/test/test_plugin_freezing.html b/dom/base/test/test_plugin_freezing.html
similarity index 100%
rename from content/base/test/test_plugin_freezing.html
rename to dom/base/test/test_plugin_freezing.html
diff --git a/content/base/test/test_processing_instruction_update_stylesheet.xhtml b/dom/base/test/test_processing_instruction_update_stylesheet.xhtml
similarity index 100%
rename from content/base/test/test_processing_instruction_update_stylesheet.xhtml
rename to dom/base/test/test_processing_instruction_update_stylesheet.xhtml
diff --git a/content/base/test/test_progress_events_for_gzip_data.html b/dom/base/test/test_progress_events_for_gzip_data.html
similarity index 100%
rename from content/base/test/test_progress_events_for_gzip_data.html
rename to dom/base/test/test_progress_events_for_gzip_data.html
diff --git a/content/base/test/test_range_bounds.html b/dom/base/test/test_range_bounds.html
similarity index 100%
rename from content/base/test/test_range_bounds.html
rename to dom/base/test/test_range_bounds.html
diff --git a/content/base/test/test_reentrant_flush.html b/dom/base/test/test_reentrant_flush.html
similarity index 100%
rename from content/base/test/test_reentrant_flush.html
rename to dom/base/test/test_reentrant_flush.html
diff --git a/content/base/test/test_sync_xhr_timer.xhtml b/dom/base/test/test_sync_xhr_timer.xhtml
similarity index 100%
rename from content/base/test/test_sync_xhr_timer.xhtml
rename to dom/base/test/test_sync_xhr_timer.xhtml
diff --git a/content/base/test/test_text_wholeText.html b/dom/base/test/test_text_wholeText.html
similarity index 100%
rename from content/base/test/test_text_wholeText.html
rename to dom/base/test/test_text_wholeText.html
diff --git a/content/base/test/test_textnode_normalize_in_selection.html b/dom/base/test/test_textnode_normalize_in_selection.html
similarity index 100%
rename from content/base/test/test_textnode_normalize_in_selection.html
rename to dom/base/test/test_textnode_normalize_in_selection.html
diff --git a/content/base/test/test_textnode_split_in_selection.html b/dom/base/test/test_textnode_split_in_selection.html
similarity index 100%
rename from content/base/test/test_textnode_split_in_selection.html
rename to dom/base/test/test_textnode_split_in_selection.html
diff --git a/content/base/test/test_title.html b/dom/base/test/test_title.html
similarity index 100%
rename from content/base/test/test_title.html
rename to dom/base/test/test_title.html
diff --git a/content/base/test/test_treewalker_nextsibling.xml b/dom/base/test/test_treewalker_nextsibling.xml
similarity index 100%
rename from content/base/test/test_treewalker_nextsibling.xml
rename to dom/base/test/test_treewalker_nextsibling.xml
diff --git a/content/base/test/test_user_select.html b/dom/base/test/test_user_select.html
similarity index 100%
rename from content/base/test/test_user_select.html
rename to dom/base/test/test_user_select.html
diff --git a/content/base/test/test_viewport_scroll.html b/dom/base/test/test_viewport_scroll.html
similarity index 100%
rename from content/base/test/test_viewport_scroll.html
rename to dom/base/test/test_viewport_scroll.html
diff --git a/content/base/test/test_viewsource_forbidden_in_object.html b/dom/base/test/test_viewsource_forbidden_in_object.html
similarity index 100%
rename from content/base/test/test_viewsource_forbidden_in_object.html
rename to dom/base/test/test_viewsource_forbidden_in_object.html
diff --git a/content/base/test/test_w3element_traversal.html b/dom/base/test/test_w3element_traversal.html
similarity index 100%
rename from content/base/test/test_w3element_traversal.html
rename to dom/base/test/test_w3element_traversal.html
diff --git a/content/base/test/test_w3element_traversal.xhtml b/dom/base/test/test_w3element_traversal.xhtml
similarity index 100%
rename from content/base/test/test_w3element_traversal.xhtml
rename to dom/base/test/test_w3element_traversal.xhtml
diff --git a/content/base/test/test_w3element_traversal_svg.html b/dom/base/test/test_w3element_traversal_svg.html
similarity index 100%
rename from content/base/test/test_w3element_traversal_svg.html
rename to dom/base/test/test_w3element_traversal_svg.html
diff --git a/content/base/test/test_warning_for_blocked_cross_site_request.html b/dom/base/test/test_warning_for_blocked_cross_site_request.html
similarity index 90%
rename from content/base/test/test_warning_for_blocked_cross_site_request.html
rename to dom/base/test/test_warning_for_blocked_cross_site_request.html
index 6dd40429fe4..50e470dfcd8 100644
--- a/content/base/test/test_warning_for_blocked_cross_site_request.html
+++ b/dom/base/test/test_warning_for_blocked_cross_site_request.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=713980
   <style>
     @font-face {
       font-family: "bad_cross_origin_webfont";
-      src: url('http://example.org/tests/content/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
+      src: url('http://example.org/tests/dom/base/test/csp/file_CSP.sjs?testid=font_bad&type=application/octet-stream');
     }
     div#bad_webfont { font-family: "bad_cross_origin_webfont"; }
   </style>
@@ -76,7 +76,7 @@ function cleanup() {
 
 // Send a cross-origin XHR request without CORS
 var xhr = new XMLHttpRequest();
-xhr.open("GET", "http://example.org/tests/content/base/test/file_CrossSiteXHR_server.sjs?allowOrigin=http://invalid", true);
+xhr.open("GET", "http://example.org/tests/dom/base/test/file_CrossSiteXHR_server.sjs?allowOrigin=http://invalid", true);
 xhr.send(null);
 
 // Create a div that triggers a cross-origin webfont request
diff --git a/content/base/test/test_websocket.html b/dom/base/test/test_websocket.html
similarity index 86%
rename from content/base/test/test_websocket.html
rename to dom/base/test/test_websocket.html
index c131b1ba52a..1a79c5d8609 100644
--- a/content/base/test/test_websocket.html
+++ b/dom/base/test/test_websocket.html
@@ -212,7 +212,7 @@ doTest.timeoutId = null;
 function test1()
 {
   try {
-    var ws = CreateTestWS("http://mochi.test:8888/tests/content/base/test/file_websocket");
+    var ws = CreateTestWS("http://mochi.test:8888/tests/dom/base/test/file_websocket");
     ok(false, "test1 failed");
   }
   catch (e) {
@@ -233,9 +233,9 @@ function test2()
   waitTest2Part1 = true;
   waitTest2Part2 = true;
 
-  var ws1 = CreateTestWS("ws://sub2.test2.example.com/tests/content/base/test/file_websocket", "test-2.1");
+  var ws1 = CreateTestWS("ws://sub2.test2.example.com/tests/dom/base/test/file_websocket", "test-2.1");
   current_test--; // CreateTestWS incremented this
-  var ws2 = CreateTestWS("ws://sub2.test2.example.com/tests/content/base/test/file_websocket", "test-2.2");
+  var ws2 = CreateTestWS("ws://sub2.test2.example.com/tests/dom/base/test/file_websocket", "test-2.2");
 
   var ws2CanConnect = false;
 
@@ -303,7 +303,7 @@ function test4()
 function test5()
 {
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "");
     ok(false, "couldn't accept an empty string in the protocol parameter");
   }
   catch (e) {
@@ -311,7 +311,7 @@ function test5()
   }
   current_test--; // CreateTestWS incremented this
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "\n");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "\n");
     ok(false, "couldn't accept any not printable ASCII character in the protocol parameter");
   }
   catch (e) {
@@ -319,7 +319,7 @@ function test5()
   }
   current_test--; // CreateTestWS incremented this
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 5");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test 5");
     ok(false, "U+0020 not acceptable in protocol parameter");
   }
   catch (e) {
@@ -330,7 +330,7 @@ function test5()
 
 function test6()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-6");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-6");
   var counter = 1;
   ws.onopen = function()
   {
@@ -356,7 +356,7 @@ function test6()
 
 function test7()
 {
-  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/content/base/test/file_websocket", "test-7");
+  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/dom/base/test/file_websocket", "test-7");
   var gotmsg = false;
 
   ws.onopen = function()
@@ -380,7 +380,7 @@ function test7()
 
 function test8()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-8");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-8");
   ws.onopen = function()
   {
     ok(ws.protocol == "test-8", "test-8 subprotocol selection");
@@ -403,7 +403,7 @@ function test9()
 {
   waitTest9 = true;
 
-  var ws = CreateTestWS("ws://test2.example.org/tests/content/base/test/file_websocket", "test-9");
+  var ws = CreateTestWS("ws://test2.example.org/tests/dom/base/test/file_websocket", "test-9");
   ws._receivedErrorEvent = false;
   ws.onopen = shouldNotOpen;
   ws.onerror = function(e)
@@ -430,7 +430,7 @@ function test10()
 {
   waitTest10 = true;
 
-  var ws = CreateTestWS("ws://sub1.test1.example.com/tests/content/base/test/file_websocket", "test-10");
+  var ws = CreateTestWS("ws://sub1.test1.example.com/tests/dom/base/test/file_websocket", "test-10");
   ws.onclose = function(e)
   {
     shouldCloseCleanly(e);
@@ -457,7 +457,7 @@ function test10()
 
 function test11()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-11");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-11");
   ok(ws.readyState == 0, "create bad readyState in test-11!");
   ws.onopen = function()
   {
@@ -485,7 +485,7 @@ function test11()
 
 function test12()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-12");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-12");
   ws.onopen = function()
   {
     try {
@@ -524,7 +524,7 @@ function test13()
     // protocol stack typically closes down after reporting a protocol level error - trying
     // to resync is too dangerous
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-13");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-13");
   ws._timesCalledOnError = 0;
   ws.onerror = function()
   {
@@ -539,7 +539,7 @@ function test13()
 
 function test14()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-14");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-14");
   ws.onmessage = function()
   {
     ok(false, "shouldn't received message after the server sent the close frame");
@@ -557,7 +557,7 @@ function test14()
  *
 function test15()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-15");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-15");
   ws.onclose = function(e)
   {
     shouldCloseNotCleanly(e);
@@ -574,7 +574,7 @@ function test15()
 
 function test16()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-16");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-16");
   ws.onopen = function()
   {
     ws.close();
@@ -602,7 +602,7 @@ var test17func = function()
 {
   waitTest17 = true;
 
-  var local_ws = new WebSocket("ws://sub1.test2.example.org/tests/content/base/test/file_websocket", "test-17");
+  var local_ws = new WebSocket("ws://sub1.test2.example.org/tests/dom/base/test/file_websocket", "test-17");
   local_ws._testNumber = "local17";
   local_ws._testNumber = current_test++;
 
@@ -658,7 +658,7 @@ function test17()
 
 function test18()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket_http_resource.txt");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket_http_resource.txt");
   ws.onopen = shouldNotOpen;
   ws.onerror = ignoreError;
   ws.onclose = function(e)
@@ -670,7 +670,7 @@ function test18()
 
 function test19()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-19");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-19");
   ws.onopen = shouldNotOpen;
   ws.onerror = ignoreError;
   ws.onclose = function(e)
@@ -686,7 +686,7 @@ var test20func = function()
 {
   waitTest20 = true;
 
-  var local_ws = new WebSocket("ws://sub1.test1.example.org/tests/content/base/test/file_websocket", "test-20");
+  var local_ws = new WebSocket("ws://sub1.test1.example.org/tests/dom/base/test/file_websocket", "test-20");
   local_ws._testNumber = "local20";
   local_ws._testNumber = current_test++;
 
@@ -722,7 +722,7 @@ test21func = function()
 {
   waitTest21 = true;
 
-  var local_ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-21");
+  var local_ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-21");
   local_ws._testNumber = current_test++;
   var received_message = false;
 
@@ -779,7 +779,7 @@ function test22()
   const pref_open = "network.websocket.timeout.open";
   SpecialPowers.setIntPref(pref_open, 5);
 
-  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/content/base/test/file_websocket", "test-22");
+  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/dom/base/test/file_websocket", "test-22");
   ws.onopen = shouldNotOpen;
   ws.onerror = ignoreError;
   ws.onclose = function(e)
@@ -802,7 +802,7 @@ function test23()
 
 function test24()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-does-not-exist");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-does-not-exist");
   ws.onopen = shouldNotOpen;
   ws.onclose = function(e)
   {
@@ -818,7 +818,7 @@ function test25()
 {
   var prots=[];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   // This test errors because the server requires a sub-protocol, but
   // the test just wants to ensure that the ctor doesn't generate an
@@ -839,7 +839,7 @@ function test26()
   var prots=[""];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing empty element sub protocol array");
   }
   catch (e) {
@@ -853,7 +853,7 @@ function test27()
   var prots=["test27", ""];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing empty element mixed sub protocol array");
   }
   catch (e) {
@@ -866,7 +866,7 @@ function test28()
 {
   var prots=["test28"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 28 protocol array open");
@@ -885,7 +885,7 @@ function test29()
 {
   var prots=["test29a", "test29b"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 29 protocol array open");
@@ -902,7 +902,7 @@ function test29()
 function test30()
 {
   var prots=["test-does-not-exist"];
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   ws.onopen = shouldNotOpen;
   ws.onclose = function(e)
@@ -918,7 +918,7 @@ function test30()
 function test31()
 {
   var prots=["test-does-not-exist", "test31"];
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   ws.onopen = function(e)
   {
@@ -939,7 +939,7 @@ function test32()
   var prots=["test32","test32"];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing duplicated element sub protocol array");
   }
   catch (e) {
@@ -952,7 +952,7 @@ function test33()
 {
   var prots=["test33"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 33 open");
@@ -973,7 +973,7 @@ function test34()
 {
   var prots=["test-34"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 34 open");
@@ -992,7 +992,7 @@ function test34()
 
 function test35()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-35a");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-35a");
 
   ws.onopen = function(e)
   {
@@ -1005,7 +1005,7 @@ function test35()
     ok(true, "test 35a close");
     ok(e.wasClean, "test 35a closed cleanly");
     current_test--; // CreateTestWS for 35a incremented this
-    var wsb = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-35b");
+    var wsb = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-35b");
 
   wsb.onopen = function(e)
   {
@@ -1028,7 +1028,7 @@ function test36()
 {
   var prots=["test-36"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 36 open");
@@ -1055,7 +1055,7 @@ function test37()
 {
   var prots=["test-37"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 37 open");
@@ -1076,7 +1076,7 @@ function test37()
     ok(e.wasClean, "test 37 closed cleanly");
 
     current_test--; // CreateTestWS for 37 incremented this
-    var wsb = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-37b");
+    var wsb = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-37b");
 
     wsb.onopen = function(e)
     {
@@ -1098,7 +1098,7 @@ function test37()
       ok(e.wasClean, "test 37b closed cleanly");
 
       current_test--; // CreateTestWS for 37 incremented this
-      var wsc = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-37c");
+      var wsc = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-37c");
 
       wsc.onopen = function(e)
       {
@@ -1120,7 +1120,7 @@ function test38()
 {
   var prots=["test-38"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 38 open");
@@ -1140,7 +1140,7 @@ function test39()
 {
   var prots=["test-39"];
 
-  var ws = CreateTestWS("wss://example.com/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("wss://example.com/tests/dom/base/test/file_websocket", prots);
   status_test39 = "started";
   ws.onopen = function(e)
   {
@@ -1161,7 +1161,7 @@ function test40()
 {
   var prots=["test-40"];
 
-  var ws = CreateTestWS("wss://nocert.example.com/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("wss://nocert.example.com/tests/dom/base/test/file_websocket", prots);
 
   status_test40 = "started";
   ws.onerror = ignoreError;
@@ -1183,12 +1183,12 @@ function test40()
 
 function test41()
 {
-  var ws = CreateTestWS("ws://example.com/tests/content/base/test/file_websocket", "test-41a", 1);
+  var ws = CreateTestWS("ws://example.com/tests/dom/base/test/file_websocket", "test-41a", 1);
 
   ws.onopen = function(e)
   {
     ok(true, "test 41a open");
-    ok(ws.url == "ws://example.com/tests/content/base/test/file_websocket",
+    ok(ws.url == "ws://example.com/tests/dom/base/test/file_websocket",
        "test 41a initial ws should not be redirected");
     ws.close();
   };
@@ -1198,7 +1198,7 @@ function test41()
     ok(true, "test 41a close");
 
     // establish a hsts policy for example.com
-    var wsb = CreateTestWS("wss://example.com/tests/content/base/test/file_websocket", "test-41b", 1);
+    var wsb = CreateTestWS("wss://example.com/tests/dom/base/test/file_websocket", "test-41b", 1);
     wsb.onopen = function(e)
     {
       ok(true, "test 41b open");
@@ -1210,12 +1210,12 @@ function test41()
       ok(true, "test 41b close");
 
       // try ws:// again, it should be done over wss:// now due to hsts
-      var wsc = CreateTestWS("ws://example.com/tests/content/base/test/file_websocket", "test-41c");
+      var wsc = CreateTestWS("ws://example.com/tests/dom/base/test/file_websocket", "test-41c");
    
       wsc.onopen = function(e)
       {
         ok(true, "test 41c open");
-        ok(wsc.url == "wss://example.com/tests/content/base/test/file_websocket",
+        ok(wsc.url == "wss://example.com/tests/dom/base/test/file_websocket",
            "test 41c ws should be redirected by hsts to wss");
         wsc.close();
       }
@@ -1248,7 +1248,7 @@ function test42()
 {
 // test some utf-8 non-characters. They should be allowed in the
 // websockets context. Test via round trip echo.
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-42");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-42");
   var data = ["U+FFFE \ufffe",
 		"U+FFFF \uffff",
 		"U+10FFFF \udbff\udfff"];
@@ -1279,7 +1279,7 @@ function test43()
 {
   var prots=["test-43"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 43 open");
@@ -1307,7 +1307,7 @@ function test43()
 
 function test44()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-44");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-44");
   ok(ws.readyState == 0, "bad readyState in test-44!");
   ws.binaryType = "arraybuffer";
   ws.onopen = function()
@@ -1361,7 +1361,7 @@ function test45()
 {
   var blobFile = createDOMFile("testBlobFile", "flob");
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-45");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-45");
   ok(ws.readyState == 0, "bad readyState in test-45!");
 
 //  ws.binaryType = "blob";  // Don't need to specify: blob is the default
@@ -1409,7 +1409,7 @@ function test45()
 
 function test46()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-46");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-46");
   ok(ws.readyState == 0, "create bad readyState in test-46!");
   ws.onopen = function()
   {
diff --git a/content/base/test/test_websocket_basic.html b/dom/base/test/test_websocket_basic.html
similarity index 98%
rename from content/base/test/test_websocket_basic.html
rename to dom/base/test/test_websocket_basic.html
index d3458f9eb72..e3269382e68 100644
--- a/content/base/test/test_websocket_basic.html
+++ b/dom/base/test/test_websocket_basic.html
@@ -14,7 +14,7 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-const kUrl = "ws://mochi.test:8888/tests/content/base/test/file_websocket_basic";
+const kUrl = "ws://mochi.test:8888/tests/dom/base/test/file_websocket_basic";
 
 var gTestElement;
 var ws;
@@ -37,7 +37,7 @@ function testWebSocket1() {
   gTestElement.textContent = "Running testWebSocket1()";
 
   var results = ["test",
-                 "/tests/content/base/test/file_websocket_basic",
+                 "/tests/dom/base/test/file_websocket_basic",
                  "http://mochi.test:8888",
                  "end"];
 
diff --git a/content/base/test/test_websocket_hello.html b/dom/base/test/test_websocket_hello.html
similarity index 91%
rename from content/base/test/test_websocket_hello.html
rename to dom/base/test/test_websocket_hello.html
index 41c3bab5114..c1874ab985d 100644
--- a/content/base/test/test_websocket_hello.html
+++ b/dom/base/test/test_websocket_hello.html
@@ -18,7 +18,7 @@
 var ws;
 
 function testWebSocket () {
-  ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket_hello");
+  ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
   ws.onopen = function(e) {
     ws.send("data");
   }
diff --git a/content/base/test/test_x-frame-options.html b/dom/base/test/test_x-frame-options.html
similarity index 96%
rename from content/base/test/test_x-frame-options.html
rename to dom/base/test/test_x-frame-options.html
index d56501402c3..c899349b5bf 100644
--- a/content/base/test/test_x-frame-options.html
+++ b/dom/base/test/test_x-frame-options.html
@@ -46,7 +46,7 @@ examiner.prototype  = {
 
 window.examiner = new examiner();
 
-var path = "/tests/content/base/test/";
+var path = "/tests/dom/base/test/";
 
 var testFramesLoaded = function() {
   var harness = SpecialPowers.wrap(document).getElementById("harness");
@@ -146,7 +146,7 @@ var testFramesLoaded = function() {
 // test that a document can be framed under a javascript: URL opened by the
 // same site as the frame
 var testFrameInJSURI = function() {
-  var html = '<iframe id="sameorigin3" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin3&xfo=sameorigin"></iframe>';
+  var html = '<iframe id="sameorigin3" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin3&xfo=sameorigin"></iframe>';
   var win = window.open();
   win.onload = function() {
     var test = win.document.getElementById("sameorigin3")
@@ -163,7 +163,7 @@ var testFrameInJSURI = function() {
 // test that a document can be framed under a data: URL opened by the
 // same site as the frame
 var testFrameInDataURI = function() {
-  var html = '<iframe id="sameorigin4" src="http://mochi.test:8888/tests/content/base/test/file_x-frame-options_page.sjs?testid=sameorigin4&xfo=sameorigin"></iframe>';
+  var html = '<iframe id="sameorigin4" src="http://mochi.test:8888/tests/dom/base/test/file_x-frame-options_page.sjs?testid=sameorigin4&xfo=sameorigin"></iframe>';
   var win = window.open();
   win.onload = function() {
     var test = win.document.getElementById("sameorigin4")
diff --git a/content/base/test/test_xbl_userdata.xhtml b/dom/base/test/test_xbl_userdata.xhtml
similarity index 100%
rename from content/base/test/test_xbl_userdata.xhtml
rename to dom/base/test/test_xbl_userdata.xhtml
diff --git a/content/base/test/test_xhr_abort_after_load.html b/dom/base/test/test_xhr_abort_after_load.html
similarity index 100%
rename from content/base/test/test_xhr_abort_after_load.html
rename to dom/base/test/test_xhr_abort_after_load.html
diff --git a/content/base/test/test_xhr_forbidden_headers.html b/dom/base/test/test_xhr_forbidden_headers.html
similarity index 100%
rename from content/base/test/test_xhr_forbidden_headers.html
rename to dom/base/test/test_xhr_forbidden_headers.html
diff --git a/content/base/test/test_xhr_progressevents.html b/dom/base/test/test_xhr_progressevents.html
similarity index 100%
rename from content/base/test/test_xhr_progressevents.html
rename to dom/base/test/test_xhr_progressevents.html
diff --git a/content/base/test/test_xhr_send_readystate.html b/dom/base/test/test_xhr_send_readystate.html
similarity index 100%
rename from content/base/test/test_xhr_send_readystate.html
rename to dom/base/test/test_xhr_send_readystate.html
diff --git a/content/base/test/test_xhr_withCredentials.html b/dom/base/test/test_xhr_withCredentials.html
similarity index 100%
rename from content/base/test/test_xhr_withCredentials.html
rename to dom/base/test/test_xhr_withCredentials.html
diff --git a/content/base/test/unit/1_original.xml b/dom/base/test/unit/1_original.xml
similarity index 100%
rename from content/base/test/unit/1_original.xml
rename to dom/base/test/unit/1_original.xml
diff --git a/content/base/test/unit/1_result.xml b/dom/base/test/unit/1_result.xml
similarity index 100%
rename from content/base/test/unit/1_result.xml
rename to dom/base/test/unit/1_result.xml
diff --git a/content/base/test/unit/2_original.xml b/dom/base/test/unit/2_original.xml
similarity index 100%
rename from content/base/test/unit/2_original.xml
rename to dom/base/test/unit/2_original.xml
diff --git a/content/base/test/unit/2_result_1.xml b/dom/base/test/unit/2_result_1.xml
similarity index 100%
rename from content/base/test/unit/2_result_1.xml
rename to dom/base/test/unit/2_result_1.xml
diff --git a/content/base/test/unit/2_result_2.xml b/dom/base/test/unit/2_result_2.xml
similarity index 100%
rename from content/base/test/unit/2_result_2.xml
rename to dom/base/test/unit/2_result_2.xml
diff --git a/content/base/test/unit/2_result_3.xml b/dom/base/test/unit/2_result_3.xml
similarity index 100%
rename from content/base/test/unit/2_result_3.xml
rename to dom/base/test/unit/2_result_3.xml
diff --git a/content/base/test/unit/2_result_4.xml b/dom/base/test/unit/2_result_4.xml
similarity index 100%
rename from content/base/test/unit/2_result_4.xml
rename to dom/base/test/unit/2_result_4.xml
diff --git a/content/base/test/unit/3_original.xml b/dom/base/test/unit/3_original.xml
similarity index 100%
rename from content/base/test/unit/3_original.xml
rename to dom/base/test/unit/3_original.xml
diff --git a/content/base/test/unit/3_result.xml b/dom/base/test/unit/3_result.xml
similarity index 100%
rename from content/base/test/unit/3_result.xml
rename to dom/base/test/unit/3_result.xml
diff --git a/content/base/test/unit/3_result_2.xml b/dom/base/test/unit/3_result_2.xml
similarity index 100%
rename from content/base/test/unit/3_result_2.xml
rename to dom/base/test/unit/3_result_2.xml
diff --git a/content/base/test/unit/4_original.xml b/dom/base/test/unit/4_original.xml
similarity index 100%
rename from content/base/test/unit/4_original.xml
rename to dom/base/test/unit/4_original.xml
diff --git a/content/base/test/unit/4_result_1.xml b/dom/base/test/unit/4_result_1.xml
similarity index 100%
rename from content/base/test/unit/4_result_1.xml
rename to dom/base/test/unit/4_result_1.xml
diff --git a/content/base/test/unit/4_result_2.xml b/dom/base/test/unit/4_result_2.xml
similarity index 100%
rename from content/base/test/unit/4_result_2.xml
rename to dom/base/test/unit/4_result_2.xml
diff --git a/content/base/test/unit/4_result_3.xml b/dom/base/test/unit/4_result_3.xml
similarity index 100%
rename from content/base/test/unit/4_result_3.xml
rename to dom/base/test/unit/4_result_3.xml
diff --git a/content/base/test/unit/4_result_4.xml b/dom/base/test/unit/4_result_4.xml
similarity index 100%
rename from content/base/test/unit/4_result_4.xml
rename to dom/base/test/unit/4_result_4.xml
diff --git a/content/base/test/unit/4_result_5.xml b/dom/base/test/unit/4_result_5.xml
similarity index 100%
rename from content/base/test/unit/4_result_5.xml
rename to dom/base/test/unit/4_result_5.xml
diff --git a/content/base/test/unit/4_result_6.xml b/dom/base/test/unit/4_result_6.xml
similarity index 100%
rename from content/base/test/unit/4_result_6.xml
rename to dom/base/test/unit/4_result_6.xml
diff --git a/content/base/test/unit/head_utilities.js b/dom/base/test/unit/head_utilities.js
similarity index 100%
rename from content/base/test/unit/head_utilities.js
rename to dom/base/test/unit/head_utilities.js
diff --git a/content/base/test/unit/test_bug553888.js b/dom/base/test/unit/test_bug553888.js
similarity index 100%
rename from content/base/test/unit/test_bug553888.js
rename to dom/base/test/unit/test_bug553888.js
diff --git a/content/base/test/unit/test_bug737966.js b/dom/base/test/unit/test_bug737966.js
similarity index 100%
rename from content/base/test/unit/test_bug737966.js
rename to dom/base/test/unit/test_bug737966.js
diff --git a/content/base/test/unit/test_cspreports.js b/dom/base/test/unit/test_cspreports.js
similarity index 100%
rename from content/base/test/unit/test_cspreports.js
rename to dom/base/test/unit/test_cspreports.js
diff --git a/content/base/test/unit/test_error_codes.js b/dom/base/test/unit/test_error_codes.js
similarity index 100%
rename from content/base/test/unit/test_error_codes.js
rename to dom/base/test/unit/test_error_codes.js
diff --git a/content/base/test/unit/test_thirdpartyutil.js b/dom/base/test/unit/test_thirdpartyutil.js
similarity index 100%
rename from content/base/test/unit/test_thirdpartyutil.js
rename to dom/base/test/unit/test_thirdpartyutil.js
diff --git a/content/base/test/unit/test_xhr_document.js b/dom/base/test/unit/test_xhr_document.js
similarity index 100%
rename from content/base/test/unit/test_xhr_document.js
rename to dom/base/test/unit/test_xhr_document.js
diff --git a/content/base/test/unit/test_xhr_standalone.js b/dom/base/test/unit/test_xhr_standalone.js
similarity index 100%
rename from content/base/test/unit/test_xhr_standalone.js
rename to dom/base/test/unit/test_xhr_standalone.js
diff --git a/content/base/test/unit/test_xmlserializer.js b/dom/base/test/unit/test_xmlserializer.js
similarity index 100%
rename from content/base/test/unit/test_xmlserializer.js
rename to dom/base/test/unit/test_xmlserializer.js
diff --git a/content/base/test/unit/xpcshell.ini b/dom/base/test/unit/xpcshell.ini
similarity index 100%
rename from content/base/test/unit/xpcshell.ini
rename to dom/base/test/unit/xpcshell.ini
diff --git a/content/base/test/unit_ipc/test_bug553888_wrap.js b/dom/base/test/unit_ipc/test_bug553888_wrap.js
similarity index 100%
rename from content/base/test/unit_ipc/test_bug553888_wrap.js
rename to dom/base/test/unit_ipc/test_bug553888_wrap.js
diff --git a/content/base/test/unit_ipc/test_xhr_document_ipc.js b/dom/base/test/unit_ipc/test_xhr_document_ipc.js
similarity index 100%
rename from content/base/test/unit_ipc/test_xhr_document_ipc.js
rename to dom/base/test/unit_ipc/test_xhr_document_ipc.js
diff --git a/content/base/test/unit_ipc/xpcshell.ini b/dom/base/test/unit_ipc/xpcshell.ini
similarity index 100%
rename from content/base/test/unit_ipc/xpcshell.ini
rename to dom/base/test/unit_ipc/xpcshell.ini
diff --git a/content/base/test/variable_style_sheet.sjs b/dom/base/test/variable_style_sheet.sjs
similarity index 100%
rename from content/base/test/variable_style_sheet.sjs
rename to dom/base/test/variable_style_sheet.sjs
diff --git a/content/base/test/viewport_helpers.js b/dom/base/test/viewport_helpers.js
similarity index 100%
rename from content/base/test/viewport_helpers.js
rename to dom/base/test/viewport_helpers.js
diff --git a/content/base/test/w3element_traversal.svg b/dom/base/test/w3element_traversal.svg
similarity index 100%
rename from content/base/test/w3element_traversal.svg
rename to dom/base/test/w3element_traversal.svg
diff --git a/content/base/test/websocket_hybi/file_binary-frames_wsh.py b/dom/base/test/websocket_hybi/file_binary-frames_wsh.py
similarity index 100%
rename from content/base/test/websocket_hybi/file_binary-frames_wsh.py
rename to dom/base/test/websocket_hybi/file_binary-frames_wsh.py
diff --git a/content/base/test/websocket_hybi/file_check-binary-messages_wsh.py b/dom/base/test/websocket_hybi/file_check-binary-messages_wsh.py
similarity index 100%
rename from content/base/test/websocket_hybi/file_check-binary-messages_wsh.py
rename to dom/base/test/websocket_hybi/file_check-binary-messages_wsh.py
diff --git a/content/base/test/websocket_hybi/mochitest.ini b/dom/base/test/websocket_hybi/mochitest.ini
similarity index 100%
rename from content/base/test/websocket_hybi/mochitest.ini
rename to dom/base/test/websocket_hybi/mochitest.ini
diff --git a/content/base/test/websocket_hybi/test_receive-arraybuffer.html b/dom/base/test/websocket_hybi/test_receive-arraybuffer.html
similarity index 95%
rename from content/base/test/websocket_hybi/test_receive-arraybuffer.html
rename to dom/base/test/websocket_hybi/test_receive-arraybuffer.html
index eb691b9a250..0bd1cfefc93 100644
--- a/content/base/test/websocket_hybi/test_receive-arraybuffer.html
+++ b/dom/base/test/websocket_hybi/test_receive-arraybuffer.html
@@ -39,7 +39,7 @@ function createArrayBufferContainingAllDistinctBytes()
     return array.buffer;
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/websocket_hybi/file_binary-frames");
+var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_binary-frames");
 ws.binaryType = "arraybuffer";
 is(ws.binaryType, "arraybuffer", "should be equal to 'arraybuffer'");
 
diff --git a/content/base/test/websocket_hybi/test_receive-blob.html b/dom/base/test/websocket_hybi/test_receive-blob.html
similarity index 96%
rename from content/base/test/websocket_hybi/test_receive-blob.html
rename to dom/base/test/websocket_hybi/test_receive-blob.html
index 7da9f7caa18..cd8beceec96 100644
--- a/content/base/test/websocket_hybi/test_receive-blob.html
+++ b/dom/base/test/websocket_hybi/test_receive-blob.html
@@ -39,7 +39,7 @@ function createArrayBufferContainingAllDistinctBytes()
     return array.buffer;
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/websocket_hybi/file_binary-frames");
+var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_binary-frames");
 is(ws.binaryType, "blob", "should be 'blob'");
 
 var closeEvent;
diff --git a/content/base/test/websocket_hybi/test_send-arraybuffer.html b/dom/base/test/websocket_hybi/test_send-arraybuffer.html
similarity index 93%
rename from content/base/test/websocket_hybi/test_send-arraybuffer.html
rename to dom/base/test/websocket_hybi/test_send-arraybuffer.html
index 876efff6171..4db0746fbc3 100644
--- a/content/base/test/websocket_hybi/test_send-arraybuffer.html
+++ b/dom/base/test/websocket_hybi/test_send-arraybuffer.html
@@ -44,7 +44,7 @@ function createArrayBufferContainingAllDistinctBytes()
     return array.buffer;
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/websocket_hybi/file_check-binary-messages");
+var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_check-binary-messages");
 var closeEvent;
 
 ws.onopen = function()
diff --git a/content/base/test/websocket_hybi/test_send-blob.html b/dom/base/test/websocket_hybi/test_send-blob.html
similarity index 95%
rename from content/base/test/websocket_hybi/test_send-blob.html
rename to dom/base/test/websocket_hybi/test_send-blob.html
index 373f96f8aa7..0ef94377a0c 100644
--- a/content/base/test/websocket_hybi/test_send-blob.html
+++ b/dom/base/test/websocket_hybi/test_send-blob.html
@@ -64,7 +64,7 @@ function createBlobContainingAllDistinctBytes()
     return createDOMFile("allchars", binaryString);
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/websocket_hybi/file_check-binary-messages");
+var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_check-binary-messages");
 var closeEvent;
 
 ws.onopen = function()
diff --git a/content/base/test/wholeTexty-helper.xml b/dom/base/test/wholeTexty-helper.xml
similarity index 100%
rename from content/base/test/wholeTexty-helper.xml
rename to dom/base/test/wholeTexty-helper.xml
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index 740ba944341..ca048b7d8f8 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -41,7 +41,6 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build
index 34ef32a803e..01bacdfec69 100644
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -34,7 +34,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/',
     '/dom/base',
     '/dom/ipc',
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index 4d8563a0a0f..a777c05c21b 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -124,7 +124,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/html',
     '/dom/svg',
diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build
index 827fa486cd4..919707ed213 100644
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -31,7 +31,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/ipc',
 ]
diff --git a/dom/events/moz.build b/dom/events/moz.build
index 9dc4c977a33..c5344bbb65a 100644
--- a/dom/events/moz.build
+++ b/dom/events/moz.build
@@ -130,7 +130,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/html',
     '/dom/settings',
diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
index 3658d6240f6..941874ace71 100644
--- a/dom/geolocation/moz.build
+++ b/dom/geolocation/moz.build
@@ -20,7 +20,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/ipc',
 ]
diff --git a/dom/html/moz.build b/dom/html/moz.build
index f56d7790f1c..5b0ea5aec67 100644
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -221,7 +221,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/caps',
-    '/content/base/src',
     '/docshell/base',
     '/dom/base',
     '/dom/canvas',
diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build
index d262a1f2695..8570f421e2a 100644
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -91,7 +91,6 @@ FINAL_LIBRARY = 'xul'
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/db/sqlite3/src',
     '/dom/base',
     '/dom/quota',
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 4e5eac292e0..9cf6cd1a555 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -102,7 +102,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/chrome',
-    '/content/base/src',
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
diff --git a/dom/json/moz.build b/dom/json/moz.build
index 83389f02dfa..0d6d0fefd72 100644
--- a/dom/json/moz.build
+++ b/dom/json/moz.build
@@ -15,7 +15,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/mathml/moz.build b/dom/mathml/moz.build
index 6f6ad06a773..6a9fcc6084c 100644
--- a/dom/mathml/moz.build
+++ b/dom/mathml/moz.build
@@ -15,6 +15,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
 ]
 
diff --git a/dom/media/android/moz.build b/dom/media/android/moz.build
index 2aa15d9c33f..eb600eb120b 100644
--- a/dom/media/android/moz.build
+++ b/dom/media/android/moz.build
@@ -20,7 +20,7 @@ UNIFIED_SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/html',
 ]
 
diff --git a/dom/media/gstreamer/moz.build b/dom/media/gstreamer/moz.build
index 376151c6053..40bb959683a 100644
--- a/dom/media/gstreamer/moz.build
+++ b/dom/media/gstreamer/moz.build
@@ -32,7 +32,7 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/html',
 ]
 
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 72d9c12c73f..70c72e8f216 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -235,7 +235,6 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps',
-    '/content/base/src',
     '/dom/base',
     '/dom/camera',
     '/layout/generic',
diff --git a/dom/media/omx/moz.build b/dom/media/omx/moz.build
index 68ec812722d..bf01d2ce54d 100644
--- a/dom/media/omx/moz.build
+++ b/dom/media/omx/moz.build
@@ -81,7 +81,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/html',
     '/ipc/chromium/src',
     'mediaresourcemanager',
diff --git a/dom/media/raw/moz.build b/dom/media/raw/moz.build
index f8b105ddd8a..bf46eaec5ab 100644
--- a/dom/media/raw/moz.build
+++ b/dom/media/raw/moz.build
@@ -18,7 +18,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/html',
 ]
 
diff --git a/dom/notification/moz.build b/dom/notification/moz.build
index 9811c7d9ddd..d7767047f4a 100644
--- a/dom/notification/moz.build
+++ b/dom/notification/moz.build
@@ -31,7 +31,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/ipc',
 ]
diff --git a/dom/offline/moz.build b/dom/offline/moz.build
index 34427214d62..2a6fe500ad8 100644
--- a/dom/offline/moz.build
+++ b/dom/offline/moz.build
@@ -14,8 +14,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    "/content/base/src",
-    "/dom/base",
+    '/dom/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build
index 45d279be12a..41bc465e9e4 100644
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -96,7 +96,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/layout/generic',
     '/layout/xul',
diff --git a/dom/smil/moz.build b/dom/smil/moz.build
index 365d99902b0..f25e7df798b 100644
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -65,7 +65,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/svg',
     '/layout/style',
 ]
diff --git a/dom/svg/moz.build b/dom/svg/moz.build
index 47e67cd8917..f44494bec54 100644
--- a/dom/svg/moz.build
+++ b/dom/svg/moz.build
@@ -257,8 +257,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom',
+    '/dom/base',
     '/dom/html',
     '/dom/smil',
     '/dom/svg',
diff --git a/dom/workers/moz.build b/dom/workers/moz.build
index 7f3aa6f5d30..b19b907db2c 100644
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -70,7 +70,7 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '../base',
     '../system',
-    '/content/base/src',
+    '/dom/base',
     '/xpcom/build',
     '/xpcom/threads',
 ]
diff --git a/dom/workers/test/test_xhr_parameters.js b/dom/workers/test/test_xhr_parameters.js
index 48ca82b6315..2b6567436a8 100644
--- a/dom/workers/test/test_xhr_parameters.js
+++ b/dom/workers/test/test_xhr_parameters.js
@@ -6,7 +6,7 @@ function is(a, b, msg) {
   postMessage({ event: msg, test: 'is', a: a, b: b });
 }
 
-// This is a copy of content/base/test/test_XHR_parameters.js
+// This is a copy of dom/base/test/test_XHR_parameters.js
 var validParameters = [
   undefined,
   null,
diff --git a/dom/workers/test/test_xhr_responseURL.html b/dom/workers/test/test_xhr_responseURL.html
index 91b083a8f05..fb2fd5e4e18 100644
--- a/dom/workers/test/test_xhr_responseURL.html
+++ b/dom/workers/test/test_xhr_responseURL.html
@@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=998076
 /** Test for Bug 998076 **/
 "use strict";
 
-var worker = new Worker("../../../content/base/test/file_XHRResponseURL.js");
+var worker = new Worker("../../../dom/base/test/file_XHRResponseURL.js");
 
 var requestObserver = {
   observe: function (aSubject, aTopic, aData) {
diff --git a/dom/workers/test/test_xhr_system.js b/dom/workers/test/test_xhr_system.js
index 029605cdc72..460c76f29a3 100644
--- a/dom/workers/test/test_xhr_system.js
+++ b/dom/workers/test/test_xhr_system.js
@@ -10,7 +10,7 @@ self.onmessage = function onmessage(event) {
 
   // An XHR with system privileges will be able to do cross-site calls.
 
-  const TEST_URL = "http://example.com/tests/content/base/test/test_XHR_system.html";
+  const TEST_URL = "http://example.com/tests/dom/base/test/test_XHR_system.html";
   is(location.hostname, "mochi.test", "hostname should be mochi.test");
 
   var xhr = new XMLHttpRequest({mozSystem: true});
diff --git a/dom/workers/test/test_xhr_timeout.html b/dom/workers/test/test_xhr_timeout.html
index b8ee563dcd4..154fe03b425 100644
--- a/dom/workers/test/test_xhr_timeout.html
+++ b/dom/workers/test/test_xhr_timeout.html
@@ -24,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=498998
 </div>
 <pre id="test">
 <script type="text/javascript">
-  var worker = new Worker("../../../content/base/test/test_XHR_timeout.js");
+  var worker = new Worker("../../../dom/base/test/test_XHR_timeout.js");
 
   worker.addEventListener("message", function (event) {
     if (event.data == "done") {
diff --git a/dom/workers/test/websocket_basic_worker.js b/dom/workers/test/websocket_basic_worker.js
index 6e69da3f32d..256af569a3e 100644
--- a/dom/workers/test/websocket_basic_worker.js
+++ b/dom/workers/test/websocket_basic_worker.js
@@ -19,7 +19,7 @@ onmessage = function(event) {
 
   postMessage({type: 'status', status: status, msg: 'WebSocket object:' + WebSocket});
 
-  var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket_hello");
+  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
   ws.onopen = function(e) {
     postMessage({type: 'status', status: true, msg: 'OnOpen called' });
     ws.send("data");
diff --git a/dom/workers/test/websocket_loadgroup_worker.js b/dom/workers/test/websocket_loadgroup_worker.js
index 5cdc4320f95..21cf248bc85 100644
--- a/dom/workers/test/websocket_loadgroup_worker.js
+++ b/dom/workers/test/websocket_loadgroup_worker.js
@@ -9,7 +9,7 @@ onmessage = function(event) {
     return;
   }
 
-  var ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket_hello");
+  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/file_websocket_hello");
   ws.onopen = function(e) {
     postMessage('opened');
   }
diff --git a/dom/workers/test/websocket_worker.js b/dom/workers/test/websocket_worker.js
index 3abe3e60884..285d6944d74 100644
--- a/dom/workers/test/websocket_worker.js
+++ b/dom/workers/test/websocket_worker.js
@@ -204,7 +204,7 @@ doTest.timeoutId = null;
 function test1()
 {
   try {
-    var ws = CreateTestWS("http://mochi.test:8888/tests/content/base/test/file_websocket");
+    var ws = CreateTestWS("http://mochi.test:8888/tests/dom/base/test/file_websocket");
     ok(false, "test1 failed");
   }
   catch (e) {
@@ -225,9 +225,9 @@ function test2()
   waitTest2Part1 = true;
   waitTest2Part2 = true;
 
-  var ws1 = CreateTestWS("ws://sub2.test2.example.com/tests/content/base/test/file_websocket", "test-2.1");
+  var ws1 = CreateTestWS("ws://sub2.test2.example.com/tests/dom/base/test/file_websocket", "test-2.1");
   current_test--; // CreateTestWS incremented this
-  var ws2 = CreateTestWS("ws://sub2.test2.example.com/tests/content/base/test/file_websocket", "test-2.2");
+  var ws2 = CreateTestWS("ws://sub2.test2.example.com/tests/dom/base/test/file_websocket", "test-2.2");
 
   var ws2CanConnect = false;
 
@@ -295,7 +295,7 @@ function test4()
 function test5()
 {
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "");
     ok(false, "couldn't accept an empty string in the protocol parameter");
   }
   catch (e) {
@@ -303,7 +303,7 @@ function test5()
   }
   current_test--; // CreateTestWS incremented this
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "\n");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "\n");
     ok(false, "couldn't accept any not printable ASCII character in the protocol parameter");
   }
   catch (e) {
@@ -311,7 +311,7 @@ function test5()
   }
   current_test--; // CreateTestWS incremented this
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 5");
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test 5");
     ok(false, "U+0020 not acceptable in protocol parameter");
   }
   catch (e) {
@@ -322,7 +322,7 @@ function test5()
 
 function test6()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-6");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-6");
   var counter = 1;
   ws.onopen = function()
   {
@@ -348,7 +348,7 @@ function test6()
 
 function test7()
 {
-  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/content/base/test/file_websocket", "test-7");
+  var ws = CreateTestWS("ws://sub2.test2.example.org/tests/dom/base/test/file_websocket", "test-7");
   var gotmsg = false;
 
   ws.onopen = function()
@@ -372,7 +372,7 @@ function test7()
 
 function test8()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-8");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-8");
   ws.onopen = function()
   {
     ok(ws.protocol == "test-8", "test-8 subprotocol selection");
@@ -395,7 +395,7 @@ function test9()
 {
   waitTest9 = true;
 
-  var ws = CreateTestWS("ws://test2.example.org/tests/content/base/test/file_websocket", "test-9");
+  var ws = CreateTestWS("ws://test2.example.org/tests/dom/base/test/file_websocket", "test-9");
   ws._receivedErrorEvent = false;
   ws.onopen = shouldNotOpen;
   ws.onerror = function(e)
@@ -422,7 +422,7 @@ function test10()
 {
   waitTest10 = true;
 
-  var ws = CreateTestWS("ws://sub1.test1.example.com/tests/content/base/test/file_websocket", "test-10");
+  var ws = CreateTestWS("ws://sub1.test1.example.com/tests/dom/base/test/file_websocket", "test-10");
   ws.onclose = function(e)
   {
     shouldCloseCleanly(e);
@@ -449,7 +449,7 @@ function test10()
 
 function test11()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-11");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-11");
   ok(ws.readyState == 0, "create bad readyState in test-11!");
   ws.onopen = function()
   {
@@ -477,7 +477,7 @@ function test11()
 
 function test12()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-12");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-12");
   ws.onopen = function()
   {
     try {
@@ -516,7 +516,7 @@ function test13()
     // protocol stack typically closes down after reporting a protocol level error - trying
     // to resync is too dangerous
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-13");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-13");
   ws._timesCalledOnError = 0;
   ws.onerror = function()
   {
@@ -531,7 +531,7 @@ function test13()
 
 function test14()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-14");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-14");
   ws.onmessage = function()
   {
     ok(false, "shouldn't received message after the server sent the close frame");
@@ -549,7 +549,7 @@ function test14()
  *
 function test15()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-15");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-15");
   ws.onclose = function(e)
   {
     shouldCloseNotCleanly(e);
@@ -566,7 +566,7 @@ function test15()
 
 function test16()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-16");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-16");
   ws.onopen = function()
   {
     ws.close();
@@ -592,7 +592,7 @@ function test16()
 
 function test18()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket_http_resource.txt");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket_http_resource.txt");
   ws.onopen = shouldNotOpen;
   ws.onerror = ignoreError;
   ws.onclose = function(e)
@@ -604,7 +604,7 @@ function test18()
 
 function test19()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-19");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-19");
   ws.onopen = shouldNotOpen;
   ws.onerror = ignoreError;
   ws.onclose = function(e)
@@ -616,7 +616,7 @@ function test19()
 
 function test24()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-does-not-exist");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-does-not-exist");
   ws.onopen = shouldNotOpen;
   ws.onclose = function(e)
   {
@@ -632,7 +632,7 @@ function test25()
 {
   var prots=[];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   // This test errors because the server requires a sub-protocol, but
   // the test just wants to ensure that the ctor doesn't generate an
@@ -653,7 +653,7 @@ function test26()
   var prots=[""];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing empty element sub protocol array");
   }
   catch (e) {
@@ -667,7 +667,7 @@ function test27()
   var prots=["test27", ""];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing empty element mixed sub protocol array");
   }
   catch (e) {
@@ -680,7 +680,7 @@ function test28()
 {
   var prots=["test28"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 28 protocol array open");
@@ -699,7 +699,7 @@ function test29()
 {
   var prots=["test29a", "test29b"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 29 protocol array open");
@@ -716,7 +716,7 @@ function test29()
 function test30()
 {
   var prots=["test-does-not-exist"];
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   ws.onopen = shouldNotOpen;
   ws.onclose = function(e)
@@ -732,7 +732,7 @@ function test30()
 function test31()
 {
   var prots=["test-does-not-exist", "test31"];
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
 
   ws.onopen = function(e)
   {
@@ -753,7 +753,7 @@ function test32()
   var prots=["test32","test32"];
 
   try {
-    var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+    var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
     ok(false, "testing duplicated element sub protocol array");
   }
   catch (e) {
@@ -766,7 +766,7 @@ function test33()
 {
   var prots=["test33"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 33 open");
@@ -787,7 +787,7 @@ function test34()
 {
   var prots=["test-34"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 34 open");
@@ -806,7 +806,7 @@ function test34()
 
 function test35()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-35a");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-35a");
 
   ws.onopen = function(e)
   {
@@ -819,7 +819,7 @@ function test35()
     ok(true, "test 35a close");
     ok(e.wasClean, "test 35a closed cleanly");
     current_test--; // CreateTestWS for 35a incremented this
-    var wsb = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-35b");
+    var wsb = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-35b");
 
   wsb.onopen = function(e)
   {
@@ -842,7 +842,7 @@ function test36()
 {
   var prots=["test-36"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 36 open");
@@ -869,7 +869,7 @@ function test37()
 {
   var prots=["test-37"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 37 open");
@@ -890,7 +890,7 @@ function test37()
     ok(e.wasClean, "test 37 closed cleanly");
 
     current_test--; // CreateTestWS for 37 incremented this
-    var wsb = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-37b");
+    var wsb = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-37b");
 
     wsb.onopen = function(e)
     {
@@ -912,7 +912,7 @@ function test37()
       ok(e.wasClean, "test 37b closed cleanly");
 
       current_test--; // CreateTestWS for 37 incremented this
-      var wsc = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-37c");
+      var wsc = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-37c");
 
       wsc.onopen = function(e)
       {
@@ -934,7 +934,7 @@ function test38()
 {
   var prots=["test-38"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 38 open");
@@ -954,7 +954,7 @@ function test39()
 {
   var prots=["test-39"];
 
-  var ws = CreateTestWS("wss://example.com/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("wss://example.com/tests/dom/base/test/file_websocket", prots);
   status_test39 = "started";
   ws.onopen = function(e)
   {
@@ -975,7 +975,7 @@ function test40()
 {
   var prots=["test-40"];
 
-  var ws = CreateTestWS("wss://nocert.example.com/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("wss://nocert.example.com/tests/dom/base/test/file_websocket", prots);
 
   status_test40 = "started";
   ws.onerror = ignoreError;
@@ -999,7 +999,7 @@ function test42()
 {
 // test some utf-8 non-characters. They should be allowed in the
 // websockets context. Test via round trip echo.
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-42");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-42");
   var data = ["U+FFFE \ufffe",
 		"U+FFFF \uffff",
 		"U+10FFFF \udbff\udfff"];
@@ -1030,7 +1030,7 @@ function test43()
 {
   var prots=["test-43"];
 
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 43 open");
@@ -1058,7 +1058,7 @@ function test43()
 
 function test44()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-44");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-44");
   ok(ws.readyState == 0, "bad readyState in test-44!");
   ws.binaryType = "arraybuffer";
   ws.onopen = function()
@@ -1089,7 +1089,7 @@ function test44()
 
 function test46()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test-46");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-46");
   ok(ws.readyState == 0, "create bad readyState in test-46!");
   ws.onopen = function()
   {
diff --git a/dom/xbl/moz.build b/dom/xbl/moz.build
index 8948712e193..6bc1ba27eb0 100644
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -41,7 +41,6 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/html',
     '/dom/xml',
diff --git a/dom/xml/moz.build b/dom/xml/moz.build
index cdd76de453a..3f6de0c8610 100644
--- a/dom/xml/moz.build
+++ b/dom/xml/moz.build
@@ -39,7 +39,6 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/caps',
-    '/content/base/src',
     '/dom/base',
     '/dom/html',
     '/dom/xul',
diff --git a/dom/xslt/xml/moz.build b/dom/xslt/xml/moz.build
index bc9a3437de0..aa8f5b49d66 100644
--- a/dom/xslt/xml/moz.build
+++ b/dom/xslt/xml/moz.build
@@ -15,7 +15,7 @@ LOCAL_INCLUDES += [
     '../base',
     '../xpath',
     '../xslt',
-    '/content/base/src',
+    '/dom/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xslt/xslt/moz.build b/dom/xslt/xslt/moz.build
index e4f0036c287..8da21c32d42 100644
--- a/dom/xslt/xslt/moz.build
+++ b/dom/xslt/xslt/moz.build
@@ -55,7 +55,7 @@ LOCAL_INCLUDES += [
     '../base',
     '../xml',
     '../xpath',
-    '/content/base/src',
+    '/dom/base',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index 324821de0ea..62315cd7cfc 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -47,7 +47,6 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/docshell/base',
     '/dom/base',
     '/dom/html',
diff --git a/dom/xul/templates/moz.build b/dom/xul/templates/moz.build
index 9e8e1c1435a..2583be004f0 100644
--- a/dom/xul/templates/moz.build
+++ b/dom/xul/templates/moz.build
@@ -49,7 +49,6 @@ UNIFIED_SOURCES += [
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/xul',
     '/layout/xul/tree/',
diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build
index 22283f45626..16128e411e4 100644
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -61,7 +61,7 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/editor/txmgr',
     '/extensions/spellcheck/src',
     '/layout/generic',
diff --git a/embedding/browser/moz.build b/embedding/browser/moz.build
index 077395037df..ffe0de72d48 100644
--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -50,6 +50,6 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/svg',
 ]
diff --git a/embedding/components/printingui/win/nsPrintDialogUtil.cpp b/embedding/components/printingui/win/nsPrintDialogUtil.cpp
index 6ab46611422..81f56d1ddb0 100644
--- a/embedding/components/printingui/win/nsPrintDialogUtil.cpp
+++ b/embedding/components/printingui/win/nsPrintDialogUtil.cpp
@@ -6,7 +6,7 @@
 /* -------------------------------------------------------------------
 To Build This:
 
-  You need to add this to the the makefile.win in mozilla/content/base/src:
+  You need to add this to the the makefile.win in mozilla/dom/base:
 
 	.\$(OBJDIR)\nsFlyOwnPrintDialog.obj	\
 
diff --git a/embedding/components/webbrowserpersist/moz.build b/embedding/components/webbrowserpersist/moz.build
index fc09abed995..e1f6a2927f7 100644
--- a/embedding/components/webbrowserpersist/moz.build
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -19,6 +19,6 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/dom/html',
 ]
diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build
index e2ae33974e0..db065d48bd3 100644
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -34,7 +34,7 @@ else:
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/editor/libeditor',
     '/extensions/spellcheck/src',
 ]
diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
index bd22d744fe7..05d92a64a74 100644
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -20,7 +20,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../hunspell/src',
-    '/content/base/src',
+    '/dom/base',
     '/editor/libeditor',
 ]
 EXPORTS.mozilla += [
diff --git a/image/src/moz.build b/image/src/moz.build
index 5bf4c08349a..ea57c3216ed 100644
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -55,7 +55,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
-    '/content/base/src',
+    '/dom/base',
     '/dom/svg',
     # We need to instantiate the decoders
     '/image/decoders',
diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build
index a19cf3c5e42..821641f8797 100644
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -25,6 +25,6 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src',
     '../wrappers',
-    '/content/base/src',
+    '/dom/base',
 ]
 
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index b21ea595af6..bcb089b1d60 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -62,8 +62,6 @@ LOCAL_INCLUDES += [
     '../loader',
     '../wrappers',
     '/caps',
-    '/content/base/public',
-    '/content/base/src',
     '/dom/base',
     '/dom/html',
     '/dom/svg',
diff --git a/layout/base/moz.build b/layout/base/moz.build
index 29fdd9fec3b..98c1399f441 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -115,7 +115,6 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../forms',
     '../generic',
     '../mathml',
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 8109693135a..a44d181ecc4 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -37,7 +37,6 @@ LOCAL_INCLUDES += [
     '../tables',
     '../xul',
     '/caps',
-    '/content/base/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 9e6a40d4876..bd961dad0d1 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -44,12 +44,12 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../../editor/libeditor',
     '../../editor/txmgr',
     '../base',
     '../generic',
     '../xul',
+    '/dom/base',
     '/dom/html',
 ]
 
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 957e6b2e126..0d073ffb78d 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -120,8 +120,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
-    '../../dom/base',
     '../../dom/plugins/base',
     '../base',
     '../forms',
@@ -129,6 +127,7 @@ LOCAL_INCLUDES += [
     '../svg',
     '../tables',
     '../xul',
+    '/dom/base',
     '/dom/html',
     '/dom/xul',
 ]
diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build
index 2a60855e235..dcafb03c2f6 100644
--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -48,6 +48,6 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../style',
-    '/content/base/src',
+    '/dom/base',
     '/dom/xbl',
 ]
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index 198cb0c6688..6cb92052bc4 100644
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -26,7 +26,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
     '/layout/base',
     '/layout/generic',
     '/layout/xul',
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index 53afd134674..e8f047c31ef 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -45,7 +45,7 @@ LOCAL_INCLUDES += [
     '../style',
     '../tables',
     '../xul',
-    '/content/base/src',
+    '/dom/base',
     '/dom/mathml',
 ]
 
diff --git a/layout/printing/moz.build b/layout/printing/moz.build
index c99d2212525..92cebfb52ca 100644
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -24,7 +24,7 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../base',
+    '/dom/base',
 ]
 
diff --git a/layout/style/moz.build b/layout/style/moz.build
index 85ade936f6b..31cf56e4e62 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -155,7 +155,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../base',
     '../generic',
     '../xul',
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index bfbbced81dc..7f05014b5ff 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -52,12 +52,12 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../../widget',
     '../base',
     '../generic',
     '../style',
     '../xul',
+    '/dom/base',
     '/dom/svg',
 ]
 
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 744b1ce39ce..4bee46f1983 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -32,12 +32,12 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
     '../../intl/unicharutil/util',
     '../base',
     '../generic',
     '../style',
     '../xul',
+    '/dom/base',
     '/dom/html',
 ]
 
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index 78267d42c69..1031963c9a0 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -98,5 +98,5 @@ LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../style',
-    '/content/base/src',
+    '/dom/base',
 ]
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index ed335e65e8b..b7eae70c8b9 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -45,5 +45,5 @@ LOCAL_INCLUDES += [
     '../../forms',
     '../../generic',
     '../../style',
-    '/content/base/src',
+    '/dom/base',
 ]
diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build
index d669bf383e5..eacad06e477 100644
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -24,8 +24,8 @@ if CONFIG['MOZ_ANDROID_HISTORY']:
         'nsAndroidHistory.cpp',
     ]
     LOCAL_INCLUDES += [
-        '/content/base/src',
         '/docshell/base',
+        '/dom/base',
     ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 1d0435886a9..c97d687ac1a 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -124,7 +124,6 @@
 @BINPATH@/components/commandhandler.xpt
 @BINPATH@/components/commandlines.xpt
 @BINPATH@/components/composer.xpt
-@BINPATH@/components/content_base.xpt
 @BINPATH@/components/content_events.xpt
 @BINPATH@/components/content_html.xpt
 @BINPATH@/components/content_webrtc.xpt
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index 5e8f583bf7e..24bf811f30c 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -109,5 +109,5 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../base/src',
-    '/content/base/src',
+    '/dom/base',
 ]
diff --git a/netwerk/protocol/rtsp/moz.build b/netwerk/protocol/rtsp/moz.build
index 3af0e59d295..449e4522bd8 100644
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -55,7 +55,7 @@ DEFINES['FORCE_PR_LOG'] = True
 
 LOCAL_INCLUDES += [
     '../../base/src',
-    '/content/base/src',
+    '/dom/base',
     'controller',
     'rtsp',
 ]
diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build
index db61bccff4a..f1c0c99797c 100644
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -41,5 +41,5 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../base/src',
-    '/content/base/src',
+    '/dom/base',
 ]
diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build
index 95c058250b5..de734335620 100644
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -48,7 +48,7 @@ FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../base/src',
-    '/content/base/src',
+    '/dom/base',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR',
diff --git a/parser/html/moz.build b/parser/html/moz.build
index 906d3c040d9..591a1ba7546 100644
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -97,7 +97,7 @@ FINAL_LIBRARY = 'xul'
 # DEFINES['ENABLE_VOID_MENUITEM'] = True
 
 LOCAL_INCLUDES += [
-    '../../content/base/src',
+    '/dom/base',
 ]
 
 FAIL_ON_WARNINGS = True
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 0824530b487..7d9ee5faab6 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -5,8 +5,6 @@ include ../../testing/crashtest/sanity/crashtests.list
 
 include ../../accessible/tests/crashtests/crashtests.list
 
-include ../../content/base/crashtests/crashtests.list
-
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
diff --git a/testing/mochitest/androidx86.json b/testing/mochitest/androidx86.json
index dc8fd1edaed..893181e6a49 100644
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -1,7 +1,7 @@
 {
 "runtests": {},
 "excludetests": {
-  "content/base/test/test_copypaste.xul": "bug 904183",
+  "dom/base/test/test_copypaste.xul": "bug 904183",
   "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/test_2d.composite.image.source-out.html": "x86 only bug 913662",
diff --git a/testing/mochitest/pywebsocket/README-MOZILLA b/testing/mochitest/pywebsocket/README-MOZILLA
index b683f461613..51ed82e2d4d 100644
--- a/testing/mochitest/pywebsocket/README-MOZILLA
+++ b/testing/mochitest/pywebsocket/README-MOZILLA
@@ -37,7 +37,7 @@ STEPS TO UPDATE MOZILLA TO NEWER PYWEBSOCKET VERSION
 
 - Test and make sure the code works:
 
-    make mochitest-plain TEST_PATH=content/base/test/test_websocket.html
+    make mochitest-plain TEST_PATH=dom/base/test/test_websocket.html
 
 - If this doesn't take a look at the pywebsocket server log,
   $OBJDIR/_tests/testing/mochitest/websock.log
diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 4e34fe2bd8a..f9e8495d9f1 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1151,7 +1151,7 @@ SpecialPowersAPI.prototype = {
   // Returns a privileged getter from an object. GetOwnPropertyDescriptor does
   // not work here because xray wrappers don't properly implement it.
   //
-  // This terribleness is used by content/base/test/test_object.html because
+  // This terribleness is used by dom/base/test/test_object.html because
   // <object> and <embed> tags will spawn plugins if their prototype is touched,
   // so we need to get and cache the getter of |hasRunningPlugin| if we want to
   // call it without paradoxically spawning the plugin.
diff --git a/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js b/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
index f3ef49aef63..23646313d94 100644
--- a/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
+++ b/testing/web-platform/tests/XMLHttpRequest/resources/xmlhttprequest-timeout.js
@@ -1,5 +1,5 @@
 /* Test adapted from Alex Vincent's XHR2 timeout tests, written for Mozilla.
-   https://hg.mozilla.org/mozilla-central/file/tip/content/base/test/
+   https://hg.mozilla.org/mozilla-central/file/tip/dom/base/test/
    Released into the public domain or under BSD, according to
    https://bugzilla.mozilla.org/show_bug.cgi?id=525816#c86
 */
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
index 8e1d703e7f5..a66fa5124cf 100644
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -121,7 +121,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
     '/dom/base',
     '/dom/ipc',
     '/netwerk/base/src',
diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build
index 09702a783f8..da08e9d5b9b 100644
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -40,6 +40,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/base/src',
+    '/dom/base',
 ]
 

From 5ef16da27886d417a92621f37d1ba7b614b6f0a2 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:27:41 +0300
Subject: [PATCH 24/37] Bug 1085208 - Move dom/media/tests/identity into
 dom/media/tests/mochitest to force it to run with the other Mochitests. r=jib

--HG--
rename : dom/media/tests/identity/identityevent.js => dom/media/tests/mochitest/identity/identityevent.js
rename : dom/media/tests/identity/idp-proxy.js => dom/media/tests/mochitest/identity/idp-proxy.js
rename : dom/media/tests/identity/idp.html => dom/media/tests/mochitest/identity/idp.html
rename : dom/media/tests/identity/mochitest.ini => dom/media/tests/mochitest/identity/mochitest.ini
rename : dom/media/tests/identity/test_fingerprints.html => dom/media/tests/mochitest/identity/test_fingerprints.html
rename : dom/media/tests/identity/test_getIdentityAssertion.html => dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
rename : dom/media/tests/identity/test_idpproxy.html => dom/media/tests/mochitest/identity/test_idpproxy.html
rename : dom/media/tests/identity/test_peerConnection_peerIdentity.html => dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
rename : dom/media/tests/identity/test_setIdentityProvider.html => dom/media/tests/mochitest/identity/test_setIdentityProvider.html
rename : dom/media/tests/identity/test_setIdentityProviderWithErrors.html => dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
---
 dom/media/moz.build                                    |  2 +-
 .../tests/{ => mochitest}/identity/identityevent.js    |  0
 dom/media/tests/{ => mochitest}/identity/idp-proxy.js  |  0
 dom/media/tests/{ => mochitest}/identity/idp.html      |  0
 dom/media/tests/{ => mochitest}/identity/mochitest.ini |  2 +-
 .../{ => mochitest}/identity/test_fingerprints.html    |  0
 .../identity/test_getIdentityAssertion.html            |  6 +++---
 .../tests/{ => mochitest}/identity/test_idpproxy.html  |  0
 .../identity/test_peerConnection_peerIdentity.html     | 10 +++++-----
 .../identity/test_setIdentityProvider.html             |  6 +++---
 .../identity/test_setIdentityProviderWithErrors.html   |  6 +++---
 11 files changed, 16 insertions(+), 16 deletions(-)
 rename dom/media/tests/{ => mochitest}/identity/identityevent.js (100%)
 rename dom/media/tests/{ => mochitest}/identity/idp-proxy.js (100%)
 rename dom/media/tests/{ => mochitest}/identity/idp.html (100%)
 rename dom/media/tests/{ => mochitest}/identity/mochitest.ini (94%)
 rename dom/media/tests/{ => mochitest}/identity/test_fingerprints.html (100%)
 rename dom/media/tests/{ => mochitest}/identity/test_getIdentityAssertion.html (93%)
 rename dom/media/tests/{ => mochitest}/identity/test_idpproxy.html (100%)
 rename dom/media/tests/{ => mochitest}/identity/test_peerConnection_peerIdentity.html (84%)
 rename dom/media/tests/{ => mochitest}/identity/test_setIdentityProvider.html (94%)
 rename dom/media/tests/{ => mochitest}/identity/test_setIdentityProviderWithErrors.html (93%)

diff --git a/dom/media/moz.build b/dom/media/moz.build
index 70c72e8f216..04a21a7090a 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -64,8 +64,8 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
-    'tests/identity/mochitest.ini',
     'tests/ipc/mochitest.ini',
+    'tests/mochitest/identity/mochitest.ini',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
diff --git a/dom/media/tests/identity/identityevent.js b/dom/media/tests/mochitest/identity/identityevent.js
similarity index 100%
rename from dom/media/tests/identity/identityevent.js
rename to dom/media/tests/mochitest/identity/identityevent.js
diff --git a/dom/media/tests/identity/idp-proxy.js b/dom/media/tests/mochitest/identity/idp-proxy.js
similarity index 100%
rename from dom/media/tests/identity/idp-proxy.js
rename to dom/media/tests/mochitest/identity/idp-proxy.js
diff --git a/dom/media/tests/identity/idp.html b/dom/media/tests/mochitest/identity/idp.html
similarity index 100%
rename from dom/media/tests/identity/idp.html
rename to dom/media/tests/mochitest/identity/idp.html
diff --git a/dom/media/tests/identity/mochitest.ini b/dom/media/tests/mochitest/identity/mochitest.ini
similarity index 94%
rename from dom/media/tests/identity/mochitest.ini
rename to dom/media/tests/mochitest/identity/mochitest.ini
index 0b92e6a8cef..eca650c2353 100644
--- a/dom/media/tests/identity/mochitest.ini
+++ b/dom/media/tests/mochitest/identity/mochitest.ini
@@ -17,4 +17,4 @@ support-files =
 [test_fingerprints.html]
 
 # Bug 950317: Hack for making a cleanup hook after finishing all WebRTC cases
-[../mochitest/test_zmedia_cleanup.html]
+[../test_zmedia_cleanup.html]
diff --git a/dom/media/tests/identity/test_fingerprints.html b/dom/media/tests/mochitest/identity/test_fingerprints.html
similarity index 100%
rename from dom/media/tests/identity/test_fingerprints.html
rename to dom/media/tests/mochitest/identity/test_fingerprints.html
diff --git a/dom/media/tests/identity/test_getIdentityAssertion.html b/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
similarity index 93%
rename from dom/media/tests/identity/test_getIdentityAssertion.html
rename to dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
index cee3ce6c673..a51823bd467 100644
--- a/dom/media/tests/identity/test_getIdentityAssertion.html
+++ b/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
@@ -3,9 +3,9 @@
 <head>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
 </head>
 <body>
 <pre id="test">
diff --git a/dom/media/tests/identity/test_idpproxy.html b/dom/media/tests/mochitest/identity/test_idpproxy.html
similarity index 100%
rename from dom/media/tests/identity/test_idpproxy.html
rename to dom/media/tests/mochitest/identity/test_idpproxy.html
diff --git a/dom/media/tests/identity/test_peerConnection_peerIdentity.html b/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
similarity index 84%
rename from dom/media/tests/identity/test_peerConnection_peerIdentity.html
rename to dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
index 22199a6a7de..f2eb201a5bb 100644
--- a/dom/media/tests/identity/test_peerConnection_peerIdentity.html
+++ b/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
@@ -4,11 +4,11 @@
   <meta charset="utf-8"/>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
-  <script type="application/javascript" src="../mochitest/blacksilence.js"></script>
-  <script type="application/javascript" src="../mochitest/turnConfig.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
+  <script type="application/javascript" src="../blacksilence.js"></script>
+  <script type="application/javascript" src="../turnConfig.js"></script>
 </head>
 <body>
 <div id="display"></div>
diff --git a/dom/media/tests/identity/test_setIdentityProvider.html b/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
similarity index 94%
rename from dom/media/tests/identity/test_setIdentityProvider.html
rename to dom/media/tests/mochitest/identity/test_setIdentityProvider.html
index 23eb261a6ca..735bfc97de4 100644
--- a/dom/media/tests/identity/test_setIdentityProvider.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
@@ -4,9 +4,9 @@
   <meta charset="utf-8"/>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
   <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>
diff --git a/dom/media/tests/identity/test_setIdentityProviderWithErrors.html b/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
similarity index 93%
rename from dom/media/tests/identity/test_setIdentityProviderWithErrors.html
rename to dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
index 2d7a3028691..45b798ff530 100644
--- a/dom/media/tests/identity/test_setIdentityProviderWithErrors.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
@@ -3,9 +3,9 @@
 <head>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="application/javascript" src="../mochitest/head.js"></script>
-  <script type="application/javascript" src="../mochitest/pc.js"></script>
-  <script type="application/javascript" src="../mochitest/templates.js"></script>
+  <script type="application/javascript" src="../head.js"></script>
+  <script type="application/javascript" src="../pc.js"></script>
+  <script type="application/javascript" src="../templates.js"></script>
   <script type="application/javascript" src="identityevent.js"></script>
 </head>
 <body>

From aae1b96e4d295bc99f9ad02779a4389388f24631 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:29:19 +0300
Subject: [PATCH 25/37] Bug 1085208 - Move dom/media/tests/ipc into
 dom/media/tests/mochitest to force it to run with the other Mochitests. r=jib

--HG--
rename : dom/media/tests/ipc/ipc.json => dom/media/tests/mochitest/ipc/ipc.json
rename : dom/media/tests/ipc/mochitest.ini => dom/media/tests/mochitest/ipc/mochitest.ini
rename : dom/media/tests/ipc/test_ipc.html => dom/media/tests/mochitest/ipc/test_ipc.html
---
 dom/media/moz.build                               | 2 +-
 dom/media/tests/{ => mochitest}/ipc/ipc.json      | 0
 dom/media/tests/{ => mochitest}/ipc/mochitest.ini | 0
 dom/media/tests/{ => mochitest}/ipc/test_ipc.html | 8 +++++---
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename dom/media/tests/{ => mochitest}/ipc/ipc.json (100%)
 rename dom/media/tests/{ => mochitest}/ipc/mochitest.ini (100%)
 rename dom/media/tests/{ => mochitest}/ipc/test_ipc.html (96%)

diff --git a/dom/media/moz.build b/dom/media/moz.build
index 04a21a7090a..6ea8f7faa14 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -64,8 +64,8 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 MOCHITEST_MANIFESTS += [
     'test/mochitest.ini',
-    'tests/ipc/mochitest.ini',
     'tests/mochitest/identity/mochitest.ini',
+    'tests/mochitest/ipc/mochitest.ini',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
diff --git a/dom/media/tests/ipc/ipc.json b/dom/media/tests/mochitest/ipc/ipc.json
similarity index 100%
rename from dom/media/tests/ipc/ipc.json
rename to dom/media/tests/mochitest/ipc/ipc.json
diff --git a/dom/media/tests/ipc/mochitest.ini b/dom/media/tests/mochitest/ipc/mochitest.ini
similarity index 100%
rename from dom/media/tests/ipc/mochitest.ini
rename to dom/media/tests/mochitest/ipc/mochitest.ini
diff --git a/dom/media/tests/ipc/test_ipc.html b/dom/media/tests/mochitest/ipc/test_ipc.html
similarity index 96%
rename from dom/media/tests/ipc/test_ipc.html
rename to dom/media/tests/mochitest/ipc/test_ipc.html
index 7f38044ca54..c510dbf417e 100644
--- a/dom/media/tests/ipc/test_ipc.html
+++ b/dom/media/tests/mochitest/ipc/test_ipc.html
@@ -143,12 +143,14 @@
 
       iframe.addEventListener("mozbrowserloadend", iframeLoadFirst);
 
-      // Strip this filename and one directory level and then add "/mochitest".
+      // Strip the filename and a directory level.
       let href =  window.location.href;
       href = href.substring(0, href.lastIndexOf('/'));
       href = href.substring(0, href.lastIndexOf('/'));
-      let manifest = "tests/dom/media/tests/ipc/ipc.json";
-      iframe.src = href + "/mochitest?consoleLevel=INFO&testManifest=" + manifest;
+
+      href += "?consoleLevel=INFO" +
+              "&testManifest=tests/dom/media/tests/mochitest/ipc/ipc.json";
+      iframe.src = href;
       document.body.appendChild(iframe);
     }
 

From d4426edcb5a4c2c183c0149184e2908d87fe5d3e Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:29:25 +0300
Subject: [PATCH 26/37] Bug 1089184 - Disable test_user_select.html on Android
 for permafailing after being reordered. r=me

---
 dom/base/test/mochitest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index 405013fa9cc..20e2bc32801 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -749,6 +749,6 @@ support-files = file_bug1011748_redirect.sjs file_bug1011748_OK.sjs
 [test_bug1025933.html]
 [test_element.matches.html]
 [test_user_select.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android'
 [test_bug1081686.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s

From 60ab73e637d1af747bae3eda950889c6886b2360 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Sat, 25 Oct 2014 20:36:18 +0300
Subject: [PATCH 27/37] Bug 946065 - Touch CLOBBER

---
 CLOBBER | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLOBBER b/CLOBBER
index 26559302515..c5a00173bcb 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1087560 needs a CLOBBER to stop it from looking in the wrong place for tests
+Bug 946065 needs a CLOBBER

From 9107b16c3b505574a5212416e60b7169cc9c9f2e Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Sat, 25 Oct 2014 15:28:57 -0400
Subject: [PATCH 28/37] Bug 1089199. Fix ANGLE mingw build again

--HG--
extra : rebase_source : 0c87b90882eb5f25a8402deb4f14a2563f6db10e
---
 gfx/angle/src/commit.h            | 4 ++--
 gfx/angle/src/libEGL/moz.build    | 1 -
 gfx/angle/src/libGLESv2/moz.build | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gfx/angle/src/commit.h b/gfx/angle/src/commit.h
index aeacde5d3f6..79707ac91de 100644
--- a/gfx/angle/src/commit.h
+++ b/gfx/angle/src/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "fc329b4537cf"
+#define ANGLE_COMMIT_HASH "7a2ba5a15abc"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2014-10-09 15:05:59 -0400"
+#define ANGLE_COMMIT_DATE "2014-10-25 15:19:56 -0400"
diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
index 08eccbc0ccc..e822acfdba9 100644
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -55,7 +55,6 @@ DISABLE_STL_WRAPPING = True
 
 LOCAL_INCLUDES += [ '../../include', '../../src' ]
 USE_LIBS += [ 'libGLESv2' ]
-EXTRA_DSO_LDOPTS += [ '../libGLESv2/libGLESv2.lib' ]
 
 SharedLibrary('libEGL')
 
diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
index 5c8979a3bcc..d4455a4b181 100644
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -119,7 +119,6 @@ UNIFIED_SOURCES += [
     'renderer/d3d/d3d9/VertexBuffer9.cpp',
     'renderer/d3d/d3d9/VertexDeclarationCache.cpp',
     'renderer/d3d/DynamicHLSL.cpp',
-    'renderer/d3d/HLSLCompiler.cpp',
     'renderer/d3d/ImageD3D.cpp',
     'renderer/d3d/IndexBuffer.cpp',
     'renderer/d3d/IndexDataManager.cpp',
@@ -151,6 +150,7 @@ UNIFIED_SOURCES += [
 SOURCES += [
     '../compiler/translator/glslang_lex.cpp',
     '../compiler/translator/glslang_tab.cpp',
+    'renderer/d3d/HLSLCompiler.cpp',
     'renderer/loadimageSSE2.cpp',
 ]
 SOURCES['renderer/loadimageSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
@@ -216,7 +216,7 @@ LOCAL_INCLUDES += [ '../../include', '../../src' ]
 
 
 if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']:
-  EXTRA_DSO_LDOPTS += [ 'd3d9.lib', 'dxguid.lib' ]
+  OS_LIBS += [ 'd3d9', 'dxguid' ]
 else:
   EXTRA_DSO_LDOPTS += [
     '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']),
@@ -228,5 +228,5 @@ SharedLibrary('libGLESv2')
 RCFILE = SRCDIR + '/libGLESv2.rc'
 DEFFILE = SRCDIR + '/libGLESv2.def'
 
-DEFINES['ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES'] = '{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }'
+SOURCES['renderer/d3d/HLSLCompiler.cpp'].flags += ['-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES=\'{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }\'']
 

From a6940364af5d2df9917432c30298be984ca681ba Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Wed, 22 Oct 2014 16:12:29 +0200
Subject: [PATCH 29/37] Bug 1085356 - Better handling of OSX audio output
 devices switching when SourceMediaStream are present in the MSG. r=jesup

On OSX, when the audio output device changes, the OS will call the audio
callbacks in weird patterns, if at all, during a period of ~1s. If
real-time SourceMediaStreams are present in the MediaStreamGraph, this means
buffering will occur, and the overall latency between the MediaStreamGraph
insertion time, and the actual output time will grow.

To fix this, we detect when the output device changes, and we switch temporarily
to a SystemClockDriver, that will pull from the SourceMediaStream, and simply
discard all input data. Then, when we get audio callbacks called reliably
(basically, when OSX is done switching to the other output), we switch back to
the previous AudioCallbackDriver.

We keep the previous AudioCallbackDriver alive using a self-reference. If an
AudioCallbackDriver has a self-reference, that means it's in a state when a
device is switching, so it's not linked to an MSG per se.
---
 dom/media/GraphDriver.cpp      | 94 +++++++++++++++++++++++++++++++---
 dom/media/GraphDriver.h        | 21 ++++++++
 dom/media/SelfRef.h            | 47 +++++++++++++++++
 dom/media/moz.build            |  1 +
 dom/media/webaudio/AudioNode.h | 31 +----------
 5 files changed, 158 insertions(+), 36 deletions(-)
 create mode 100644 dom/media/SelfRef.h

diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 8a1490eedc3..867181a236c 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -80,7 +80,18 @@ void GraphDriver::SetGraphTime(GraphDriver* aPreviousDriver,
 
 void GraphDriver::SwitchAtNextIteration(GraphDriver* aNextDriver)
 {
-
+  // This is the situation where `mPreviousDriver` is an AudioCallbackDriver
+  // that is switching device, and the graph has found the current driver is not
+  // an AudioCallbackDriver, but tries to switch to a _new_ AudioCallbackDriver
+  // because it found audio has to be output. In this case, simply ignore the
+  // request to switch, since we know we will switch back to the old
+  // AudioCallbackDriver when it has recovered from the device switching.
+  if (aNextDriver->AsAudioCallbackDriver() &&
+      mPreviousDriver &&
+      mPreviousDriver->AsAudioCallbackDriver()->IsSwitchingDevice() &&
+      mPreviousDriver != aNextDriver) {
+    return;
+  }
   LIFECYCLE_LOG("Switching to new driver: %p (%s)",
       aNextDriver, aNextDriver->AsAudioCallbackDriver() ?
       "AudioCallbackDriver" : "SystemClockDriver");
@@ -188,11 +199,15 @@ public:
                     mDriver->mPreviousDriver.get(),
                     mDriver->GraphImpl());
       MOZ_ASSERT(!mDriver->AsAudioCallbackDriver());
-      // Stop and release the previous driver off-main-thread.
-      nsRefPtr<AsyncCubebTask> releaseEvent =
-        new AsyncCubebTask(mDriver->mPreviousDriver->AsAudioCallbackDriver(), AsyncCubebTask::SHUTDOWN);
-      mDriver->mPreviousDriver = nullptr;
-      releaseEvent->Dispatch();
+      // Stop and release the previous driver off-main-thread, but only if we're
+      // not in the situation where we've fallen back to a system clock driver
+      // because the osx audio stack is currently switching output device.
+      if (!mDriver->mPreviousDriver->AsAudioCallbackDriver()->IsSwitchingDevice()) {
+        nsRefPtr<AsyncCubebTask> releaseEvent =
+          new AsyncCubebTask(mDriver->mPreviousDriver->AsAudioCallbackDriver(), AsyncCubebTask::SHUTDOWN);
+        mDriver->mPreviousDriver = nullptr;
+        releaseEvent->Dispatch();
+      }
     } else {
       MonitorAutoLock mon(mDriver->mGraphImpl->GetMonitor());
       MOZ_ASSERT(mDriver->mGraphImpl->MessagesQueued(), "Don't start a graph without messages queued.");
@@ -536,6 +551,9 @@ AudioCallbackDriver::AudioCallbackDriver(MediaStreamGraphImpl* aGraphImpl, dom::
   , mAudioChannel(aChannel)
   , mInCallback(false)
   , mPauseRequested(false)
+#ifdef XP_MACOSX
+  , mCallbackReceivedWhileSwitching(0)
+#endif
 {
   STREAM_LOG(PR_LOG_DEBUG, ("AudioCallbackDriver ctor for graph %p", aGraphImpl));
 }
@@ -768,6 +786,38 @@ AudioCallbackDriver::AutoInCallback::~AutoInCallback() {
   mDriver->mInCallback = false;
 }
 
+#ifdef XP_MACOSX
+bool
+AudioCallbackDriver::OSXDeviceSwitchingWorkaround()
+{
+  MonitorAutoLock mon(GraphImpl()->GetMonitor());
+  if (mSelfReference) {
+    // Apparently, depending on the osx version, on device switch, the
+    // callback is called "some" number of times, and then stops being called,
+    // and then gets called again. 10 is to be safe, it's a low-enough number
+    // of milliseconds anyways (< 100ms)
+    if (mCallbackReceivedWhileSwitching++ >= 10) {
+      // If we have a self reference, we have fallen back temporarily on a
+      // system clock driver, but we just got called back, that means the osx
+      // audio backend has switched to the new device.
+      // Ask the graph to switch back to the previous AudioCallbackDriver
+      // (`this`), and when the graph has effectively switched, we can drop
+      // the self reference and unref the SystemClockDriver we fallen back on.
+      if (GraphImpl()->CurrentDriver() == this) {
+        mSelfReference.Drop(this);
+        mNextDriver = nullptr;
+      } else {
+        GraphImpl()->CurrentDriver()->SwitchAtNextIteration(this);
+      }
+
+    }
+    return true;
+  }
+
+  return false;
+}
+#endif // XP_MACOSX
+
 long
 AudioCallbackDriver::DataCallback(AudioDataValue* aBuffer, long aFrames)
 {
@@ -778,6 +828,13 @@ AudioCallbackDriver::DataCallback(AudioDataValue* aBuffer, long aFrames)
     return aFrames;
   }
 
+#ifdef XP_MACOSX
+  if (OSXDeviceSwitchingWorkaround()) {
+    PodZero(aBuffer, aFrames * mGraphImpl->AudioChannelCount());
+    return aFrames;
+  }
+#endif
+
 #ifdef DEBUG
   // DebugOnly<> doesn't work here... it forces an initialization that will cause
   // mInCallback to be set back to false before we exit the statement.  Do it by
@@ -958,6 +1015,31 @@ void
 AudioCallbackDriver::DeviceChangedCallback() {
   MonitorAutoLock mon(mGraphImpl->GetMonitor());
   PanOutputIfNeeded(mMicrophoneActive);
+  // On OSX, changing the output device causes the audio thread to no call the
+  // audio callback, so we're unable to process real-time input data, and this
+  // results in latency building up.
+  // We switch to a system driver until audio callbacks are called again, so we
+  // still pull from the input stream, so that everything works apart from the
+  // audio output.
+#ifdef XP_MACOSX
+  // Don't bother doing the device switching dance if the graph is not RUNNING
+  // (starting up, shutting down), because we haven't started pulling from the
+  // SourceMediaStream.
+  if (!GraphImpl()->Running()) {
+    return;
+  }
+
+  if (mSelfReference) {
+    return;
+  }
+  mSelfReference.Take(this);
+  mCallbackReceivedWhileSwitching = 0;
+  mNextDriver = new SystemClockDriver(GraphImpl());
+  mNextDriver->SetGraphTime(this, mIterationStart, mIterationEnd,
+                            mStateComputedTime, mNextStateComputedTime);
+  mGraphImpl->SetCurrentDriver(mNextDriver);
+  mNextDriver->Start();
+#endif
 }
 
 void
diff --git a/dom/media/GraphDriver.h b/dom/media/GraphDriver.h
index 108cbce4661..578e47f8325 100644
--- a/dom/media/GraphDriver.h
+++ b/dom/media/GraphDriver.h
@@ -11,6 +11,7 @@
 #include "AudioBufferUtils.h"
 #include "AudioMixer.h"
 #include "AudioSegment.h"
+#include "SelfRef.h"
 #include "mozilla/Atomics.h"
 
 struct cubeb_stream;
@@ -391,6 +392,14 @@ public:
     return this;
   }
 
+  bool IsSwitchingDevice() {
+#ifdef XP_MACOSX
+    return mSelfReference;
+#else
+    return false;
+#endif
+  }
+
   /**
    * Whether the audio callback is processing. This is for asserting only.
    */
@@ -472,6 +481,18 @@ private:
    * True if microphone is being used by this process. This is synchronized by
    * the graph's monitor. */
   bool mMicrophoneActive;
+
+#ifdef XP_MACOSX
+  /* Implements the workaround for the osx audio stack when changing output
+   * devices. See comments in .cpp */
+  bool OSXDeviceSwitchingWorkaround();
+  /* Self-reference that keep this driver alive when switching output audio
+   * device and making the graph running temporarily off a SystemClockDriver.  */
+  SelfReference<AudioCallbackDriver> mSelfReference;
+  /* While switching devices, we keep track of the number of callbacks received,
+   * since OSX seems to still call us _sometimes_. */
+  uint32_t mCallbackReceivedWhileSwitching;
+#endif
 };
 
 class AsyncCubebTask : public nsRunnable
diff --git a/dom/media/SelfRef.h b/dom/media/SelfRef.h
new file mode 100644
index 00000000000..34961468a81
--- /dev/null
+++ b/dom/media/SelfRef.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef SELF_REF_H
+#define SELF_REF_H
+
+#include "mozilla/Attributes.h"
+
+namespace mozilla {
+
+template<class T>
+class SelfReference {
+public:
+  SelfReference() : mHeld(false) {}
+  ~SelfReference()
+  {
+    NS_ASSERTION(!mHeld, "Forgot to drop the self reference?");
+  }
+
+  void Take(T* t)
+  {
+    if (!mHeld) {
+      mHeld = true;
+      t->AddRef();
+    }
+  }
+  void Drop(T* t)
+  {
+    if (mHeld) {
+      mHeld = false;
+      t->Release();
+    }
+  }
+
+  operator bool() const { return mHeld; }
+
+  SelfReference(const SelfReference& aOther) MOZ_DELETE;
+  void operator=(const SelfReference& aOther) MOZ_DELETE;
+private:
+  bool mHeld;
+};
+} // mozilla
+
+#endif // SELF_REF_H
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 6ea8f7faa14..3d68a579b11 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -116,6 +116,7 @@ EXPORTS += [
     'MP3FrameParser.h',
     'nsIDocumentActivity.h',
     'RtspMediaResource.h',
+    'SelfRef.h',
     'SharedBuffer.h',
     'SharedThreadPool.h',
     'StreamBuffer.h',
diff --git a/dom/media/webaudio/AudioNode.h b/dom/media/webaudio/AudioNode.h
index 04263ba918a..8d43827f5a7 100644
--- a/dom/media/webaudio/AudioNode.h
+++ b/dom/media/webaudio/AudioNode.h
@@ -17,6 +17,7 @@
 #include "WebAudioUtils.h"
 #include "mozilla/MemoryReporting.h"
 #include "nsWeakReference.h"
+#include "SelfRef.h"
 
 namespace mozilla {
 
@@ -28,36 +29,6 @@ class AudioParam;
 class AudioParamTimeline;
 struct ThreeDPoint;
 
-template<class T>
-class SelfReference {
-public:
-  SelfReference() : mHeld(false) {}
-  ~SelfReference()
-  {
-    NS_ASSERTION(!mHeld, "Forgot to drop the self reference?");
-  }
-
-  void Take(T* t)
-  {
-    if (!mHeld) {
-      mHeld = true;
-      t->AddRef();
-    }
-  }
-  void Drop(T* t)
-  {
-    if (mHeld) {
-      mHeld = false;
-      t->Release();
-    }
-  }
-
-  operator bool() const { return mHeld; }
-
-private:
-  bool mHeld;
-};
-
 /**
  * The DOM object representing a Web Audio AudioNode.
  *

From f51afa91e208c72c9eeaa56c6a7fd55add730978 Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 22 Oct 2014 16:56:54 +0200
Subject: [PATCH 30/37] Bug 10897368: webrtc & PulseAudio: don't crash in case
 of buffer holes r=jesup

---
 .../audio_device/linux/audio_device_pulse_linux.cc   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index 43c74b4ac9c..559b6ce1834 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -2473,6 +2473,18 @@ void AudioDeviceLinuxPulse::PaStreamReadCallbackHandler()
         return;
     }
 
+    // PulseAudio record streams can have holes (for reasons not entirely clear
+    // to the PA developers themselves). Since version 4 of PA, these are passed
+    // over to the application (us), signaled by a non-zero sample data size
+    // (the size of the hole) and a NULL sample data.
+    // We handle stream holes as recommended by PulseAudio, i.e. by skipping
+    // it, which is done with a stream drop.
+    if (_tempSampleDataSize && !_tempSampleData) {
+        LATE(pa_stream_drop)(_recStream);
+        _tempSampleDataSize = 0; // reset
+        return;
+    }
+
     // Since we consume the data asynchronously on a different thread, we have
     // to temporarily disable the read callback or else Pulse will call it
     // continuously until we consume the data. We re-enable it below

From d3bd18649654749eceb8df908f26fe150e3f8a26 Mon Sep 17 00:00:00 2001
From: Randell Jesup <rjesup@jesup.org>
Date: Sat, 25 Oct 2014 17:36:14 -0400
Subject: [PATCH 31/37] Backed out changeset ca8385b7e5a3 (bug 10897368)

---
 .../audio_device/linux/audio_device_pulse_linux.cc   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index 559b6ce1834..43c74b4ac9c 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -2473,18 +2473,6 @@ void AudioDeviceLinuxPulse::PaStreamReadCallbackHandler()
         return;
     }
 
-    // PulseAudio record streams can have holes (for reasons not entirely clear
-    // to the PA developers themselves). Since version 4 of PA, these are passed
-    // over to the application (us), signaled by a non-zero sample data size
-    // (the size of the hole) and a NULL sample data.
-    // We handle stream holes as recommended by PulseAudio, i.e. by skipping
-    // it, which is done with a stream drop.
-    if (_tempSampleDataSize && !_tempSampleData) {
-        LATE(pa_stream_drop)(_recStream);
-        _tempSampleDataSize = 0; // reset
-        return;
-    }
-
     // Since we consume the data asynchronously on a different thread, we have
     // to temporarily disable the read callback or else Pulse will call it
     // continuously until we consume the data. We re-enable it below

From a8a3ca6634517a127c0624c44c0861d0520dce8e Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 22 Oct 2014 16:56:54 +0200
Subject: [PATCH 32/37] Bug 1087368: webrtc & PulseAudio: don't crash in case
 of buffer holes r=jesup DONTBUILD

---
 .../audio_device/linux/audio_device_pulse_linux.cc   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
index 43c74b4ac9c..559b6ce1834 100644
--- a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc
@@ -2473,6 +2473,18 @@ void AudioDeviceLinuxPulse::PaStreamReadCallbackHandler()
         return;
     }
 
+    // PulseAudio record streams can have holes (for reasons not entirely clear
+    // to the PA developers themselves). Since version 4 of PA, these are passed
+    // over to the application (us), signaled by a non-zero sample data size
+    // (the size of the hole) and a NULL sample data.
+    // We handle stream holes as recommended by PulseAudio, i.e. by skipping
+    // it, which is done with a stream drop.
+    if (_tempSampleDataSize && !_tempSampleData) {
+        LATE(pa_stream_drop)(_recStream);
+        _tempSampleDataSize = 0; // reset
+        return;
+    }
+
     // Since we consume the data asynchronously on a different thread, we have
     // to temporarily disable the read callback or else Pulse will call it
     // continuously until we consume the data. We re-enable it below

From 6cc714a93b21a30b2f8500ac3b91e71ba7db2b75 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Sun, 26 Oct 2014 01:15:25 +0100
Subject: [PATCH 33/37] Bug 1084322 - Allow reftest analyzer to accept pasting
 of non-raw log output from treeherder. r=dbaron

---
 layout/tools/reftest/reftest-analyzer.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml
index 0a03564d7ae..750c4612ced 100644
--- a/layout/tools/reftest/reftest-analyzer.xhtml
+++ b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -245,7 +245,7 @@ function process_log(contents) {
         });
       continue;
     }
-    match = line.match(/^  IMAGE([^:]*): (.*)$/);
+    match = line.match(/^(?:  |)IMAGE ([^:]*): (data:.*)$/);
     if (match) {
       var item = gTestItems[gTestItems.length - 1];
       item.images.push(match[2]);

From 624f27b684bf60a20573e73b72d39774c4894829 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Sun, 26 Oct 2014 01:15:25 +0100
Subject: [PATCH 34/37] Bug 1085529, part 1 - Add an AutoPopClips helper to
 Moz2D. r=mattwoodrow

---
 gfx/2d/Helpers.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/gfx/2d/Helpers.h b/gfx/2d/Helpers.h
index ca51d04af4c..11c7eec5d94 100644
--- a/gfx/2d/Helpers.h
+++ b/gfx/2d/Helpers.h
@@ -45,6 +45,52 @@ class AutoRestoreTransform
   Matrix mOldTransform;
 };
 
+class AutoPopClips
+{
+public:
+  explicit AutoPopClips(DrawTarget *aTarget)
+    : mDrawTarget(aTarget)
+    , mPushCount(0)
+  {
+    MOZ_ASSERT(mDrawTarget);
+  }
+
+  ~AutoPopClips()
+  {
+    PopAll();
+  }
+
+  void PushClip(const Path *aPath)
+  {
+    mDrawTarget->PushClip(aPath);
+    ++mPushCount;
+  }
+
+  void PushClipRect(const Rect &aRect)
+  {
+    mDrawTarget->PushClipRect(aRect);
+    ++mPushCount;
+  }
+
+  void PopClip()
+  {
+    MOZ_ASSERT(mPushCount > 0);
+    mDrawTarget->PopClip();
+    --mPushCount;
+  }
+
+  void PopAll()
+  {
+    while (mPushCount-- > 0) {
+      mDrawTarget->PopClip();
+    }
+  }
+
+private:
+  RefPtr<DrawTarget> mDrawTarget;
+  int32_t mPushCount;
+};
+
 } // namespace gfx
 } // namespace mozilla
 

From 075af13f32e0afdfa0d891863ce9fd629562a0a1 Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Sun, 26 Oct 2014 01:15:26 +0100
Subject: [PATCH 35/37] Bug 1085529, part 2 - Port
 nsCSSRendering::PaintDecorationLine() to Moz2D. r=mattwoodrow

---
 layout/base/nsCSSRendering.cpp                | 174 ++++++++----------
 layout/base/nsCSSRendering.h                  |  22 ++-
 layout/generic/nsTextFrame.cpp                |   7 +-
 .../test/test_selection_underline.html        |   4 +
 layout/xul/nsTextBoxFrame.cpp                 |  12 +-
 5 files changed, 113 insertions(+), 106 deletions(-)

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index dfc7d6591b5..d8cafc58638 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -8,8 +8,11 @@
 
 #include <ctime>
 
+#include "gfx2DGlue.h"
+#include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Helpers.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/MathAlgorithms.h"
 
@@ -4014,13 +4017,13 @@ nsCSSRendering::DrawTableBorderSegment(nsRenderingContext&     aContext,
 
 // End table border-collapsing section
 
-gfxRect
+Rect
 nsCSSRendering::ExpandPaintingRectForDecorationLine(
                   nsIFrame* aFrame,
                   const uint8_t aStyle,
-                  const gfxRect& aClippedRect,
-                  const gfxFloat aICoordInFrame,
-                  const gfxFloat aCycleLength,
+                  const Rect& aClippedRect,
+                  const Float aICoordInFrame,
+                  const Float aCycleLength,
                   bool aVertical)
 {
   switch (aStyle) {
@@ -4049,12 +4052,12 @@ nsCSSRendering::ExpandPaintingRectForDecorationLine(
   NS_ENSURE_TRUE(block, aClippedRect);
 
   nsPresContext *pc = aFrame->PresContext();
-  gfxFloat framePosInBlock = pc->AppUnitsToGfxUnits(framePosInBlockAppUnits);
+  Float framePosInBlock = Float(pc->AppUnitsToGfxUnits(framePosInBlockAppUnits));
   int32_t rectPosInBlock =
     int32_t(NS_round(framePosInBlock + aICoordInFrame));
   int32_t extraStartEdge =
     rectPosInBlock - (rectPosInBlock / int32_t(aCycleLength) * aCycleLength);
-  gfxRect rect(aClippedRect);
+  Rect rect(aClippedRect);
   if (aVertical) {
     rect.y -= extraStartEdge;
     rect.height += extraStartEdge;
@@ -4067,11 +4070,11 @@ nsCSSRendering::ExpandPaintingRectForDecorationLine(
 
 void
 nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
-                                    gfxContext* aGfxContext,
-                                    const gfxRect& aDirtyRect,
+                                    DrawTarget& aDrawTarget,
+                                    const Rect& aDirtyRect,
                                     const nscolor aColor,
                                     const gfxPoint& aPt,
-                                    const gfxFloat aICoordInFrame,
+                                    const Float aICoordInFrame,
                                     const gfxSize& aLineSize,
                                     const gfxFloat aAscent,
                                     const gfxFloat aOffset,
@@ -4082,10 +4085,10 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
 {
   NS_ASSERTION(aStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE, "aStyle is none");
 
-  gfxRect rect =
+  Rect rect = ToRect(
     GetTextDecorationRectInternal(aPt, aLineSize, aAscent, aOffset,
                                   aDecoration, aStyle, aVertical,
-                                  aDescentLimit);
+                                  aDescentLimit));
   if (rect.IsEmpty() || !rect.Intersects(aDirtyRect)) {
     return;
   }
@@ -4097,26 +4100,28 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
     return;
   }
 
-  gfxFloat lineThickness = std::max(NS_round(aLineSize.height), 1.0);
-  bool contextIsSaved = false;
+  Float lineThickness = std::max(NS_round(aLineSize.height), 1.0);
 
-  gfxFloat oldLineWidth;
-  nsRefPtr<gfxPattern> oldPattern;
+  ColorPattern color(ToDeviceColor(aColor));
+  StrokeOptions strokeOptions(lineThickness);
+  DrawOptions drawOptions;
+
+  Float dash[2];
+
+  AutoPopClips autoPopClips(&aDrawTarget);
 
   switch (aStyle) {
     case NS_STYLE_TEXT_DECORATION_STYLE_SOLID:
     case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE:
-      oldLineWidth = aGfxContext->CurrentLineWidth();
-      oldPattern = aGfxContext->GetPattern();
       break;
     case NS_STYLE_TEXT_DECORATION_STYLE_DASHED: {
-      aGfxContext->Save();
-      contextIsSaved = true;
-      aGfxContext->Clip(rect);
-      gfxFloat dashWidth = lineThickness * DOT_LENGTH * DASH_LENGTH;
-      gfxFloat dash[2] = { dashWidth, dashWidth };
-      aGfxContext->SetLineCap(gfxContext::LINE_CAP_BUTT);
-      aGfxContext->SetDash(dash, 2, 0.0);
+      autoPopClips.PushClipRect(rect);
+      Float dashWidth = lineThickness * DOT_LENGTH * DASH_LENGTH;
+      dash[0] = dashWidth;
+      dash[1] = dashWidth;
+      strokeOptions.mDashPattern = dash;
+      strokeOptions.mDashLength = MOZ_ARRAY_LENGTH(dash);
+      strokeOptions.mLineCap = CapStyle::BUTT;
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame,
                                                  dashWidth * 2,
@@ -4126,20 +4131,18 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_DOTTED: {
-      aGfxContext->Save();
-      contextIsSaved = true;
-      aGfxContext->Clip(rect);
-      gfxFloat dashWidth = lineThickness * DOT_LENGTH;
-      gfxFloat dash[2];
+      autoPopClips.PushClipRect(rect);
+      Float dashWidth = lineThickness * DOT_LENGTH;
       if (lineThickness > 2.0) {
-        dash[0] = 0.0;
-        dash[1] = dashWidth * 2.0;
-        aGfxContext->SetLineCap(gfxContext::LINE_CAP_ROUND);
+        dash[0] = 0.f;
+        dash[1] = dashWidth * 2.f;
+        strokeOptions.mLineCap = CapStyle::ROUND;
       } else {
         dash[0] = dashWidth;
         dash[1] = dashWidth;
       }
-      aGfxContext->SetDash(dash, 2, 0.0);
+      strokeOptions.mDashPattern = dash;
+      strokeOptions.mDashLength = MOZ_ARRAY_LENGTH(dash);
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame,
                                                  dashWidth * 2,
@@ -4149,16 +4152,14 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_WAVY:
-      aGfxContext->Save();
-      contextIsSaved = true;
-      aGfxContext->Clip(rect);
+      autoPopClips.PushClipRect(rect);
       if (lineThickness > 2.0) {
-        aGfxContext->SetAntialiasMode(AntialiasMode::SUBPIXEL);
+        drawOptions.mAntialiasMode = AntialiasMode::SUBPIXEL;
       } else {
         // Don't use anti-aliasing here.  Because looks like lighter color wavy
         // line at this case.  And probably, users don't think the
         // non-anti-aliased wavy line is not pretty.
-        aGfxContext->SetAntialiasMode(AntialiasMode::NONE);
+        drawOptions.mAntialiasMode = AntialiasMode::NONE;
       }
       break;
     default:
@@ -4169,23 +4170,16 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
   // The y position should be set to the middle of the line.
   rect.y += lineThickness / 2;
 
-  aGfxContext->SetColor(gfxRGBA(aColor));
-  aGfxContext->SetLineWidth(lineThickness);
   switch (aStyle) {
     case NS_STYLE_TEXT_DECORATION_STYLE_SOLID:
     case NS_STYLE_TEXT_DECORATION_STYLE_DOTTED:
-    case NS_STYLE_TEXT_DECORATION_STYLE_DASHED:
-      aGfxContext->NewPath();
-      if (aVertical) {
-        aGfxContext->MoveTo(rect.TopLeft());
-        aGfxContext->LineTo(rect.BottomLeft());
-      } else {
-        aGfxContext->MoveTo(rect.TopLeft());
-        aGfxContext->LineTo(rect.TopRight());
-      }
-      aGfxContext->Stroke();
-      break;
-    case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE:
+    case NS_STYLE_TEXT_DECORATION_STYLE_DASHED: {
+      Point p1 = rect.TopLeft();
+      Point p2 = aVertical ? rect.BottomLeft() : rect.TopRight();
+      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
+      return;
+    }
+    case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE: {
       /**
        *  We are drawing double line as:
        *
@@ -4200,22 +4194,21 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
        * |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| v
        * +-------------------------------------------+
        */
-      aGfxContext->NewPath();
+      Point p1 = rect.TopLeft();
+      Point p2 = aVertical ? rect.BottomLeft() : rect.TopRight();
+      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
+
       if (aVertical) {
-        aGfxContext->MoveTo(rect.TopLeft());
-        aGfxContext->LineTo(rect.BottomLeft());
         rect.width -= lineThickness;
-        aGfxContext->MoveTo(rect.TopRight());
-        aGfxContext->LineTo(rect.BottomRight());
       } else {
-        aGfxContext->MoveTo(rect.TopLeft());
-        aGfxContext->LineTo(rect.TopRight());
         rect.height -= lineThickness;
-        aGfxContext->MoveTo(rect.BottomLeft());
-        aGfxContext->LineTo(rect.BottomRight());
       }
-      aGfxContext->Stroke();
-      break;
+
+      p1 = aVertical ? rect.TopRight() : rect.BottomLeft();
+      p2 = rect.BottomRight();
+      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
+      return;
+    }
     case NS_STYLE_TEXT_DECORATION_STYLE_WAVY: {
       /**
        *  We are drawing wavy line as:
@@ -4249,23 +4242,23 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
        * directions in the above description.
        */
 
-      gfxFloat& rectICoord = aVertical ? rect.y : rect.x;
-      gfxFloat& rectISize = aVertical ? rect.height : rect.width;
-      const gfxFloat rectBSize = aVertical ? rect.width : rect.height;
+      Float& rectICoord = aVertical ? rect.y : rect.x;
+      Float& rectISize = aVertical ? rect.height : rect.width;
+      const Float rectBSize = aVertical ? rect.width : rect.height;
 
-      const gfxFloat adv = rectBSize - lineThickness;
-      const gfxFloat flatLengthAtVertex =
+      const Float adv = rectBSize - lineThickness;
+      const Float flatLengthAtVertex =
         std::max((lineThickness - 1.0) * 2.0, 1.0);
 
       // Align the start of wavy lines to the nearest ancestor block.
-      const gfxFloat cycleLength = 2 * (adv + flatLengthAtVertex);
+      const Float cycleLength = 2 * (adv + flatLengthAtVertex);
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame, cycleLength,
                                                  aVertical);
       // figure out if we can trim whole cycles from the left and right edges
       // of the line, to try and avoid creating an unnecessarily long and
       // complex path
-      const gfxFloat dirtyRectICoord = aVertical ? aDirtyRect.y : aDirtyRect.x;
+      const Float dirtyRectICoord = aVertical ? aDirtyRect.y : aDirtyRect.x;
       int32_t skipCycles = floor((dirtyRectICoord - rectICoord) / cycleLength);
       if (skipCycles > 0) {
         rectICoord += skipCycles * cycleLength;
@@ -4273,28 +4266,29 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       }
 
       rectICoord += lineThickness / 2.0;
-      gfxPoint pt(rect.TopLeft());
-      gfxFloat& ptICoord = aVertical ? pt.y : pt.x;
-      gfxFloat& ptBCoord = aVertical ? pt.x : pt.y;
+      Point pt(rect.TopLeft());
+      Float& ptICoord = aVertical ? pt.y : pt.x;
+      Float& ptBCoord = aVertical ? pt.x : pt.y;
       if (aVertical) {
         ptBCoord += adv + lineThickness / 2.0;
       }
-      gfxFloat iCoordLimit = ptICoord + rectISize + lineThickness;
+      Float iCoordLimit = ptICoord + rectISize + lineThickness;
 
-      const gfxFloat dirtyRectIMost = aVertical ?
+      const Float dirtyRectIMost = aVertical ?
         aDirtyRect.YMost() : aDirtyRect.XMost();
       skipCycles = floor((iCoordLimit - dirtyRectIMost) / cycleLength);
       if (skipCycles > 0) {
         iCoordLimit -= skipCycles * cycleLength;
       }
 
-      aGfxContext->NewPath();
+      RefPtr<PathBuilder> builder = aDrawTarget.CreatePathBuilder();
+      RefPtr<Path> path;
 
       ptICoord -= lineThickness;
-      aGfxContext->MoveTo(pt); // 1
+      builder->MoveTo(pt); // 1
 
       ptICoord = rectICoord;
-      aGfxContext->LineTo(pt); // 2
+      builder->LineTo(pt); // 2
 
       // In vertical mode, to go "down" relative to the text we need to
       // decrease the block coordinate, whereas in horizontal we increase
@@ -4305,34 +4299,28 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
         if (++iter > 1000) {
           // stroke the current path and start again, to avoid pathological
           // behavior in cairo with huge numbers of path segments
-          aGfxContext->Stroke();
-          aGfxContext->NewPath();
-          aGfxContext->MoveTo(pt);
+          path = builder->Finish();
+          aDrawTarget.Stroke(path, color, strokeOptions, drawOptions);
+          builder = aDrawTarget.CreatePathBuilder();
+          builder->MoveTo(pt);
           iter = 0;
         }
         ptICoord += adv;
         ptBCoord += goDown ? adv : -adv;
 
-        aGfxContext->LineTo(pt); // 3 and 5
+        builder->LineTo(pt); // 3 and 5
 
         ptICoord += flatLengthAtVertex;
-        aGfxContext->LineTo(pt); // 4 and 6
+        builder->LineTo(pt); // 4 and 6
 
         goDown = !goDown;
       }
-      aGfxContext->Stroke();
-      break;
+      path = builder->Finish();
+      aDrawTarget.Stroke(path, color, strokeOptions, drawOptions);
+      return;
     }
     default:
       NS_ERROR("Invalid style value!");
-      break;
-  }
-
-  if (contextIsSaved) {
-    aGfxContext->Restore();
-  } else {
-    aGfxContext->SetPattern(oldPattern);
-    aGfxContext->SetLineWidth(oldLineWidth);
   }
 }
 
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index 0d45bd6fa83..9fce2f149d3 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -10,6 +10,7 @@
 
 #include "gfxBlur.h"
 #include "gfxContext.h"
+#include "mozilla/gfx/Rect.h"
 #include "nsLayoutUtils.h"
 #include "nsStyleStruct.h"
 #include "nsIFrame.h"
@@ -21,6 +22,10 @@ class nsRenderingContext;
 
 namespace mozilla {
 
+namespace gfx {
+class DrawTarget;
+}
+
 namespace layers {
 class ImageContainer;
 }
@@ -311,6 +316,9 @@ struct nsBackgroundLayerState {
 };
 
 struct nsCSSRendering {
+  typedef mozilla::gfx::DrawTarget DrawTarget;
+  typedef mozilla::gfx::Float Float;
+  typedef mozilla::gfx::Rect Rect;
   typedef nsIFrame::Sides Sides;
 
   /**
@@ -669,11 +677,11 @@ struct nsCSSRendering {
    *                              used for strikeout line and overline too.
    */
   static void PaintDecorationLine(nsIFrame* aFrame,
-                                  gfxContext* aGfxContext,
-                                  const gfxRect& aDirtyRect,
+                                  DrawTarget& aDrawTarget,
+                                  const Rect& aDirtyRect,
                                   const nscolor aColor,
                                   const gfxPoint& aPt,
-                                  const gfxFloat aICoordInFrame,
+                                  const Float aICoordInFrame,
                                   const gfxSize& aLineSize,
                                   const gfxFloat aAscent,
                                   const gfxFloat aOffset,
@@ -798,12 +806,12 @@ protected:
    *                              and aClippedRect.pos.
    *     @param aCycleLength      the width of one cycle of the line style.
    */
-  static gfxRect ExpandPaintingRectForDecorationLine(
+  static Rect ExpandPaintingRectForDecorationLine(
                    nsIFrame* aFrame,
                    const uint8_t aStyle,
-                   const gfxRect &aClippedRect,
-                   const gfxFloat aICoordInFrame,
-                   const gfxFloat aCycleLength,
+                   const Rect &aClippedRect,
+                   const Float aICoordInFrame,
+                   const Float aCycleLength,
                    bool aVertical);
 };
 
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index fd8e41a4144..13b254e3e37 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -7,6 +7,7 @@
 
 #include "nsTextFrame.h"
 
+#include "gfx2DGlue.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
@@ -88,6 +89,7 @@
 
 using namespace mozilla;
 using namespace mozilla::dom;
+using namespace mozilla::gfx;
 
 struct TabWidth {
   TabWidth(uint32_t aOffset, uint32_t aWidth)
@@ -5154,8 +5156,9 @@ PaintDecorationLine(nsIFrame* aFrame,
       aCallbacks->NotifySelectionDecorationLinePathEmitted();
     }
   } else {
-    nsCSSRendering::PaintDecorationLine(aFrame, aCtx, aDirtyRect, lineColor,
-      aPt, aICoordInFrame, aLineSize, aAscent, aOffset, aDecoration, aStyle,
+    nsCSSRendering::PaintDecorationLine(aFrame, *aCtx->GetDrawTarget(),
+                                        ToRect(aDirtyRect), lineColor,
+      aPt, Float(aICoordInFrame), aLineSize, aAscent, aOffset, aDecoration, aStyle,
       aVertical, aDescentLimit);
   }
 }
diff --git a/layout/generic/test/test_selection_underline.html b/layout/generic/test/test_selection_underline.html
index c2b65c401d0..4112e114e5b 100644
--- a/layout/generic/test/test_selection_underline.html
+++ b/layout/generic/test/test_selection_underline.html
@@ -262,6 +262,10 @@ function doTest(aTest)
         aTest.decoration.style == kDecorationStyleWavy) {
       todo(false, "Rendering of" + description);
     } else {
+      var fuzz = null; // no fuzz
+      if (navigator.userAgent.indexOf("Windows NT 6.2") > -1) { // Win8
+        fuzz = { maxDifference: 1, numDifferentPixels: 200 };
+      }
       assertSnapshots(result.snapshot, reference.snapshot, true,
                       null /*no fuzz*/, description, "");
     }
diff --git a/layout/xul/nsTextBoxFrame.cpp b/layout/xul/nsTextBoxFrame.cpp
index dc01d3236f6..da28522daef 100644
--- a/layout/xul/nsTextBoxFrame.cpp
+++ b/layout/xul/nsTextBoxFrame.cpp
@@ -5,6 +5,7 @@
 
 #include "nsTextBoxFrame.h"
 
+#include "gfx2DGlue.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
 #include "nsFontMetrics.h"
@@ -467,7 +468,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
                 presContext->AppUnitsToGfxUnits(aTextRect.y));
     gfxFloat width = presContext->AppUnitsToGfxUnits(aTextRect.width);
     gfxFloat ascentPixel = presContext->AppUnitsToGfxUnits(ascent);
-    gfxFloat xInFrame = PresContext()->AppUnitsToGfxUnits(mTextDrawRect.x);
+    Float xInFrame = Float(PresContext()->AppUnitsToGfxUnits(mTextDrawRect.x));
     gfxRect dirtyRect(presContext->AppUnitsToGfxUnits(aDirtyRect));
 
     // Underlines are drawn before overlines, and both before the text
@@ -482,7 +483,8 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
       if ((decorations & NS_FONT_DECORATION_UNDERLINE) &&
           underStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
-        nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, underColor,
+        nsCSSRendering::PaintDecorationLine(this, *drawTarget,
+                                            ToRect(dirtyRect), underColor,
                           pt, xInFrame, gfxSize(width, sizePixel),
                           ascentPixel, offsetPixel,
                           NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, underStyle,
@@ -490,7 +492,8 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       }
       if ((decorations & NS_FONT_DECORATION_OVERLINE) &&
           overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
-        nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, overColor,
+        nsCSSRendering::PaintDecorationLine(this, *drawTarget,
+                                            ToRect(dirtyRect), overColor,
                           pt, xInFrame, gfxSize(width, sizePixel),
                           ascentPixel, ascentPixel,
                           NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, overStyle,
@@ -572,7 +575,8 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       fontMet->GetStrikeout(offset, size);
       gfxFloat offsetPixel = presContext->AppUnitsToGfxUnits(offset);
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
-      nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, strikeColor,
+      nsCSSRendering::PaintDecorationLine(this, *drawTarget, ToRect(dirtyRect),
+                                          strikeColor,
                         pt, xInFrame, gfxSize(width, sizePixel), ascentPixel,
                         offsetPixel, NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
                         strikeStyle, vertical);

From a88b0a0fb8659549b8bc490f6ed94cf48a31f465 Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Fri, 24 Oct 2014 16:19:40 -0400
Subject: [PATCH 36/37] bug 1088850 - disable http/1 framing enforcement from
 bug 237623 r=bagder

---
 modules/libpref/init/all.js                   |  2 ++
 netwerk/protocol/http/nsHttpHandler.cpp       |  8 +++++
 netwerk/protocol/http/nsHttpHandler.h         |  7 ++++
 netwerk/protocol/http/nsHttpTransaction.cpp   | 15 ++++++--
 .../test/unit/test_content_length_underrun.js | 36 +++++++++++++++++++
 netwerk/test/unit/test_gzipped_206.js         |  9 ++++-
 ...artial_response_entry_size_smart_shrink.js |  8 ++++-
 .../test/unit/common_test_Download.js         |  8 +++++
 8 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index ab9aa16c93d..957206925b0 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1276,6 +1276,8 @@ pref("network.http.tcp_keepalive.short_lived_idle_time", 10);
 pref("network.http.tcp_keepalive.long_lived_connections", true);
 pref("network.http.tcp_keepalive.long_lived_idle_time", 600);
 
+pref("network.http.enforce-framing.http1", false);
+
 // default values for FTP
 // in a DSCP environment this should be 40 (0x28, or AF11), per RFC-4594,
 // Section 4.8 "High-Throughput Data Service Class", and 80 (0x50, or AF22)
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 1b9aece0404..c563f22fd34 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -205,6 +205,7 @@ nsHttpHandler::nsHttpHandler()
     , mTCPKeepaliveShortLivedIdleTimeS(10)
     , mTCPKeepaliveLongLivedEnabled(false)
     , mTCPKeepaliveLongLivedIdleTimeS(600)
+    , mEnforceH1Framing(false)
 {
 #if defined(PR_LOGGING)
     gHttpLog = PR_NewLogModule("nsHttp");
@@ -1498,6 +1499,13 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
                                                       1, kMaxTCPKeepIdle);
     }
 
+    if (PREF_CHANGED(HTTP_PREF("enforce-framing.http1"))) {
+        rv = prefs->GetBoolPref(HTTP_PREF("enforce-framing.http1"), &cVar);
+        if (NS_SUCCEEDED(rv)) {
+            mEnforceH1Framing = cVar;
+        }
+    }
+
     // Enable HTTP response timeout if TCP Keepalives are disabled.
     mResponseTimeoutEnabled = !mTCPKeepaliveShortLivedEnabled &&
                               !mTCPKeepaliveLongLivedEnabled;
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index babfd87aec9..5d4c0bc8fa4 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -150,6 +150,9 @@ public:
       return mTCPKeepaliveLongLivedIdleTimeS;
     }
 
+    // returns the network.http.enforce-framing.http1 preference
+    bool GetEnforceH1Framing() { return mEnforceH1Framing; }
+
     nsHttpAuthCache     *AuthCache(bool aPrivate) {
         return aPrivate ? &mPrivateAuthCache : &mAuthCache;
     }
@@ -522,6 +525,10 @@ private:
     // Time (secs) before first keepalive probe; between successful probes.
     int32_t mTCPKeepaliveLongLivedIdleTimeS;
 
+    // if true, generate NS_ERROR_PARTIAL_TRANSFER for h1 responses with
+    // incorrect content lengths or malformed chunked encodings
+    bool mEnforceH1Framing;
+
 private:
     // For Rate Pacing Certain Network Events. Only assign this pointer on
     // socket thread.
diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp
index 98ee72584e5..c87b9cdc98d 100644
--- a/netwerk/protocol/http/nsHttpTransaction.cpp
+++ b/netwerk/protocol/http/nsHttpTransaction.cpp
@@ -890,13 +890,22 @@ nsHttpTransaction::Close(nsresult reason)
     }
 
     if ((mChunkedDecoder || (mContentLength >= int64_t(0))) &&
-        (mHttpVersion >= NS_HTTP_VERSION_1_1)) {
+        (NS_SUCCEEDED(reason) && !mResponseIsComplete)) {
 
-        if (NS_SUCCEEDED(reason) && !mResponseIsComplete) {
+        NS_WARNING("Partial transfer, incomplete HTTP response received");
+
+        if ((mHttpVersion >= NS_HTTP_VERSION_1_1) &&
+            gHttpHandler->GetEnforceH1Framing()) {
             reason = NS_ERROR_NET_PARTIAL_TRANSFER;
-            LOG(("Partial transfer, incomplete HTTP responese received: %s",
+            LOG(("Partial transfer, incomplete HTTP response received: %s",
                  mChunkedDecoder ? "broken chunk" : "c-l underrun"));
         }
+
+        if (mConnection) {
+            // whether or not we generate an error for the transaction
+            // bad framing means we don't want a pconn
+            mConnection->DontReuse();
+        }
     }
 
     bool relConn = true;
diff --git a/netwerk/test/unit/test_content_length_underrun.js b/netwerk/test/unit/test_content_length_underrun.js
index 7d232fb4ea2..b900d032701 100644
--- a/netwerk/test/unit/test_content_length_underrun.js
+++ b/netwerk/test/unit/test_content_length_underrun.js
@@ -16,8 +16,15 @@ var index = 0;
 var test_flags = new Array();
 var testPathBase = "/cl_hdrs";
 
+var prefs;
+var enforcePref;
+
 function run_test()
 {
+  prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
+  enforcePref = prefs.getBoolPref("network.http.enforce-framing.http1");
+  prefs.setBoolPref("network.http.enforce-framing.http1", true);
+
   httpserver.start(-1);
 
   do_test_pending();
@@ -46,6 +53,7 @@ function setupChannel(url)
 
 function endTests()
 {
+  prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
   httpserver.stop(do_test_finished);
 }
 
@@ -94,5 +102,33 @@ function handler2(metadata, response)
 function completeTest2(request, data, ctx)
 {
   do_check_eq(request.status, Components.results.NS_OK);
+
+  // test 3 requires the pref to be false
+  prefs.setBoolPref("network.http.enforce-framing.http1", false);
+  run_test_number(3);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Test 3: SUCCEED with bad Content-Length because pref allows it
+test_flags[3] = CL_IGNORE_CL;
+
+function handler3(metadata, response)
+{
+  var body = "blablabla";
+
+  response.seizePower();
+  response.write("HTTP/1.1 200 OK\r\n");
+  response.write("Content-Type: text/plain\r\n");
+  response.write("Content-Length: 556677\r\n");
+  response.write("\r\n");
+  response.write(body);
+  response.finish();
+}
+
+function completeTest3(request, data, ctx)
+{
+  // reset the pref in case we add more tests
+  prefs.setBoolPref("network.http.enforce-framing.http1", true);
+  do_check_eq(request.status, Components.results.NS_OK);
   endTests();
 }
diff --git a/netwerk/test/unit/test_gzipped_206.js b/netwerk/test/unit/test_gzipped_206.js
index 3e88cb9e118..0b1b4d56af9 100644
--- a/netwerk/test/unit/test_gzipped_206.js
+++ b/netwerk/test/unit/test_gzipped_206.js
@@ -1,4 +1,5 @@
 Cu.import("resource://testing-common/httpd.js");
+Cu.import("resource://gre/modules/Services.jsm");
 
 var httpserver = null;
 
@@ -63,16 +64,22 @@ function continue_test(request, data) {
   chan.asyncOpen(new ChannelListener(finish_test, null, CL_EXPECT_GZIP), null);
 }
 
+var enforcePref;
+
 function finish_test(request, data, ctx) {
   do_check_eq(request.status, 0);
   do_check_eq(data.length, responseBody.length);
   for (var i = 0; i < data.length; ++i) {
     do_check_eq(data.charCodeAt(i), responseBody[i]);
   }
+  Services.prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
   httpserver.stop(do_test_finished);
 }
 
 function run_test() {
+  enforcePref = Services.prefs.getBoolPref("network.http.enforce-framing.http1");
+  Services.prefs.setBoolPref("network.http.enforce-framing.http1", false);
+
   httpserver = new HttpServer();
   httpserver.registerPathHandler("/cached/test.gz", cachedHandler);
   httpserver.start(-1);
@@ -82,6 +89,6 @@ function run_test() {
 
   var chan = make_channel("http://localhost:" +
                           httpserver.identity.primaryPort + "/cached/test.gz");
-  chan.asyncOpen(new ChannelListener(continue_test, null, CL_EXPECT_GZIP|CL_EXPECT_LATE_FAILURE), null);
+  chan.asyncOpen(new ChannelListener(continue_test, null, CL_EXPECT_GZIP | CL_IGNORE_CL), null);
   do_test_pending();
 }
diff --git a/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js b/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js
index 7776e3ac63d..bcd92247f36 100644
--- a/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js
+++ b/netwerk/test/unit/test_partial_response_entry_size_smart_shrink.js
@@ -52,14 +52,19 @@ function contentHandler(metadata, response)
   }
 }
 
+var enforcePref;
+
 function run_test()
 {
+  enforcePref = Services.prefs.getBoolPref("network.http.enforce-framing.http1");
+  Services.prefs.setBoolPref("network.http.enforce-framing.http1", false);
+
   httpServer = new HttpServer();
   httpServer.registerPathHandler("/content", contentHandler);
   httpServer.start(-1);
 
   var chan = make_channel(URL + "/content");
-  chan.asyncOpen(new ChannelListener(firstTimeThrough, null, CL_EXPECT_LATE_FAILURE), null);
+  chan.asyncOpen(new ChannelListener(firstTimeThrough, null, CL_IGNORE_CL), null);
   do_test_pending();
 }
 
@@ -75,5 +80,6 @@ function firstTimeThrough(request, buffer)
 function finish_test(request, buffer)
 {
   do_check_eq(buffer, responseBody);
+  Services.prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
   httpServer.stop(do_test_finished);
 }
diff --git a/toolkit/components/jsdownloads/test/unit/common_test_Download.js b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
index 9cad569ed47..6aa0ffb9f55 100644
--- a/toolkit/components/jsdownloads/test/unit/common_test_Download.js
+++ b/toolkit/components/jsdownloads/test/unit/common_test_Download.js
@@ -1094,6 +1094,14 @@ add_task(function test_error_source_partial()
 {
   let sourceUrl = httpUrl("shorter-than-content-length-http-1-1.txt");
 
+  let enforcePref = Services.prefs.getBoolPref("network.http.enforce-framing.http1");
+  Services.prefs.setBoolPref("network.http.enforce-framing.http1", true);
+
+  function cleanup() {
+    Services.prefs.setBoolPref("network.http.enforce-framing.http1", enforcePref);
+  }
+  do_register_cleanup(cleanup);
+
   let download;
   try {
     if (!gUseLegacySaver) {

From 9a85d9269ce1e15427418c7e5b4812bb0375d5dd Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Sat, 25 Oct 2014 22:02:57 -0700
Subject: [PATCH 37/37] Back out 2 changesets (bug 1085529) for win8 chrome
 reftest failures

Backed out changeset 758840ac2f47 (bug 1085529)
Backed out changeset 3fa71a8dc29c (bug 1085529)
---
 gfx/2d/Helpers.h                              |  46 -----
 layout/base/nsCSSRendering.cpp                | 174 ++++++++++--------
 layout/base/nsCSSRendering.h                  |  22 +--
 layout/generic/nsTextFrame.cpp                |   7 +-
 .../test/test_selection_underline.html        |   4 -
 layout/xul/nsTextBoxFrame.cpp                 |  12 +-
 6 files changed, 106 insertions(+), 159 deletions(-)

diff --git a/gfx/2d/Helpers.h b/gfx/2d/Helpers.h
index 11c7eec5d94..ca51d04af4c 100644
--- a/gfx/2d/Helpers.h
+++ b/gfx/2d/Helpers.h
@@ -45,52 +45,6 @@ class AutoRestoreTransform
   Matrix mOldTransform;
 };
 
-class AutoPopClips
-{
-public:
-  explicit AutoPopClips(DrawTarget *aTarget)
-    : mDrawTarget(aTarget)
-    , mPushCount(0)
-  {
-    MOZ_ASSERT(mDrawTarget);
-  }
-
-  ~AutoPopClips()
-  {
-    PopAll();
-  }
-
-  void PushClip(const Path *aPath)
-  {
-    mDrawTarget->PushClip(aPath);
-    ++mPushCount;
-  }
-
-  void PushClipRect(const Rect &aRect)
-  {
-    mDrawTarget->PushClipRect(aRect);
-    ++mPushCount;
-  }
-
-  void PopClip()
-  {
-    MOZ_ASSERT(mPushCount > 0);
-    mDrawTarget->PopClip();
-    --mPushCount;
-  }
-
-  void PopAll()
-  {
-    while (mPushCount-- > 0) {
-      mDrawTarget->PopClip();
-    }
-  }
-
-private:
-  RefPtr<DrawTarget> mDrawTarget;
-  int32_t mPushCount;
-};
-
 } // namespace gfx
 } // namespace mozilla
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index d8cafc58638..dfc7d6591b5 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -8,11 +8,8 @@
 
 #include <ctime>
 
-#include "gfx2DGlue.h"
-#include "mozilla/ArrayUtils.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/gfx/2D.h"
-#include "mozilla/gfx/Helpers.h"
 #include "mozilla/HashFunctions.h"
 #include "mozilla/MathAlgorithms.h"
 
@@ -4017,13 +4014,13 @@ nsCSSRendering::DrawTableBorderSegment(nsRenderingContext&     aContext,
 
 // End table border-collapsing section
 
-Rect
+gfxRect
 nsCSSRendering::ExpandPaintingRectForDecorationLine(
                   nsIFrame* aFrame,
                   const uint8_t aStyle,
-                  const Rect& aClippedRect,
-                  const Float aICoordInFrame,
-                  const Float aCycleLength,
+                  const gfxRect& aClippedRect,
+                  const gfxFloat aICoordInFrame,
+                  const gfxFloat aCycleLength,
                   bool aVertical)
 {
   switch (aStyle) {
@@ -4052,12 +4049,12 @@ nsCSSRendering::ExpandPaintingRectForDecorationLine(
   NS_ENSURE_TRUE(block, aClippedRect);
 
   nsPresContext *pc = aFrame->PresContext();
-  Float framePosInBlock = Float(pc->AppUnitsToGfxUnits(framePosInBlockAppUnits));
+  gfxFloat framePosInBlock = pc->AppUnitsToGfxUnits(framePosInBlockAppUnits);
   int32_t rectPosInBlock =
     int32_t(NS_round(framePosInBlock + aICoordInFrame));
   int32_t extraStartEdge =
     rectPosInBlock - (rectPosInBlock / int32_t(aCycleLength) * aCycleLength);
-  Rect rect(aClippedRect);
+  gfxRect rect(aClippedRect);
   if (aVertical) {
     rect.y -= extraStartEdge;
     rect.height += extraStartEdge;
@@ -4070,11 +4067,11 @@ nsCSSRendering::ExpandPaintingRectForDecorationLine(
 
 void
 nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
-                                    DrawTarget& aDrawTarget,
-                                    const Rect& aDirtyRect,
+                                    gfxContext* aGfxContext,
+                                    const gfxRect& aDirtyRect,
                                     const nscolor aColor,
                                     const gfxPoint& aPt,
-                                    const Float aICoordInFrame,
+                                    const gfxFloat aICoordInFrame,
                                     const gfxSize& aLineSize,
                                     const gfxFloat aAscent,
                                     const gfxFloat aOffset,
@@ -4085,10 +4082,10 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
 {
   NS_ASSERTION(aStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE, "aStyle is none");
 
-  Rect rect = ToRect(
+  gfxRect rect =
     GetTextDecorationRectInternal(aPt, aLineSize, aAscent, aOffset,
                                   aDecoration, aStyle, aVertical,
-                                  aDescentLimit));
+                                  aDescentLimit);
   if (rect.IsEmpty() || !rect.Intersects(aDirtyRect)) {
     return;
   }
@@ -4100,28 +4097,26 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
     return;
   }
 
-  Float lineThickness = std::max(NS_round(aLineSize.height), 1.0);
+  gfxFloat lineThickness = std::max(NS_round(aLineSize.height), 1.0);
+  bool contextIsSaved = false;
 
-  ColorPattern color(ToDeviceColor(aColor));
-  StrokeOptions strokeOptions(lineThickness);
-  DrawOptions drawOptions;
-
-  Float dash[2];
-
-  AutoPopClips autoPopClips(&aDrawTarget);
+  gfxFloat oldLineWidth;
+  nsRefPtr<gfxPattern> oldPattern;
 
   switch (aStyle) {
     case NS_STYLE_TEXT_DECORATION_STYLE_SOLID:
     case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE:
+      oldLineWidth = aGfxContext->CurrentLineWidth();
+      oldPattern = aGfxContext->GetPattern();
       break;
     case NS_STYLE_TEXT_DECORATION_STYLE_DASHED: {
-      autoPopClips.PushClipRect(rect);
-      Float dashWidth = lineThickness * DOT_LENGTH * DASH_LENGTH;
-      dash[0] = dashWidth;
-      dash[1] = dashWidth;
-      strokeOptions.mDashPattern = dash;
-      strokeOptions.mDashLength = MOZ_ARRAY_LENGTH(dash);
-      strokeOptions.mLineCap = CapStyle::BUTT;
+      aGfxContext->Save();
+      contextIsSaved = true;
+      aGfxContext->Clip(rect);
+      gfxFloat dashWidth = lineThickness * DOT_LENGTH * DASH_LENGTH;
+      gfxFloat dash[2] = { dashWidth, dashWidth };
+      aGfxContext->SetLineCap(gfxContext::LINE_CAP_BUTT);
+      aGfxContext->SetDash(dash, 2, 0.0);
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame,
                                                  dashWidth * 2,
@@ -4131,18 +4126,20 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_DOTTED: {
-      autoPopClips.PushClipRect(rect);
-      Float dashWidth = lineThickness * DOT_LENGTH;
+      aGfxContext->Save();
+      contextIsSaved = true;
+      aGfxContext->Clip(rect);
+      gfxFloat dashWidth = lineThickness * DOT_LENGTH;
+      gfxFloat dash[2];
       if (lineThickness > 2.0) {
-        dash[0] = 0.f;
-        dash[1] = dashWidth * 2.f;
-        strokeOptions.mLineCap = CapStyle::ROUND;
+        dash[0] = 0.0;
+        dash[1] = dashWidth * 2.0;
+        aGfxContext->SetLineCap(gfxContext::LINE_CAP_ROUND);
       } else {
         dash[0] = dashWidth;
         dash[1] = dashWidth;
       }
-      strokeOptions.mDashPattern = dash;
-      strokeOptions.mDashLength = MOZ_ARRAY_LENGTH(dash);
+      aGfxContext->SetDash(dash, 2, 0.0);
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame,
                                                  dashWidth * 2,
@@ -4152,14 +4149,16 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       break;
     }
     case NS_STYLE_TEXT_DECORATION_STYLE_WAVY:
-      autoPopClips.PushClipRect(rect);
+      aGfxContext->Save();
+      contextIsSaved = true;
+      aGfxContext->Clip(rect);
       if (lineThickness > 2.0) {
-        drawOptions.mAntialiasMode = AntialiasMode::SUBPIXEL;
+        aGfxContext->SetAntialiasMode(AntialiasMode::SUBPIXEL);
       } else {
         // Don't use anti-aliasing here.  Because looks like lighter color wavy
         // line at this case.  And probably, users don't think the
         // non-anti-aliased wavy line is not pretty.
-        drawOptions.mAntialiasMode = AntialiasMode::NONE;
+        aGfxContext->SetAntialiasMode(AntialiasMode::NONE);
       }
       break;
     default:
@@ -4170,16 +4169,23 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
   // The y position should be set to the middle of the line.
   rect.y += lineThickness / 2;
 
+  aGfxContext->SetColor(gfxRGBA(aColor));
+  aGfxContext->SetLineWidth(lineThickness);
   switch (aStyle) {
     case NS_STYLE_TEXT_DECORATION_STYLE_SOLID:
     case NS_STYLE_TEXT_DECORATION_STYLE_DOTTED:
-    case NS_STYLE_TEXT_DECORATION_STYLE_DASHED: {
-      Point p1 = rect.TopLeft();
-      Point p2 = aVertical ? rect.BottomLeft() : rect.TopRight();
-      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
-      return;
-    }
-    case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE: {
+    case NS_STYLE_TEXT_DECORATION_STYLE_DASHED:
+      aGfxContext->NewPath();
+      if (aVertical) {
+        aGfxContext->MoveTo(rect.TopLeft());
+        aGfxContext->LineTo(rect.BottomLeft());
+      } else {
+        aGfxContext->MoveTo(rect.TopLeft());
+        aGfxContext->LineTo(rect.TopRight());
+      }
+      aGfxContext->Stroke();
+      break;
+    case NS_STYLE_TEXT_DECORATION_STYLE_DOUBLE:
       /**
        *  We are drawing double line as:
        *
@@ -4194,21 +4200,22 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
        * |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| v
        * +-------------------------------------------+
        */
-      Point p1 = rect.TopLeft();
-      Point p2 = aVertical ? rect.BottomLeft() : rect.TopRight();
-      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
-
+      aGfxContext->NewPath();
       if (aVertical) {
+        aGfxContext->MoveTo(rect.TopLeft());
+        aGfxContext->LineTo(rect.BottomLeft());
         rect.width -= lineThickness;
+        aGfxContext->MoveTo(rect.TopRight());
+        aGfxContext->LineTo(rect.BottomRight());
       } else {
+        aGfxContext->MoveTo(rect.TopLeft());
+        aGfxContext->LineTo(rect.TopRight());
         rect.height -= lineThickness;
+        aGfxContext->MoveTo(rect.BottomLeft());
+        aGfxContext->LineTo(rect.BottomRight());
       }
-
-      p1 = aVertical ? rect.TopRight() : rect.BottomLeft();
-      p2 = rect.BottomRight();
-      aDrawTarget.StrokeLine(p1, p2, color, strokeOptions, drawOptions);
-      return;
-    }
+      aGfxContext->Stroke();
+      break;
     case NS_STYLE_TEXT_DECORATION_STYLE_WAVY: {
       /**
        *  We are drawing wavy line as:
@@ -4242,23 +4249,23 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
        * directions in the above description.
        */
 
-      Float& rectICoord = aVertical ? rect.y : rect.x;
-      Float& rectISize = aVertical ? rect.height : rect.width;
-      const Float rectBSize = aVertical ? rect.width : rect.height;
+      gfxFloat& rectICoord = aVertical ? rect.y : rect.x;
+      gfxFloat& rectISize = aVertical ? rect.height : rect.width;
+      const gfxFloat rectBSize = aVertical ? rect.width : rect.height;
 
-      const Float adv = rectBSize - lineThickness;
-      const Float flatLengthAtVertex =
+      const gfxFloat adv = rectBSize - lineThickness;
+      const gfxFloat flatLengthAtVertex =
         std::max((lineThickness - 1.0) * 2.0, 1.0);
 
       // Align the start of wavy lines to the nearest ancestor block.
-      const Float cycleLength = 2 * (adv + flatLengthAtVertex);
+      const gfxFloat cycleLength = 2 * (adv + flatLengthAtVertex);
       rect = ExpandPaintingRectForDecorationLine(aFrame, aStyle, rect,
                                                  aICoordInFrame, cycleLength,
                                                  aVertical);
       // figure out if we can trim whole cycles from the left and right edges
       // of the line, to try and avoid creating an unnecessarily long and
       // complex path
-      const Float dirtyRectICoord = aVertical ? aDirtyRect.y : aDirtyRect.x;
+      const gfxFloat dirtyRectICoord = aVertical ? aDirtyRect.y : aDirtyRect.x;
       int32_t skipCycles = floor((dirtyRectICoord - rectICoord) / cycleLength);
       if (skipCycles > 0) {
         rectICoord += skipCycles * cycleLength;
@@ -4266,29 +4273,28 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
       }
 
       rectICoord += lineThickness / 2.0;
-      Point pt(rect.TopLeft());
-      Float& ptICoord = aVertical ? pt.y : pt.x;
-      Float& ptBCoord = aVertical ? pt.x : pt.y;
+      gfxPoint pt(rect.TopLeft());
+      gfxFloat& ptICoord = aVertical ? pt.y : pt.x;
+      gfxFloat& ptBCoord = aVertical ? pt.x : pt.y;
       if (aVertical) {
         ptBCoord += adv + lineThickness / 2.0;
       }
-      Float iCoordLimit = ptICoord + rectISize + lineThickness;
+      gfxFloat iCoordLimit = ptICoord + rectISize + lineThickness;
 
-      const Float dirtyRectIMost = aVertical ?
+      const gfxFloat dirtyRectIMost = aVertical ?
         aDirtyRect.YMost() : aDirtyRect.XMost();
       skipCycles = floor((iCoordLimit - dirtyRectIMost) / cycleLength);
       if (skipCycles > 0) {
         iCoordLimit -= skipCycles * cycleLength;
       }
 
-      RefPtr<PathBuilder> builder = aDrawTarget.CreatePathBuilder();
-      RefPtr<Path> path;
+      aGfxContext->NewPath();
 
       ptICoord -= lineThickness;
-      builder->MoveTo(pt); // 1
+      aGfxContext->MoveTo(pt); // 1
 
       ptICoord = rectICoord;
-      builder->LineTo(pt); // 2
+      aGfxContext->LineTo(pt); // 2
 
       // In vertical mode, to go "down" relative to the text we need to
       // decrease the block coordinate, whereas in horizontal we increase
@@ -4299,28 +4305,34 @@ nsCSSRendering::PaintDecorationLine(nsIFrame* aFrame,
         if (++iter > 1000) {
           // stroke the current path and start again, to avoid pathological
           // behavior in cairo with huge numbers of path segments
-          path = builder->Finish();
-          aDrawTarget.Stroke(path, color, strokeOptions, drawOptions);
-          builder = aDrawTarget.CreatePathBuilder();
-          builder->MoveTo(pt);
+          aGfxContext->Stroke();
+          aGfxContext->NewPath();
+          aGfxContext->MoveTo(pt);
           iter = 0;
         }
         ptICoord += adv;
         ptBCoord += goDown ? adv : -adv;
 
-        builder->LineTo(pt); // 3 and 5
+        aGfxContext->LineTo(pt); // 3 and 5
 
         ptICoord += flatLengthAtVertex;
-        builder->LineTo(pt); // 4 and 6
+        aGfxContext->LineTo(pt); // 4 and 6
 
         goDown = !goDown;
       }
-      path = builder->Finish();
-      aDrawTarget.Stroke(path, color, strokeOptions, drawOptions);
-      return;
+      aGfxContext->Stroke();
+      break;
     }
     default:
       NS_ERROR("Invalid style value!");
+      break;
+  }
+
+  if (contextIsSaved) {
+    aGfxContext->Restore();
+  } else {
+    aGfxContext->SetPattern(oldPattern);
+    aGfxContext->SetLineWidth(oldLineWidth);
   }
 }
 
diff --git a/layout/base/nsCSSRendering.h b/layout/base/nsCSSRendering.h
index 9fce2f149d3..0d45bd6fa83 100644
--- a/layout/base/nsCSSRendering.h
+++ b/layout/base/nsCSSRendering.h
@@ -10,7 +10,6 @@
 
 #include "gfxBlur.h"
 #include "gfxContext.h"
-#include "mozilla/gfx/Rect.h"
 #include "nsLayoutUtils.h"
 #include "nsStyleStruct.h"
 #include "nsIFrame.h"
@@ -22,10 +21,6 @@ class nsRenderingContext;
 
 namespace mozilla {
 
-namespace gfx {
-class DrawTarget;
-}
-
 namespace layers {
 class ImageContainer;
 }
@@ -316,9 +311,6 @@ struct nsBackgroundLayerState {
 };
 
 struct nsCSSRendering {
-  typedef mozilla::gfx::DrawTarget DrawTarget;
-  typedef mozilla::gfx::Float Float;
-  typedef mozilla::gfx::Rect Rect;
   typedef nsIFrame::Sides Sides;
 
   /**
@@ -677,11 +669,11 @@ struct nsCSSRendering {
    *                              used for strikeout line and overline too.
    */
   static void PaintDecorationLine(nsIFrame* aFrame,
-                                  DrawTarget& aDrawTarget,
-                                  const Rect& aDirtyRect,
+                                  gfxContext* aGfxContext,
+                                  const gfxRect& aDirtyRect,
                                   const nscolor aColor,
                                   const gfxPoint& aPt,
-                                  const Float aICoordInFrame,
+                                  const gfxFloat aICoordInFrame,
                                   const gfxSize& aLineSize,
                                   const gfxFloat aAscent,
                                   const gfxFloat aOffset,
@@ -806,12 +798,12 @@ protected:
    *                              and aClippedRect.pos.
    *     @param aCycleLength      the width of one cycle of the line style.
    */
-  static Rect ExpandPaintingRectForDecorationLine(
+  static gfxRect ExpandPaintingRectForDecorationLine(
                    nsIFrame* aFrame,
                    const uint8_t aStyle,
-                   const Rect &aClippedRect,
-                   const Float aICoordInFrame,
-                   const Float aCycleLength,
+                   const gfxRect &aClippedRect,
+                   const gfxFloat aICoordInFrame,
+                   const gfxFloat aCycleLength,
                    bool aVertical);
 };
 
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 13b254e3e37..fd8e41a4144 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -7,7 +7,6 @@
 
 #include "nsTextFrame.h"
 
-#include "gfx2DGlue.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
@@ -89,7 +88,6 @@
 
 using namespace mozilla;
 using namespace mozilla::dom;
-using namespace mozilla::gfx;
 
 struct TabWidth {
   TabWidth(uint32_t aOffset, uint32_t aWidth)
@@ -5156,9 +5154,8 @@ PaintDecorationLine(nsIFrame* aFrame,
       aCallbacks->NotifySelectionDecorationLinePathEmitted();
     }
   } else {
-    nsCSSRendering::PaintDecorationLine(aFrame, *aCtx->GetDrawTarget(),
-                                        ToRect(aDirtyRect), lineColor,
-      aPt, Float(aICoordInFrame), aLineSize, aAscent, aOffset, aDecoration, aStyle,
+    nsCSSRendering::PaintDecorationLine(aFrame, aCtx, aDirtyRect, lineColor,
+      aPt, aICoordInFrame, aLineSize, aAscent, aOffset, aDecoration, aStyle,
       aVertical, aDescentLimit);
   }
 }
diff --git a/layout/generic/test/test_selection_underline.html b/layout/generic/test/test_selection_underline.html
index 4112e114e5b..c2b65c401d0 100644
--- a/layout/generic/test/test_selection_underline.html
+++ b/layout/generic/test/test_selection_underline.html
@@ -262,10 +262,6 @@ function doTest(aTest)
         aTest.decoration.style == kDecorationStyleWavy) {
       todo(false, "Rendering of" + description);
     } else {
-      var fuzz = null; // no fuzz
-      if (navigator.userAgent.indexOf("Windows NT 6.2") > -1) { // Win8
-        fuzz = { maxDifference: 1, numDifferentPixels: 200 };
-      }
       assertSnapshots(result.snapshot, reference.snapshot, true,
                       null /*no fuzz*/, description, "");
     }
diff --git a/layout/xul/nsTextBoxFrame.cpp b/layout/xul/nsTextBoxFrame.cpp
index da28522daef..dc01d3236f6 100644
--- a/layout/xul/nsTextBoxFrame.cpp
+++ b/layout/xul/nsTextBoxFrame.cpp
@@ -5,7 +5,6 @@
 
 #include "nsTextBoxFrame.h"
 
-#include "gfx2DGlue.h"
 #include "gfxUtils.h"
 #include "mozilla/gfx/2D.h"
 #include "nsFontMetrics.h"
@@ -468,7 +467,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
                 presContext->AppUnitsToGfxUnits(aTextRect.y));
     gfxFloat width = presContext->AppUnitsToGfxUnits(aTextRect.width);
     gfxFloat ascentPixel = presContext->AppUnitsToGfxUnits(ascent);
-    Float xInFrame = Float(PresContext()->AppUnitsToGfxUnits(mTextDrawRect.x));
+    gfxFloat xInFrame = PresContext()->AppUnitsToGfxUnits(mTextDrawRect.x);
     gfxRect dirtyRect(presContext->AppUnitsToGfxUnits(aDirtyRect));
 
     // Underlines are drawn before overlines, and both before the text
@@ -483,8 +482,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
       if ((decorations & NS_FONT_DECORATION_UNDERLINE) &&
           underStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
-        nsCSSRendering::PaintDecorationLine(this, *drawTarget,
-                                            ToRect(dirtyRect), underColor,
+        nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, underColor,
                           pt, xInFrame, gfxSize(width, sizePixel),
                           ascentPixel, offsetPixel,
                           NS_STYLE_TEXT_DECORATION_LINE_UNDERLINE, underStyle,
@@ -492,8 +490,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       }
       if ((decorations & NS_FONT_DECORATION_OVERLINE) &&
           overStyle != NS_STYLE_TEXT_DECORATION_STYLE_NONE) {
-        nsCSSRendering::PaintDecorationLine(this, *drawTarget,
-                                            ToRect(dirtyRect), overColor,
+        nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, overColor,
                           pt, xInFrame, gfxSize(width, sizePixel),
                           ascentPixel, ascentPixel,
                           NS_STYLE_TEXT_DECORATION_LINE_OVERLINE, overStyle,
@@ -575,8 +572,7 @@ nsTextBoxFrame::DrawText(nsRenderingContext& aRenderingContext,
       fontMet->GetStrikeout(offset, size);
       gfxFloat offsetPixel = presContext->AppUnitsToGfxUnits(offset);
       gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size);
-      nsCSSRendering::PaintDecorationLine(this, *drawTarget, ToRect(dirtyRect),
-                                          strikeColor,
+      nsCSSRendering::PaintDecorationLine(this, ctx, dirtyRect, strikeColor,
                         pt, xInFrame, gfxSize(width, sizePixel), ascentPixel,
                         offsetPixel, NS_STYLE_TEXT_DECORATION_LINE_LINE_THROUGH,
                         strikeStyle, vertical);