Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled

Source/core/html/HTMLMediaElement.cpp

 /*
  * 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 153 matching lines @@
 
 static void removeElementFromDocumentMap(HTMLMediaElement* element, Document* document)
 {
     DocumentElementSetMap& map = documentToElementSetMap();
     HashSet<HTMLMediaElement*> set = map.take(document);
     set.remove(element);
     if (!set.isEmpty())
         map.add(document, set);
 }
 
-#if ENABLE(ENCRYPTED_MEDIA)
 static ExceptionCode exceptionCodeForMediaKeyException(MediaPlayer::MediaKeyException exception)
 {
     switch (exception) {
     case MediaPlayer::NoError:
         return 0;
     case MediaPlayer::InvalidPlayerState:
         return INVALID_STATE_ERR;
     case MediaPlayer::KeySystemNotSupported:
         return NOT_SUPPORTED_ERR;
     }
 
     ASSERT_NOT_REACHED();
     return INVALID_STATE_ERR;
 }
-#endif
 
 class TrackDisplayUpdateScope {
 public:
     TrackDisplayUpdateScope(HTMLMediaElement* mediaElement)
     {
         m_mediaElement = mediaElement;
         m_mediaElement->beginIgnoringTrackDisplayUpdateRequests();
     }
     ~TrackDisplayUpdateScope()
     {
@@ skipping 1424 matching lines @@
             mediaControls()->updateStatusDisplay();
         }
     }
 
     updatePlayState();
     updateMediaController();
     if (RuntimeEnabledFeatures::videoTrackEnabled())
         updateActiveTextTrackCues(currentTime());
 }
 
-#if ENABLE(ENCRYPTED_MEDIA)
 void HTMLMediaElement::mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId)
 {
     MediaKeyEventInit initializer;
     initializer.keySystem = keySystem;
     initializer.sessionId = sessionId;
     initializer.bubbles = false;
     initializer.cancelable = false;
 
     RefPtr<Event> event = MediaKeyEvent::create(eventNames().webkitkeyaddedEvent, initializer);
     event->setTarget(this);
@@ skipping 65 matching lines @@
     initializer.sessionId = sessionId;
     initializer.initData = Uint8Array::create(initData, initDataLength);
     initializer.bubbles = false;
     initializer.cancelable = false;
 
     RefPtr<Event> event = MediaKeyEvent::create(eventNames().webkitneedkeyEvent, initializer);
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event.release());
     return true;
 }
-#endif
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
 {
     if (!hasEventListeners("webkitneedkey")) {
         m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
         scheduleEvent(eventNames().errorEvent);
         return false;
     }
 
@@ skipping 512 matching lines @@
 
 void HTMLMediaElement::closeMediaSource()
 {
     if (!m_mediaSource)
         return;
 
     m_mediaSource->setReadyState(WebKitMediaSource::closedKeyword());
     m_mediaSource = 0;
 }
 
-#if ENABLE(ENCRYPTED_MEDIA)
 void HTMLMediaElement::webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionCode& ec)
 {
     if (keySystem.isEmpty()) {
         ec = SYNTAX_ERR;
         return;
     }
 
     if (!m_player) {
         ec = INVALID_STATE_ERR;
         return;
@@ skipping 62 matching lines @@
 
     if (!m_player) {
         ec = INVALID_STATE_ERR;
         return;
     }
 
     MediaPlayer::MediaKeyException result = m_player->cancelKeyRequest(keySystem, sessionId);
     ec = exceptionCodeForMediaKeyException(result);
 }
 
-#endif
-
 bool HTMLMediaElement::loop() const
 {
     return fastHasAttribute(loopAttr);
 }
 
 void HTMLMediaElement::setLoop(bool b)
 {
     LOG(Media, "HTMLMediaElement::setLoop(%s)", boolString(b));
     setBooleanAttribute(loopAttr, b);
 }
@@ skipping 1892 matching lines @@
     info.addMember(m_mediaGroup, "mediaGroup");
     info.addMember(m_mediaController, "mediaController");
 
 #if ENABLE(WEB_AUDIO)
     info.addMember(m_audioSourceNode, "audioSourceNode");
 #endif
 
 }
 
 }