Revert 259580 "Move wm/public into wm target"

trunk/src/content/public/test/test_renderer_host.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 "content/public/test/test_renderer_host.h"
 
 #include "base/run_loop.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/test_render_frame_host_factory.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_render_view_host_factory.h"
 #include "content/test/test_web_contents.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #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 {
 
 // RenderViewHostTester -------------------------------------------------------
 
 // static
 RenderViewHostTester* RenderViewHostTester::For(RenderViewHost* host) {
   return static_cast<TestRenderViewHost*>(host);
 }
@@ skipping 86 matching lines @@
 void RenderViewHostTestHarness::SetContents(WebContents* contents) {
   contents_.reset(contents);
 }
 
 WebContents* RenderViewHostTestHarness::CreateTestWebContents() {
   // Make sure we ran SetUp() already.
 #if defined(OS_WIN)
   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.
   SiteInstance* instance = SiteInstance::Create(browser_context_.get());
 
   return TestWebContents::Create(browser_context_.get(), instance);
 }
 
 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) {
   static_cast<TestWebContents*>(web_contents())->NavigateAndCommit(url);
@@ skipping 19 matching lines @@
   thread_bundle_.reset(new TestBrowserThreadBundle(thread_bundle_options_));
 
 #if defined(OS_WIN)
   ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
 #if defined(USE_AURA)
   // The ContextFactory must exist before any Compositors are created.
   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_);
   browser_context_.reset(CreateBrowserContext());
 
   SetContents(CreateTestWebContents());
 }
 
 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
   // before we destroy the browser context.
   base::RunLoop().RunUntilIdle();
 
 #if defined(OS_WIN)
   ole_initializer_.reset();
 #endif
 
@@ skipping 14 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content