Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled

Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

Index: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
index 078279ab52e42fc3cd9e717ecfbcd255e3362d88..15d38bdb6b85a098855babf81da396240a9197bb 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
@@ -195,53 +195,26 @@ WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const
 
 void WebMediaPlayerClientImpl::keyAdded(const WebString& keySystem, const WebString& sessionId)
 {
-#if ENABLE(ENCRYPTED_MEDIA)
     ASSERT(m_mediaPlayer);
     m_mediaPlayer->keyAdded(keySystem, sessionId);
-#else
-    UNUSED_PARAM(keySystem);
-    UNUSED_PARAM(sessionId);
-#endif
 }
 
 void WebMediaPlayerClientImpl::keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode errorCode, unsigned short systemCode)
 {
-#if ENABLE(ENCRYPTED_MEDIA)
     ASSERT(m_mediaPlayer);
     m_mediaPlayer->keyError(keySystem, sessionId, static_cast<MediaPlayerClient::MediaKeyErrorCode>(errorCode), systemCode);
-#else
-    UNUSED_PARAM(keySystem);
-    UNUSED_PARAM(sessionId);
-    UNUSED_PARAM(errorCode);
-    UNUSED_PARAM(systemCode);
-#endif
 }
 
 void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL)
 {
-#if ENABLE(ENCRYPTED_MEDIA)
     ASSERT(m_mediaPlayer);
     m_mediaPlayer->keyMessage(keySystem, sessionId, message, messageLength, defaultURL);
-#else
-    UNUSED_PARAM(keySystem);
-    UNUSED_PARAM(sessionId);
-    UNUSED_PARAM(message);
-    UNUSED_PARAM(messageLength);
-    UNUSED_PARAM(defaultURL);
-#endif
 }
 
 void WebMediaPlayerClientImpl::keyNeeded(const WebString& keySystem, const WebString& sessionId, const unsigned char* initData, unsigned initDataLength)
 {
-#if ENABLE(ENCRYPTED_MEDIA)
     ASSERT(m_mediaPlayer);
     m_mediaPlayer->keyNeeded(keySystem, sessionId, initData, initDataLength);
-#else
-    UNUSED_PARAM(keySystem);
-    UNUSED_PARAM(sessionId);
-    UNUSED_PARAM(initData);
-    UNUSED_PARAM(initDataLength);
-#endif
 }
 
 WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginType, WebFrame* frame)
@@ -405,7 +378,6 @@ bool WebMediaPlayerClientImpl::canEnterFullscreen() const
 }
 #endif
 
-#if ENABLE(ENCRYPTED_MEDIA)
 MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength)
 {
     if (!m_webMediaPlayer)
@@ -432,7 +404,6 @@ MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::cancelKeyRequest(const
     WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->cancelKeyRequest(keySystem, sessionId);
     return static_cast<MediaPlayer::MediaKeyException>(result);
 }
-#endif
 
 void WebMediaPlayerClientImpl::prepareToPlay()
 {
@@ -730,19 +701,11 @@ PassOwnPtr<MediaPlayerPrivateInterface> WebMediaPlayerClientImpl::create(MediaPl
     return client.release();
 }
 
-#if ENABLE(ENCRYPTED_MEDIA)
 MediaPlayer::SupportsType WebMediaPlayerClientImpl::supportsType(const String& type,
                                                                  const String& codecs,
                                                                  const String& keySystem,
                                                                  const KURL&)
 {
-#else
-MediaPlayer::SupportsType WebMediaPlayerClientImpl::supportsType(const String& type,
-                                                                 const String& codecs,
-                                                                 const KURL&)
-{
-    String keySystem;
-#endif
     WebMimeRegistry::SupportsType supportsType = WebKit::Platform::current()->mimeRegistry()->supportsMediaMIMEType(type, codecs, keySystem);
 
     switch (supportsType) {