Move some more WM functionality down into ash.

ash/wm/activation_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/activation_controller.h"
 
+#include "ash/wm/window_util.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
 #include "ui/aura_shell/test/test_activation_delegate.h"
-#include "ui/aura_shell/window_util.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
 #endif
 #endif
 
 namespace aura_shell {
 namespace test {
@@ skipping 246 matching lines @@
 
   // Try focusing |w21|. Same rules apply.
   EXPECT_FALSE(IsActiveWindow(w2.get()));
   EXPECT_FALSE(w21->HasFocus());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_TRUE(w1->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura_shell