Move wm/public into wm target

ui/wm/core/image_grid_unittest.cc

 // Copyright (c) 2012 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/wm/core/image_grid.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/aura/test/aura_test_base.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/wm/test/wm_test_base.h"
 
 namespace wm {
 
 namespace {
 
 // Creates a gfx::Image with the requested dimensions.
 gfx::Image* CreateImage(const gfx::Size& size) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width(), size.height());
   return new gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bitmap));
 }
 
 }  // namespace
 
-typedef aura::test::AuraTestBase ImageGridTest;
+typedef WMTestBase ImageGridTest;
 
 // Test that an ImageGrid's layers are transformed correctly when SetSize() is
 // called.
 TEST_F(ImageGridTest, Basic) {
   // Size of the images around the grid's border.
   const int kBorder = 2;
 
   scoped_ptr<gfx::Image> image_1x1(CreateImage(gfx::Size(1, 1)));
   scoped_ptr<gfx::Image> image_1xB(CreateImage(gfx::Size(1, kBorder)));
   scoped_ptr<gfx::Image> image_Bx1(CreateImage(gfx::Size(kBorder, 1)));
@@ skipping 294 matching lines @@
   EXPECT_TRUE(grid.center_layer()->visible());
 
   // 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 wm