Makes WindowTreeClientTest destroy state in TearDown

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 578 matching lines @@
     // is the client id is not zero, but adding this as rest of code here
     // assumes 1.
     ASSERT_GT((*changes1())[0].connection_id, 0);
     connection_id_1_ = (*changes1())[0].connection_id;
     ASSERT_FALSE((*changes1())[0].windows.empty());
     root_window_id_ = (*changes1())[0].windows[0].window_id;
     ASSERT_EQ(root_window_id_, wt_client1_->root_window_id());
     changes1()->clear();
   }
 
+  void TearDown() override {
+    // Destroy these before the message loop is destroyed (happens in
+    // WindowServerShellTestBase::TearDown).
+    wt_client1_.reset();
+    wt_client2_.reset();
+    wt_client3_.reset();
+    client_factory_.reset();
+    WindowServerShellTestBase::TearDown();
+  }
+
   scoped_ptr<TestWindowTreeClientImpl> wt_client1_;
   scoped_ptr<TestWindowTreeClientImpl> wt_client2_;
   scoped_ptr<TestWindowTreeClientImpl> wt_client3_;
 
   mojom::WindowTreeHostPtr host_;
 
  private:
   scoped_ptr<WindowTreeClientFactory> client_factory_;
   int connection_id_1_;
   int connection_id_2_;
   Id root_window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientTest);
 };
 
 // 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, MAYBE_WindowsRemovedWhenEmbedding) {
+TEST_F(WindowTreeClientTest, 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 1282 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