Revert 259580 "Move wm/public into wm target"

trunk/src/ui/snapshot/snapshot_aura_unittest.cc

Index: trunk/src/ui/snapshot/snapshot_aura_unittest.cc
===================================================================
--- trunk/src/ui/snapshot/snapshot_aura_unittest.cc	(revision 259588)
+++ trunk/src/ui/snapshot/snapshot_aura_unittest.cc	(working copy)
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
@@ -22,7 +23,6 @@
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/wm/test/wm_test_helper.h"
 
 namespace ui {
 namespace {
@@ -90,7 +90,8 @@
     bool enable_pixel_output = true;
     ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-    helper_.reset(new wm::WMTestHelper);
+    helper_.reset(
+        new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
     helper_->SetUp();
   }
 
@@ -171,7 +172,7 @@
     bool completed_;
   };
 
-  scoped_ptr<wm::WMTestHelper> helper_;
+  scoped_ptr<aura::test::AuraTestHelper> helper_;
   scoped_ptr<aura::Window> test_window_;
   scoped_ptr<TestPaintingWindowDelegate> delegate_;
   std::vector<unsigned char> png_representation_;