Disable WindowTreeClientTest.WindowsRemovedWhenEmbedding on win due to flakes.

components/mus/ws/window_tree_client_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 601 matching lines @@
 };
 
 // Verifies two clients/connections get different ids.
 TEST_F(WindowTreeClientTest, TwoClientsGetDifferentConnectionIds) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   ASSERT_EQ(1u, changes2()->size());
   ASSERT_NE(connection_id_1(), connection_id_2());
 }
 
+// Disabled due to flakes on win8_chromium_ng; see https://crbug.com/598925.
+#if defined(OS_WIN)
+#define MAYBE_WindowsRemovedWhenEmbedding \
+    DISABLED_WindowsRemovedWhenEmbedding
+#else
+#define MAYBE_WindowsRemovedWhenEmbedding WindowsRemovedWhenEmbedding
+#endif
 // Verifies when Embed() is invoked any child windows are removed.
-TEST_F(WindowTreeClientTest, WindowsRemovedWhenEmbedding) {
+TEST_F(WindowTreeClientTest, MAYBE_WindowsRemovedWhenEmbedding) {
   // Two windows 1 and 2. 2 is parented to 1.
   Id window_1_1 = wt_client1()->NewWindow(1);
   ASSERT_TRUE(window_1_1);
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
 
   Id window_1_2 = wt_client1()->NewWindow(2);
   ASSERT_TRUE(window_1_2);
   ASSERT_TRUE(wt_client1()->AddWindow(window_1_1, window_1_2));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
@@ skipping 1060 matching lines @@
   TestWindowTreeClientImpl client2;
   mojom::WindowTreeClientPtr client2_ptr;
   mojo::Binding<WindowTreeClient> client2_binding(&client2, &client2_ptr);
   ASSERT_TRUE(Embed(wt1(), BuildWindowId(connection_id_1(), 1),
                     std::move(client2_ptr)));
   client2.WaitForOnEmbed();
   EXPECT_EQ("OnEmbed",
             SingleChangeToDescription(*client2.tracker()->changes()));
 }
 
-// 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) {
+TEST_F(WindowTreeClientTest, EmbedFailsFromOtherConnection) {
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
 
   Id window_1_1 = BuildWindowId(connection_id_1(), 1);
   Id window_2_1 = wt_client2()->NewWindow(1);
   ASSERT_TRUE(window_2_1);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_1, window_2_1));
   ASSERT_NO_FATAL_FAILURE(EstablishThirdConnection(wt2(), window_2_1));
 
   Id window_3_3 = wt_client3()->NewWindow(3);
   ASSERT_TRUE(window_3_3);
@@ skipping 201 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus