Convert mus apptests to shelltests

components/mus/ws/window_manager_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/logging.h"
 #include "base/macros.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"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_connection_observer.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/shell/public/cpp/application_test_base.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
 namespace mus {
 namespace ws {
 
 namespace {
 
 int ValidIndexOf(const Window::Children& windows, Window* window) {
   Window::Children::const_iterator it =
@@ skipping 808 matching lines @@
   EXPECT_EQ(child21->id(), window_manager()->GetFocusedWindow()->id());
   EXPECT_EQ(child21->id(), embedded2->GetFocusedWindow()->id());
   EXPECT_TRUE(WaitForNoWindowToHaveFocus(embedded1));
   EXPECT_EQ(nullptr, embedded1->GetFocusedWindow());
   EXPECT_GT(ValidIndexOf(parent->children(), child2),
             ValidIndexOf(parent->children(), child1));
   EXPECT_GT(ValidIndexOf(parent->children(), child3),
             ValidIndexOf(parent->children(), child1));
 }
 
-// Very flaky: http://crbug.com/592313.
-TEST_F(WindowServerTest, DISABLED_ActivationNext) {
+TEST_F(WindowServerTest, ActivationNext) {
   Window* parent = GetFirstWMRoot();
   Window* child1 = NewVisibleWindow(parent, window_manager());
   Window* child2 = NewVisibleWindow(parent, window_manager());
   Window* child3 = NewVisibleWindow(parent, window_manager());
 
   WindowTreeConnection* embedded1 = Embed(child1).connection;
   ASSERT_NE(nullptr, embedded1);
   WindowTreeConnection* embedded2 = Embed(child2).connection;
   ASSERT_NE(nullptr, embedded2);
   WindowTreeConnection* embedded3 = Embed(child3).connection;
@@ skipping 313 matching lines @@
   ASSERT_TRUE(window_in_wm);
 
   // Change the bounds in the wm, and make sure the child sees it.
   window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
   ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
   EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
 }
 
 }  // namespace ws
 }  // namespace mus