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 8f5e7ff15528050751c6b6e0344e0f55e9dec48e..0b9f531d89f3f6cdafba867b8874d22e80266262 100644
--- a/public/platform/WebMediaPlayerClient.h
+++ b/public/platform/WebMediaPlayerClient.h
@@ -32,26 +32,16 @@
 #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 {
+class WebMediaPlayerClient : public WebMediaPlayerEncryptedMediaClient {

[ddorwin, 2015/06/04 20:17:06]

Add a TODO to remove this inheritance when <something (bug is fixed?)>.

 public:
-    enum MediaKeyErrorCode {
-        MediaKeyErrorCodeUnknown = 1,
-        MediaKeyErrorCodeClient,
-        MediaKeyErrorCodeService,
-        MediaKeyErrorCodeOutput,
-        MediaKeyErrorCodeHardwareChange,
-        MediaKeyErrorCodeDomain,
-    };
-
     enum VideoTrackKind {
         VideoTrackKindNone,
         VideoTrackKindAlternative,
@@ -79,12 +69,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;