Move some more files into ash... this time seed the window manager dir.

ash/wm/image_grid_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/image_grid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura_shell/image_grid.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
 #include "ui/gfx/image/image.h"
 
 using aura_shell::internal::ImageGrid;
 
 namespace aura_shell {
 namespace test {
 
 namespace {
 
@@ skipping 245 matching lines @@
 
   // We shouldn't be clipping the corner images anymore.
   EXPECT_TRUE(test_api.top_left_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.top_right_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.bottom_left_clip_rect().IsEmpty());
   EXPECT_TRUE(test_api.bottom_right_clip_rect().IsEmpty());
 }
 
 }  // namespace test
 }  // namespace aura_shell