Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/encrypted_media_player_support.cc

Index: media/blink/encrypted_media_player_support.cc
diff --git a/media/blink/encrypted_media_player_support.cc b/media/blink/encrypted_media_player_support.cc
index cc11a2e50413d8b6cc5c1427da0ba36a88b0677d..708330f1e98967fccb6c7f91b0611c12c584dabc 100644
--- a/media/blink/encrypted_media_player_support.cc
+++ b/media/blink/encrypted_media_player_support.cc
@@ -17,12 +17,12 @@
 #include "media/base/key_systems.h"
 #include "media/blink/webcontentdecryptionmodule_impl.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
-#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 using blink::WebMediaPlayer;
-using blink::WebMediaPlayerClient;
+using blink::WebMediaPlayerEncryptedMediaClient;
 using blink::WebString;
 
 namespace media {
@@ -114,7 +114,7 @@ static EmeInitDataType GuessInitDataType(const unsigned char* init_data,
 
 EncryptedMediaPlayerSupport::EncryptedMediaPlayerSupport(
     CdmFactory* cdm_factory,
-    blink::WebMediaPlayerClient* client,
+    WebMediaPlayerEncryptedMediaClient* client,
     MediaPermission* media_permission,
     const CdmContextReadyCB& cdm_context_ready_cb)
     : cdm_factory_(cdm_factory),
@@ -304,7 +304,8 @@ void EncryptedMediaPlayerSupport::OnKeyError(const std::string& session_id,
   client_->keyError(
       WebString::fromUTF8(GetPrefixedKeySystemName(current_key_system_)),
       WebString::fromUTF8(session_id),
-      static_cast<WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
+      static_cast<WebMediaPlayerEncryptedMediaClient::MediaKeyErrorCode>(
+          error_code),
       short_system_code);
 }