Revert 259580 "Move wm/public into wm target"

trunk/src/content/public/test/test_renderer_host.cc

Index: trunk/src/content/public/test/test_renderer_host.cc
===================================================================
--- trunk/src/content/public/test/test_renderer_host.cc	(revision 259588)
+++ trunk/src/content/public/test/test_renderer_host.cc	(working copy)
@@ -23,8 +23,8 @@
 #endif
 
 #if defined(USE_AURA)
+#include "ui/aura/test/aura_test_helper.h"
 #include "ui/compositor/test/context_factories_for_test.h"
-#include "ui/wm/test/wm_test_helper.h"
 #endif
 
 namespace content {
@@ -131,7 +131,7 @@
   DCHECK(ole_initializer_ != NULL);
 #endif
 #if defined(USE_AURA)
-  DCHECK(wm_test_helper_ != NULL);
+  DCHECK(aura_test_helper_ != NULL);
 #endif
 
   // This will be deleted when the WebContentsImpl goes away.
@@ -171,8 +171,9 @@
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output);
 
-  wm_test_helper_.reset(new wm::WMTestHelper);
-  wm_test_helper_->SetUp();
+  aura_test_helper_.reset(
+      new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
+  aura_test_helper_->SetUp();
 #endif
 
   DCHECK(!browser_context_);
@@ -184,7 +185,7 @@
 void RenderViewHostTestHarness::TearDown() {
   SetContents(NULL);
 #if defined(USE_AURA)
-  wm_test_helper_->TearDown();
+  aura_test_helper_->TearDown();
   ui::TerminateContextFactoryForTests();
 #endif
   // Make sure that we flush any messages related to WebContentsImpl destruction