Move some more WM functionality down into ash.

ui/aura_shell/shell_accelerator_controller_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/window_util.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_accelerator_controller.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"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace aura_shell {
 namespace test {
 
 namespace {
@@ skipping 299 matching lines @@
   lock_modal_window->Show();
   EXPECT_FALSE(GetController()->Process(cycle_forward));
   EXPECT_FALSE(GetController()->Process(cycle_backward));
   lock_screen_window->Hide();
   EXPECT_TRUE(GetController()->Process(cycle_forward));
   EXPECT_TRUE(GetController()->Process(cycle_backward));
 }
 
 }  // namespace test
 }  // namespace aura_shell