| Index: ui/views/corewm/image_grid_unittest.cc
|
| ===================================================================
|
| --- ui/views/corewm/image_grid_unittest.cc (revision 167460)
|
| +++ ui/views/corewm/image_grid_unittest.cc (working copy)
|
| @@ -2,17 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/test/ash_test_base.h"
|
| -#include "ash/wm/image_grid.h"
|
| +#include "ui/aura/test/aura_test_base.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/image/image.h"
|
| +#include "ui/views/corewm/image_grid.h"
|
|
|
| -using ash::internal::ImageGrid;
|
| +namespace views {
|
| +namespace corewm {
|
|
|
| -namespace ash {
|
| -namespace test {
|
| -
|
| namespace {
|
|
|
| // Creates a gfx::Image with the requested dimensions.
|
| @@ -24,7 +22,7 @@
|
|
|
| } // namespace
|
|
|
| -typedef ash::test::AshTestBase ImageGridTest;
|
| +typedef aura::test::AuraTestBase ImageGridTest;
|
|
|
| // Test that an ImageGrid's layers are transformed correctly when SetSize() is
|
| // called.
|
| @@ -338,5 +336,5 @@
|
| EXPECT_TRUE(test_api.bottom_right_clip_rect().IsEmpty());
|
| }
|
|
|
| -} // namespace test
|
| -} // namespace ash
|
| +} // namespace corewm
|
| +} // namespace views
|
|
|