| Index: media/base/media_switches.cc
|
| diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
| index b3b34f4e7cb9ab9421fd2e7853cc370f76defc09..baa93f9e96ffbc625c38d7f2980bb77431bc8126 100644
|
| --- a/media/base/media_switches.cc
|
| +++ b/media/base/media_switches.cc
|
| @@ -22,13 +22,13 @@ const char kDisableMediaSuspend[] = "disable-media-suspend";
|
| const char kDisableMediaThreadForMediaPlayback[] =
|
| "disable-media-thread-for-media-playback";
|
|
|
| -// 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";
|
| -
|
| // Sets the MediaSource player that uses the separate media thread
|
| const char kEnableMediaThreadForMediaPlayback[] =
|
| "enable-media-thread-for-media-playback";
|
| +
|
| +// Use WebMediaPlayerImpl instead of WebMediaPlayerAndroid. This is a temporary
|
| +// switch for experimenting with unifying the Android playback pipeline.
|
| +const char kEnableUnifiedMediaPipeline[] = "enable-unified-media-pipeline";
|
| #endif
|
|
|
| #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_SOLARIS)
|
|
|