mus: Fix notifying clients about window reordering.

components/mus/ws/window_manager_client_apptest.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 "base/bind.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/tests/window_server_test_base.h"
 #include "components/mus/public/cpp/window_observer.h"
@@ skipping 399 matching lines @@
   Window* window2 = window_manager()->NewWindow();
   window2->SetVisible(true);
   window_manager()->GetRoot()->AddChild(window2);
   WindowTreeConnection* embedded1 = Embed(window1).connection;
   ASSERT_NE(nullptr, embedded1);
   WindowTreeConnection* embedded2 = Embed(window2).connection;
   ASSERT_NE(nullptr, embedded2);
   EXPECT_NE(embedded1, embedded2);
 }
 
-// TODO(alhaad): Currently, the RunLoop gets stuck waiting for order change.
-// Debug and re-enable this.
-TEST_F(WindowServerTest, DISABLED_Reorder) {
+TEST_F(WindowServerTest, Reorder) {
   Window* window1 = window_manager()->NewWindow();
   window1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(window1);
 
   WindowTreeConnection* embedded = Embed(window1).connection;
   ASSERT_NE(nullptr, embedded);
 
   Window* window11 = embedded->NewWindow();
   window11->SetVisible(true);
   embedded->GetRoot()->AddChild(window11);
   Window* window12 = embedded->NewWindow();
   window12->SetVisible(true);
   embedded->GetRoot()->AddChild(window12);
+  ASSERT_TRUE(WaitForTreeSizeToMatch(window1, 3u));
 
   Window* root_in_embedded = embedded->GetRoot();
 
   {
-    ASSERT_TRUE(WaitForTreeSizeToMatch(root_in_embedded, 3u));
     window11->MoveToFront();
-    ASSERT_TRUE(WaitForOrderChange(embedded, root_in_embedded));
-
+    // The |embedded| tree should be updated immediately.
     EXPECT_EQ(root_in_embedded->children().front(),
               embedded->GetWindowById(window12->id()));
     EXPECT_EQ(root_in_embedded->children().back(),
               embedded->GetWindowById(window11->id()));
+
+    // The |window_manager()| tree is still not updated.
+    EXPECT_EQ(window1->children().back(),
+              window_manager()->GetWindowById(window12->id()));
+
+    // Wait until |window_manager()| tree is updated.
+    ASSERT_TRUE(WaitForOrderChange(
+        window_manager(), window_manager()->GetWindowById(window11->id())));
+    EXPECT_EQ(window1->children().front(),
+              window_manager()->GetWindowById(window12->id()));
+    EXPECT_EQ(window1->children().back(),
+              window_manager()->GetWindowById(window11->id()));
   }
 
   {
     window11->MoveToBack();
-    ASSERT_TRUE(
-        WaitForOrderChange(embedded, embedded->GetWindowById(window11->id())));
-
+    // |embedded| should be updated immediately.
     EXPECT_EQ(root_in_embedded->children().front(),
               embedded->GetWindowById(window11->id()));
     EXPECT_EQ(root_in_embedded->children().back(),
               embedded->GetWindowById(window12->id()));
+
+    // |window_manager()| is also eventually updated.
+    EXPECT_EQ(window1->children().back(),
+              window_manager()->GetWindowById(window11->id()));
+    ASSERT_TRUE(WaitForOrderChange(
+        window_manager(), window_manager()->GetWindowById(window11->id())));
+    EXPECT_EQ(window1->children().front(),
+              window_manager()->GetWindowById(window11->id()));
+    EXPECT_EQ(window1->children().back(),
+              window_manager()->GetWindowById(window12->id()));
   }
 }
 
 namespace {
 
 class VisibilityChangeObserver : public WindowObserver {
  public:
   explicit VisibilityChangeObserver(Window* window) : window_(window) {
     window_->AddObserver(this);
   }
@@ skipping 420 matching lines @@
   WaitForBoundsToChange(embedded_connection->GetRoot());
   EXPECT_TRUE(gfx::Rect(21, 22, 23, 24) ==
               embedded_connection->GetRoot()->bounds());
   EXPECT_TRUE(gfx::Insets(1, 2, 3, 4) ==
               embedded_connection->GetRoot()->client_area());
 }
 
 }  // namespace ws
 
 }  // namespace mus