Remove the dependency on encryptedmedia from HTMLMediaElement.

Source/platform/graphics/media/MediaPlayer.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 74 matching lines @@
     // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not depend on it.
     virtual KURL mediaPlayerPosterURL() = 0;
 
 // Presentation-related methods
     // a new frame of video is available
     virtual void mediaPlayerRepaint() = 0;
 
     // the movie size has changed
     virtual void mediaPlayerSizeChanged() = 0;
 
-    enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
-    virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String& /* sessionId */) = 0;
-    virtual void mediaPlayerKeyError(const String& /* keySystem */, const String& /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0;
-    virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLength */, const KURL& /* defaultURL */) = 0;
-    virtual bool mediaPlayerKeyNeeded(const String& /* contentType */, const unsigned char* /* initData */, unsigned /* initDataLength */) = 0;
-
     virtual CORSMode mediaPlayerCORSMode() const = 0;
 
     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0;
     virtual void mediaPlayerSetOpaque(bool) = 0;
 
     virtual void mediaPlayerDidAddTrack(blink::WebInbandTextTrack*) = 0;
     virtual void mediaPlayerDidRemoveTrack(blink::WebInbandTextTrack*) = 0;
 
     virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) = 0;
 };
@@ skipping 73 matching lines @@
 
     virtual unsigned decodedFrameCount() const = 0;
     virtual unsigned droppedFrameCount() const = 0;
     virtual unsigned corruptedFrameCount() const = 0;
     virtual unsigned audioDecodedByteCount() const = 0;
     virtual unsigned videoDecodedByteCount() const = 0;
 
 #if ENABLE(WEB_AUDIO)
     virtual AudioSourceProvider* audioSourceProvider() = 0;
 #endif
-
-    enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported, InvalidAccess };
-    virtual MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) = 0;
-    virtual MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) = 0;
-    virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0;
-    virtual void setContentDecryptionModule(blink::WebContentDecryptionModule*) = 0;
+    virtual blink::WebMediaPlayer* webMediaPlayer() const = 0;

[ddorwin, 2014/02/27 00:37:59]

This seems like a layering violation. Why can't this interface know about EME?
platform/ has a CDM insterface.

[acolwell GONE FROM CHROMIUM, 2014/02/27 01:11:11]

This layer is going away. There is no point in keeping these.

 };
 
 }
 
 #endif // MediaPlayer_h