Backed out 3 changesets (bug 1873394) for causing bug 1879250. CLOSED TREE

Backed out changeset b355f33d28c9 (bug 1873394)
Backed out changeset 6711b73d58e1 (bug 1873394)
Backed out changeset 44fdf4e83c7c (bug 1873394)

dom/html/HTMLMediaElement.cpp

@@ -6995,11 +6995,6 @@ void HTMLMediaElement::MakeAssociationWithCDMResolved() {
 
   // 5.4 Set the mediaKeys attribute to mediaKeys.
   mMediaKeys = mIncomingMediaKeys;
-#ifdef MOZ_WMF_CDM
-  if (mMediaKeys && mMediaKeys->GetCDMProxy()) {
-    mIsUsingWMFCDM = !!mMediaKeys->GetCDMProxy()->AsWMFCDMProxy();
-  }
-#endif
   // 5.5 Let this object's attaching media keys value be false.
   ResetSetMediaKeysTempVariables();
   // 5.6 Resolve promise.
@@ -7871,10 +7866,6 @@ void HTMLMediaElement::NodeInfoChanged(Document* aOldDoc) {
   nsGenericHTMLElement::NodeInfoChanged(aOldDoc);
 }
 
-#ifdef MOZ_WMF_CDM
-bool HTMLMediaElement::IsUsingWMFCDM() const { return mIsUsingWMFCDM; };
-#endif
-
 }  // namespace mozilla::dom
 
 #undef LOG