| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 2a7e586fe6e6b219a45481a284bf11b73eec8346..fc6bdb5c4c0e6d286d526b00c04ec60b20acc028 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -700,12 +700,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,
|
|
|