| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index b06ac05aed1284ae1ed5d9fbe099dea53700fb76..bd3d77a869b04ee28fd07a976f25445fac564c09 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -699,12 +699,6 @@ const FeatureEntry kFeatureEntries[] = {
|
| {"disable-media-source", IDS_FLAGS_MEDIA_SOURCE_NAME,
|
| IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION, kOsAll,
|
| SINGLE_DISABLE_VALUE_TYPE(switches::kDisableMediaSource)},
|
| - {"disable-encrypted-media", IDS_FLAGS_ENCRYPTED_MEDIA_NAME,
|
| - IDS_FLAGS_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll,
|
| - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableEncryptedMedia)},
|
| - {"enable-prefixed-encrypted-media", IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_NAME,
|
| - IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnablePrefixedEncryptedMedia)},
|
| {"disable-javascript-harmony-shipping",
|
| IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_NAME,
|
| IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, kOsAll,
|
|
|