Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/encrypted_media_player_support.h

Index: media/blink/encrypted_media_player_support.h
diff --git a/media/blink/encrypted_media_player_support.h b/media/blink/encrypted_media_player_support.h
index d3fd454b6626606be7fbe59c146a54452b840a4a..3ec0112f31f4b6548ed9e93d682bb051641ce368 100644
--- a/media/blink/encrypted_media_player_support.h
+++ b/media/blink/encrypted_media_player_support.h
@@ -23,6 +23,7 @@ namespace blink {
 class WebContentDecryptionModule;
 class WebLocalFrame;
 class WebMediaPlayerClient;
+class WebMediaPlayerEncryptedMediaClient;
 class WebString;
 }
 
@@ -40,10 +41,12 @@ class EncryptedMediaPlayerSupport
   using CdmContextReadyCB = ProxyDecryptor::CdmContextReadyCB;
 
   // |cdm_context_ready_cb| is called when the CDM instance creation completes.
-  EncryptedMediaPlayerSupport(CdmFactory* cdm_factory,
-                              blink::WebMediaPlayerClient* client,
-                              MediaPermission* media_permission,
-                              const CdmContextReadyCB& cdm_context_ready_cb);
+  EncryptedMediaPlayerSupport(
+      CdmFactory* cdm_factory,
+      blink::WebMediaPlayerClient* client,
+      blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
+      MediaPermission* media_permission,
+      const CdmContextReadyCB& cdm_context_ready_cb);
   ~EncryptedMediaPlayerSupport();
 
   blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest(
@@ -98,6 +101,7 @@ class EncryptedMediaPlayerSupport
   CdmFactory* cdm_factory_;
 
   blink::WebMediaPlayerClient* client_;
+  blink::WebMediaPlayerEncryptedMediaClient* encrypted_client_;
 
   MediaPermission* media_permission_;