| Index: media/base/media_switches.cc
|
| diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
| index af1855d4861ba8820da2bc2f9d9810e0726cfe16..706d6665d216ff416fdabbbfdf347a9dad35124e 100644
|
| --- a/media/base/media_switches.cc
|
| +++ b/media/base/media_switches.cc
|
| @@ -22,12 +22,6 @@ const char kDisableMediaSuspend[] = "disable-media-suspend";
|
| const char kReportVp9AsAnUnsupportedMimeType[] =
|
| "report-vp9-as-an-unsupported-mime-type";
|
|
|
| -#if defined(OS_ANDROID)
|
| -// Use WebMediaPlayerAndroid instead of WebMediaPlayerImpl. This is a temporary
|
| -// switch for holding back the new unified media pipeline.
|
| -const char kDisableUnifiedMediaPipeline[] = "disable-unified-media-pipeline";
|
| -#endif
|
| -
|
| #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
|
| // The Alsa device to use when opening an audio input stream.
|
| const char kAlsaInputDevice[] = "alsa-input-device";
|
|
|