Rename runtime enabled check for prefixed Encrypted Media API.

Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 151 matching lines @@
     RuntimeEnabledFeatures::setDirectoryUploadEnabled(enable);
 }
 
 bool WebRuntimeFeatures::isDirectoryUploadEnabled()
 {
     return RuntimeEnabledFeatures::directoryUploadEnabled();
 }
 
 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)
 {
     RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(enable);
 }
 
 bool WebRuntimeFeatures::isExperimentalCanvasFeaturesEnabled()
 {
     return RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled();
@@ skipping 344 matching lines @@
 {
     RuntimeEnabledFeatures::setWebPInAcceptHeaderEnabled(enable);
 }
 
 bool WebRuntimeFeatures::isWebPInAcceptHeaderEnabled()
 {
     return RuntimeEnabledFeatures::webPInAcceptHeaderEnabled();
 }
 
 } // namespace WebKit