--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -2016,17 +2016,17 @@ MediaManager::GetUserMedia(nsPIDOMWindow
   MediaStreamConstraints c(aConstraintsPassedIn); // use a modifiable copy
 
   // Do all the validation we can while we're sync (to return an
   // already-rejected promise on failure).
 
   if (!IsOn(c.mVideo) && !IsOn(c.mAudio)) {
     RefPtr<MediaStreamError> error =
         new MediaStreamError(aWindow,
-                             NS_LITERAL_STRING("NotSupportedError"),
+                             NS_LITERAL_STRING("TypeError"),
                              NS_LITERAL_STRING("audio and/or video is required"));
     onFailure->OnError(error);
     return NS_OK;
   }
   if (sInShutdown) {
     RefPtr<MediaStreamError> error =
         new MediaStreamError(aWindow,
                              NS_LITERAL_STRING("AbortError"),

--- a/dom/media/tests/mochitest/test_getUserMedia_constraints.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_constraints.html
@@ -41,17 +41,17 @@ var tests = [
     error: "OverconstrainedError",
     constraint: "mediaSource" },
   { message: "unknown mediaSource in audio fails",
     constraints: { audio: { mediaSource: 'uncle' } },
     error: "OverconstrainedError",
     constraint: "mediaSource" },
   { message: "emtpy constraint fails",
     constraints: { },
-    error: "NotSupportedError" },
+    error: "TypeError" },
   { message: "Triggering mock failure in default video device fails",
     constraints: { video: { deviceId: 'bad device' }, fake: true },
     error: "NotReadableError" },
   { message: "Triggering mock failure in default audio device fails",
     constraints: { audio: { deviceId: 'bad device' }, fake: true },
     error: "NotReadableError" },
   { message: "Success-path: optional video facingMode + audio ignoring facingMode",
     constraints: { audio: { mediaSource: 'microphone',