Revert 259580 "Move wm/public into wm target"

trunk/src/chrome/test/base/view_event_test_base.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 "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 11 matching lines @@
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/wm/core/wm_state.h"
-#include "ui/wm/test/wm_test_helper.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #endif
 
 namespace {
 
@@ skipping 87 matching lines @@
   ash::test::TestShellDelegate* shell_delegate =
       new ash::test::TestShellDelegate();
   ash::Shell::CreateInstance(shell_delegate);
   shell_delegate->test_session_state_delegate()
       ->SetActiveUserSessionStarted(true);
   context = ash::Shell::GetPrimaryRootWindow();
   context->GetHost()->Show();
 #endif  // !OS_WIN
   aura::Env::CreateInstance();
 #elif defined(USE_AURA)
-  // Instead of using the ash shell, use an WMTestHelper to create and manage
+  // Instead of using the ash shell, use an AuraTestHelper to create and manage
   // the test screen.
-  wm_test_helper_.reset(new wm::WMTestHelper);
-  wm_test_helper_->SetUp();
-  context = wm_test_helper_->root_window();
+  aura_test_helper_.reset(
+      new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
+  aura_test_helper_->SetUp();
+  context = aura_test_helper_->root_window();
 #endif  // !USE_ASH && USE_AURA
 
   window_ = views::Widget::CreateWindowWithContext(this, context);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
     window_->Close();
     content::RunAllPendingInMessageLoop();
     window_ = NULL;
   }
 
   ui::Clipboard::DestroyClipboardForCurrentThread();
 
 #if defined(USE_ASH)
 #if !defined(OS_WIN)
   ash::Shell::DeleteInstance();
 #if defined(OS_CHROMEOS)
   chromeos::NetworkHandler::Shutdown();
   chromeos::CrasAudioHandler::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
   // Ash Shell can't just live on its own without a browser process, we need to
   // also shut down the message center.
   message_center::MessageCenter::Shutdown();
 #endif  // !OS_WIN
   aura::Env::DeleteInstance();
 #elif defined(USE_AURA)
-  wm_test_helper_->TearDown();
+  aura_test_helper_->TearDown();
 #endif  // !USE_ASH && USE_AURA
 
 #if defined(USE_AURA)
   ui::TerminateContextFactoryForTests();
 #endif
 
   ui::ShutdownInputMethodForTesting();
   views::ViewsDelegate::views_delegate = NULL;
 
 #if defined(USE_AURA)
@@ skipping 63 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }