| Index: components/mus/ws/window_tree_client_unittest.cc
|
| diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc
|
| index f1e157125817292f95253ad724c0eef49f6380eb..c2fe5932ffd2c62254d326d75bc22741651d60cd 100644
|
| --- a/components/mus/ws/window_tree_client_unittest.cc
|
| +++ b/components/mus/ws/window_tree_client_unittest.cc
|
| @@ -1701,7 +1701,14 @@ TEST_F(WindowTreeClientTest, EmbedSupplyingWindowTreeClient) {
|
| SingleChangeToDescription(*client2.tracker()->changes()));
|
| }
|
|
|
| -TEST_F(WindowTreeClientTest, EmbedFailsFromOtherConnection) {
|
| +// Disabled due to flakes on win8_chromium_ng; see https://crbug.com/598925.
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_EmbedFailsFromOtherConnection \
|
| + DISABLED_EmbedFailsFromOtherConnection
|
| +#else
|
| +#define MAYBE_EmbedFailsFromOtherConnection EmbedFailsFromOtherConnection
|
| +#endif
|
| +TEST_F(WindowTreeClientTest, MAYBE_EmbedFailsFromOtherConnection) {
|
| ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
|
|
|
| Id window_1_1 = BuildWindowId(connection_id_1(), 1);
|
|
|