Rename runtime enabled check for prefixed Encrypted Media API.

Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

Index: Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
diff --git a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
index 998aff5047646fb66915ccdb46aa9461dda162e4..d8624ea0066fe91cd1608f5fac6b1473ea8478da 100644
--- a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -169,12 +169,34 @@ bool WebRuntimeFeatures::isDirectoryUploadEnabled()
 
 void WebRuntimeFeatures::enableEncryptedMedia(bool enable)
 {
-    RuntimeEnabledFeatures::setEncryptedMediaEnabled(enable);
+    // FIXME: Change to setEncryptedMediaEnabled() once Chromium
+    // starts calling enableWebKitEncryptedMedia().
+    RuntimeEnabledFeatures::setWebKitEncryptedMediaEnabled(enable);
+    // FIXME: Hack to allow MediaKeyError to be enabled for either version.
+    RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled(
+        RuntimeEnabledFeatures::encryptedMediaEnabled()
+        || RuntimeEnabledFeatures::webKitEncryptedMediaEnabled());
 }
 
 bool WebRuntimeFeatures::isEncryptedMediaEnabled()
 {
-    return RuntimeEnabledFeatures::encryptedMediaEnabled();
+    // FIXME: Change to encryptedMediaEnabled() once Chromium
+    // starts calling isWebKitEncryptedMediaEnabled()
+    return RuntimeEnabledFeatures::webKitEncryptedMediaEnabled();
+}
+
+void WebRuntimeFeatures::enableWebKitEncryptedMedia(bool enable)
+{
+    RuntimeEnabledFeatures::setWebKitEncryptedMediaEnabled(enable);
+    // FIXME: Hack to allow MediaKeyError to be enabled for either version.
+    RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled(
+        RuntimeEnabledFeatures::encryptedMediaEnabled()
+        || RuntimeEnabledFeatures::webKitEncryptedMediaEnabled());
+}
+
+bool WebRuntimeFeatures::isWebKitEncryptedMediaEnabled()
+{
+    return RuntimeEnabledFeatures::webKitEncryptedMediaEnabled();
 }
 
 void WebRuntimeFeatures::enableExperimentalCanvasFeatures(bool enable)