Move some more WM functionality down into ash.

ash/wm/root_window_event_filter_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 "ui/aura_shell/root_window_event_filter.h"
+#include "ash/wm/root_window_event_filter.h"
 
 #include "ash/wm/activation_controller.h"
+#include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/test_event_filter.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "ui/aura_shell/test/test_activation_delegate.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
 namespace aura_shell {
 namespace test {
 
 class RootWindowEventFilterTest : public aura::test::AuraTestBase {
  public:
   RootWindowEventFilterTest() {
     aura::RootWindow::GetInstance()->SetEventFilter(
@@ skipping 412 matching lines @@
   EXPECT_EQ(0, f1->key_event_count());
   EXPECT_EQ(0, f1->mouse_event_count());
   EXPECT_EQ(1, f2->key_event_count());
   EXPECT_EQ(1, f2->mouse_event_count());
 
   root_window_filter->RemoveFilter(f2.get());
 }
 
 }  // namespace test
 }  // namespace aura_shell