| 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);
|
|
|
|
|