| Index: mojo/services/view_manager/view_manager_unittest.cc
|
| diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
|
| index 259079648a04cd2fecdf9a1febf9995da4a6539d..49dcb26e4f68dc06b8f6c413d907135b0801df21 100644
|
| --- a/mojo/services/view_manager/view_manager_unittest.cc
|
| +++ b/mojo/services/view_manager/view_manager_unittest.cc
|
| @@ -527,7 +527,13 @@ TEST_F(ViewManagerTest, SecondEmbedRoot) {
|
| }
|
|
|
| // Verifies client gets a valid id.
|
| -TEST_F(ViewManagerTest, ValidId) {
|
| +#if defined(OS_LINUX)
|
| +// http://crbug.com/396492
|
| +#define MAYBE_ValidId DISABLED_ValidId
|
| +#else
|
| +#define MAYBE_ValidId ValidId
|
| +#endif
|
| +TEST_F(ViewManagerTest, MAYBE_ValidId) {
|
| // TODO(beng): this should really have the URL of the application that
|
| // connected to ViewManagerInit.
|
| EXPECT_EQ("OnConnectionEstablished creator=",
|
|
|