Backed out changeset 015cb0829df5 (bug 1213517)

dom/html/HTMLMediaElement.cpp

@@ -74,7 +74,6 @@
 #include "AudioStreamTrack.h"
 #include "VideoStreamTrack.h"
 #include "MediaTrackList.h"
-#include "MediaStreamError.h"
 
 #include "AudioChannelService.h"
 
@@ -2122,15 +2121,13 @@ public:
     return mElement->GetCORSMode();
   }
 
-  already_AddRefed<PledgeVoid>
+  already_AddRefed<Promise>
   ApplyConstraints(nsPIDOMWindowInner* aWindow,
-                   const dom::MediaTrackConstraints& aConstraints) override
+                   const dom::MediaTrackConstraints& aConstraints,
+                   ErrorResult &aRv) override
   {
-    RefPtr<PledgeVoid> p = new PledgeVoid();
-    p->Reject(new dom::MediaStreamError(aWindow,
-                                        NS_LITERAL_STRING("OverconstrainedError"),
-                                        NS_LITERAL_STRING("")));
-    return p.forget();
+    NS_ERROR("ApplyConstraints not implemented for media element capture");
+    return nullptr;
   }
 
   void Stop() override