| Index: media/mojo/services/media_apptest.cc
|
| diff --git a/media/mojo/services/media_apptest.cc b/media/mojo/services/media_apptest.cc
|
| index 27d68cc6e280309774bb6ca4842be6f90807982e..4e70db8c1fd1236bb291128da1bcdc52ab72eaf4 100644
|
| --- a/media/mojo/services/media_apptest.cc
|
| +++ b/media/mojo/services/media_apptest.cc
|
| @@ -143,7 +143,14 @@ TEST_F(MediaAppTest, InitializeCdm_InvalidKeySystem) {
|
| run_loop_->Run();
|
| }
|
|
|
| -TEST_F(MediaAppTest, InitializeRenderer_Success) {
|
| +// Sometimes fails on Linux. http://crbug.com/594977
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_InitializeRenderer_Success DISABLED_InitializeRenderer_Success
|
| +#else
|
| +#define MAYBE_InitializeRenderer_Success InitializeRenderer_Success
|
| +#endif
|
| +
|
| +TEST_F(MediaAppTest, MAYBE_InitializeRenderer_Success) {
|
| InitializeRenderer(TestVideoConfig::Normal(), true);
|
| run_loop_->Run();
|
| }
|
|
|