Separate encrypted media functions out of WebMediaPlayerClient interface

public/platform/WebMediaPlayerClient.h

Index: public/platform/WebMediaPlayerClient.h
diff --git a/public/platform/WebMediaPlayerClient.h b/public/platform/WebMediaPlayerClient.h
index 67e0ad048b031287fe878458b1e255d2d3c95c62..2a1fdab642cc1baa83082238063450a769fa42ae 100644
--- a/public/platform/WebMediaPlayerClient.h
+++ b/public/platform/WebMediaPlayerClient.h
@@ -32,26 +32,19 @@
 #define WebMediaPlayerClient_h
 
 #include "WebMediaPlayer.h"
-#include "public/platform/WebEncryptedMediaTypes.h"
+#include "WebMediaPlayerEncryptedMediaClient.h"
 
 namespace blink {
 
 class WebInbandTextTrack;
 class WebLayer;
 class WebMediaSource;
-class WebURL;
 
-class WebMediaPlayerClient {
+// TODO(srirama): Remove this inheritance when we get rid of the MediaPlayer
+// and MediaPlayerClient interfaces by having HTMLMediaElement implement
+// WebMediaPlayerClient interface. See crbug.com/350571.
+class WebMediaPlayerClient : public WebMediaPlayerEncryptedMediaClient {
 public:
-    enum MediaKeyErrorCode {
-        MediaKeyErrorCodeUnknown = 1,
-        MediaKeyErrorCodeClient,
-        MediaKeyErrorCodeService,
-        MediaKeyErrorCodeOutput,
-        MediaKeyErrorCodeHardwareChange,
-        MediaKeyErrorCodeDomain,
-    };
-
     enum VideoTrackKind {
         VideoTrackKindNone,
         VideoTrackKindAlternative,
@@ -79,12 +72,6 @@ public:
     virtual void durationChanged() = 0;
     virtual void sizeChanged() = 0;
     virtual void playbackStateChanged() = 0;
-    virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
-    virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
-    virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) = 0;
-    virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) = 0;
-    virtual void didBlockPlaybackWaitingForKey() = 0;
-    virtual void didResumePlaybackBlockedForKey() = 0;
     virtual void setWebLayer(WebLayer*) = 0;
     virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, const WebString& label, const WebString& language, bool enabled) = 0;
     virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0;