| 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 651d2442b8ccaeba55742228751375126ea4c5f1..c2636c7a7dcf1897719bfe52f40e975b5f0c57ca 100644
|
| --- a/mojo/services/view_manager/view_manager_unittest.cc
|
| +++ b/mojo/services/view_manager/view_manager_unittest.cc
|
| @@ -567,7 +567,13 @@ TEST_F(ViewManagerTest, MultipleEmbedRootsBeforeWTHReady) {
|
| }
|
|
|
| // 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("OnEmbed creator=",
|
|
|