mus: Fix activation cycle direction.

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 793 matching lines @@
   WindowTreeConnection* embedded2 = Embed(child2).connection;
   ASSERT_NE(nullptr, embedded2);
   WindowTreeConnection* embedded3 = Embed(child3).connection;
   ASSERT_NE(nullptr, embedded3);
 
   Window* child11 = NewVisibleWindow(embedded1->GetRoot(), embedded1);
   Window* child21 = NewVisibleWindow(embedded2->GetRoot(), embedded2);
   Window* child31 = NewVisibleWindow(embedded3->GetRoot(), embedded3);
   WaitForTreeSizeToMatch(parent, 7);
 
-  Window* expecteds[] = { child1, child2, child3, child1, nullptr };
-  Window* focused[] = { child11, child21, child31, child11, nullptr };
+  Window* expecteds[] = { child3, child2, child1, child3, nullptr };
+  Window* focused[] = { child31, child21, child11, child31, nullptr };
   for (size_t index = 0; expecteds[index]; ++index) {
     host()->ActivateNextWindow();
-    ASSERT_TRUE(WaitForOrderChange(window_manager(), expecteds[index]))
-        << " Failure at " << index;
-
     WaitForWindowToHaveFocus(focused[index]);
     EXPECT_TRUE(focused[index]->HasFocus());
+    EXPECT_EQ(parent->children().back(), expecteds[index]);
   }
 }
 
 namespace {
 
 class DestroyedChangedObserver : public WindowObserver {
  public:
   DestroyedChangedObserver(WindowServerTestBase* test,
                            Window* window,
                            bool* got_destroy)
@@ skipping 223 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