| Index: content/renderer/media/android/webmediaplayer_android.cc
|
| diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
|
| index 059e96f580aefb94ae56d870a2acdd12869bfb93..2811f2e73533f7cf55d8a79b098ea0ea781e2b8f 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.cc
|
| +++ b/content/renderer/media/android/webmediaplayer_android.cc
|
| @@ -61,7 +61,6 @@
|
| #include "third_party/WebKit/public/platform/WebURL.h"
|
| #include "third_party/WebKit/public/web/WebDocument.h"
|
| #include "third_party/WebKit/public/web/WebFrame.h"
|
| -#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| @@ -1482,12 +1481,6 @@ void WebMediaPlayerAndroid::OnEncryptedMediaInitData(
|
| const std::vector<uint8_t>& init_data) {
|
| DCHECK(main_thread_checker_.CalledOnValidThread());
|
|
|
| - // Do not fire the "encrypted" event if Encrypted Media is not enabled.
|
| - // EME may not be enabled on Android Jelly Bean.
|
| - if (!blink::WebRuntimeFeatures::isEncryptedMediaEnabled()) {
|
| - return;
|
| - }
|
| -
|
| // TODO(xhwang): Update this UMA name. https://crbug.com/589251
|
| UMA_HISTOGRAM_COUNTS("Media.EME.NeedKey", 1);
|
|
|
|
|