| Index: content/public/common/content_switches.cc
|
| diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
|
| index 36089c9560f9e542a6e10c78215c41f696d1bd19..3e1b174ff7dfdcfbc3a589d71e8d2c02d5b0a200 100644
|
| --- a/content/public/common/content_switches.cc
|
| +++ b/content/public/common/content_switches.cc
|
| @@ -386,13 +386,8 @@ const char kEnableSkiaBenchmarking[] = "enable-skia-benchmarking";
|
| // builds.
|
| const char kEnableLogging[] = "enable-logging";
|
|
|
| -// Enable for Android (see http://crbug.com/233420) or disable for desktop the
|
| -// prefixed Media Source API (i.e., the WebKitMediaSource object).
|
| -#if defined(ANDROID) && !defined(GOOGLE_TV)
|
| -const char kEnableWebKitMediaSource[] = "enable-webkit-media-source";
|
| -#else
|
| +// Disables prefixed Media Source API (i.e., the WebKitMediaSource object).
|
| const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
|
| -#endif
|
|
|
| // Enables support for Encrypted Media Extensions (e.g. MediaKeys).
|
| const char kEnableEncryptedMedia[] = "enable-encrypted-media";
|
|
|