Move some more WM functionality down into ash.

ash/wm/modal_container_layout_manager_unittest.cc

 // Copyright (c) 2011 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 "ash/wm/modal_container_layout_manager.h"
 
+#include "ash/wm/window_util.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace aura_shell {
 namespace test {
 
 namespace {
 
 aura::Window* GetModalContainer() {
   return Shell::GetInstance()->GetContainer(
@@ skipping 140 matching lines @@
   EXPECT_TRUE(IsActiveWindow(parent.get()));
 
   // Attempting to click unrelated should activate it.
   aura::test::EventGenerator e2(unrelated.get());
   e2.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(unrelated.get()));
 }
 
 }  // namespace test
 }  // namespace aura_shell