Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: content/child/runtime_features.cc

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/child/simple_webmimeregistry_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index b9fed49d30ab6f9e58bc32de6c3c7992254b49d5..3bdd9739f8fa86956a526f5d59aa9cf4effa60b7 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -33,7 +33,6 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
#if defined(OS_ANDROID)
// EME implementation needs Android MediaCodec API.
if (!media::MediaCodecUtil::IsMediaCodecAvailable()) {
- WebRuntimeFeatures::enablePrefixedEncryptedMedia(false);
WebRuntimeFeatures::enableEncryptedMedia(false);
}
@@ -104,12 +103,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
if (command_line.HasSwitch(switches::kDisableSpeechAPI))
WebRuntimeFeatures::enableScriptedSpeech(false);
- if (command_line.HasSwitch(switches::kDisableEncryptedMedia))
- WebRuntimeFeatures::enableEncryptedMedia(false);
-
- if (command_line.HasSwitch(switches::kEnablePrefixedEncryptedMedia))
- WebRuntimeFeatures::enablePrefixedEncryptedMedia(true);
-
if (command_line.HasSwitch(switches::kDisableFileSystem))
WebRuntimeFeatures::enableFileSystem(false);
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/child/simple_webmimeregistry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698