Move wm/public into wm target

ui/wm/core/window_util_unittest.cc

 // Copyright 2014 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/window_util.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_tree_owner.h"
+#include "ui/wm/test/wm_test_base.h"
 
 namespace wm {
 
-typedef aura::test::AuraTestBase WindowUtilTest;
+typedef WMTestBase WindowUtilTest;
 
 // Test if the recreate layers does not recreate layers that have
 // already been acquired.
 TEST_F(WindowUtilTest, RecreateLayers) {
   scoped_ptr<aura::Window> window1(
       aura::test::CreateTestWindowWithId(0, NULL));
   scoped_ptr<aura::Window> window11(
       aura::test::CreateTestWindowWithId(1, window1.get()));
   scoped_ptr<aura::Window> window12(
       aura::test::CreateTestWindowWithId(2, window1.get()));
@@ skipping 13 matching lines @@
   // Child layer is new instance.
   EXPECT_NE(window11->layer(), tree->root()->children()[0]);
   EXPECT_NE(window12->layer(), tree->root()->children()[0]);
 
   // The original window should have both.
   ASSERT_EQ(2u, window1->layer()->children().size());
   EXPECT_EQ(window11->layer(), window1->layer()->children()[0]);
   EXPECT_EQ(window12->layer(), window1->layer()->children()[1]);
 }
 }  // namespace wm