Remove ENCRYPTED_MEDIA_V2 as it is always set.

Remove the ENCRYPTED_MEDIA_V2 guard as it is always set.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=163940

[lgombos, 2013-12-14 19:44:09]

This has been set over 6 month now. Time to remove the guard.

[abarth-chromium, 2013-12-15 06:11:54]

lgtm

https://codereview.chromium.org/100103008/diff/1/Source/core/html/HTMLMediaEl...
File Source/core/html/HTMLMediaElement.cpp (left):

https://codereview.chromium.org/100103008/diff/1/Source/core/html/HTMLMediaEl...
Source/core/html/HTMLMediaElement.cpp:91: #include
"modules/encryptedmedia/MediaKeys.h"
Please alphabetize these headers with the rest of the headers above.

[commit-bot: I haz the power, 2013-12-16 02:25:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/l.gombos@samsung.com/100103008/20001

[commit-bot: I haz the power, 2013-12-16 02:25:52]

Failed to apply patch for Source/core/html/HTMLMediaElement.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/html/HTMLMediaElement.cpp
  Hunk #1 FAILED at 41.
  Hunk #2 FAILED at 55.
  2 out of 6 hunks FAILED -- saving rejects to file
Source/core/html/HTMLMediaElement.cpp.rej

Patch:       Source/core/html/HTMLMediaElement.cpp
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp
b/Source/core/html/HTMLMediaElement.cpp
index
6588589f64b0ec6f61515869b0e7c8c4a2a64d73..cf598801037a080b8c16cab4575a1c189ed09703
100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -41,6 +41,9 @@
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/Event.h"
 #include "core/events/ThreadLocalEventNames.h"
+#include "core/frame/ContentSecurityPolicy.h"
+#include "core/frame/Frame.h"
+#include "core/frame/Settings.h"
 #include "core/html/HTMLMediaSource.h"
 #include "core/html/HTMLSourceElement.h"
 #include "core/html/HTMLTrackElement.h"
@@ -55,13 +58,13 @@
 #include "core/html/track/TextTrackCueList.h"
 #include "core/html/track/TextTrackList.h"
 #include "core/loader/FrameLoader.h"
-#include "core/frame/ContentSecurityPolicy.h"
-#include "core/frame/Frame.h"
 #include "core/page/Page.h"
-#include "core/frame/Settings.h"
 #include "core/rendering/RenderLayerCompositor.h"
 #include "core/rendering/RenderVideo.h"
 #include "core/rendering/RenderView.h"
+// FIXME: Remove dependency on modules/encryptedmedia
(http://crbug.com/242754).
+#include "modules/encryptedmedia/MediaKeyNeededEvent.h"
+#include "modules/encryptedmedia/MediaKeys.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "platform/ContentType.h"
 #include "platform/Language.h"
@@ -85,12 +88,6 @@
 #include "modules/webaudio/MediaElementAudioSourceNode.h"
 #endif
 
-#if ENABLE(ENCRYPTED_MEDIA_V2)
-// FIXME: Remove dependency on modules/encryptedmedia
(http://crbug.com/242754).
-#include "modules/encryptedmedia/MediaKeyNeededEvent.h"
-#include "modules/encryptedmedia/MediaKeys.h"
-#endif
-
 using namespace std;
 using blink::WebInbandTextTrack;
 using blink::WebMimeRegistry;
@@ -342,9 +339,7 @@ HTMLMediaElement::~HTMLMediaElement()
 
     closeMediaSource();
 
-#if ENABLE(ENCRYPTED_MEDIA_V2)
     setMediaKeys(0);
-#endif
 
     removeElementFromDocumentMap(this, &document());
 
@@ -1727,7 +1722,6 @@ bool HTMLMediaElement::mediaPlayerKeyNeeded(const String&
keySystem, const Strin
     return true;
 }
 
-#if ENABLE(ENCRYPTED_MEDIA_V2)
 bool HTMLMediaElement::mediaPlayerKeyNeeded(Uint8Array* initData)
 {
     if (!hasEventListeners("webkitneedkey")) {
@@ -1759,7 +1753,6 @@ void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys)
     if (m_mediaKeys)
         m_mediaKeys->setMediaElement(this);
 }
-#endif
 
 void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
 {

[commit-bot: I haz the power, 2013-12-16 02:54:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/l.gombos@samsung.com/100103008/40001

[commit-bot: I haz the power, 2013-12-16 04:38:59]

Change committed as 163940