Move some more WM functionality down into ash.

ash/wm/toplevel_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 "ash/wm/toplevel_window_event_filter.h"
+#include "ash/wm/window_util.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.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_window_delegate.h"
-#include "ui/aura_shell/toplevel_window_event_filter.h"
-#include "ui/aura_shell/window_util.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
 #endif
 #endif
 
@@ skipping 290 matching lines @@
   generator.DoubleClickLeftButton();
 
   EXPECT_TRUE(IsWindowMaximized(w1.get()));
   generator.DoubleClickLeftButton();
 
   EXPECT_FALSE(IsWindowMaximized(w1.get()));
 }
 
 }  // namespace test
 }  // namespace aura