Revert 270290 "Reduce creation of ViewsDelegate"

trunk/src/ash/test/ash_test_helper.cc

 // Copyright 2013 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 "ash/test/ash_test_helper.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
-#include "ash/test/ash_test_views_delegate.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/run_loop.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/message_center/message_center.h"
 #include "ui/wm/core/capture_controller.h"
+#include "ui/wm/core/wm_state.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/keyboard/keyboard.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
@@ skipping 13 matching lines @@
   CHECK(message_loop_);
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 }
 
 AshTestHelper::~AshTestHelper() {
 }
 
 void AshTestHelper::SetUp(bool start_session) {
-  views_delegate_.reset(new AshTestViewsDelegate);
+  wm_state_.reset(new wm::WMState);
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ui::InitializeInputMethodForTesting();
 
   bool enable_pixel_output = false;
   ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   // Creates Shell and hook with Desktop.
@@ skipping 56 matching lines @@
   ui::TerminateContextFactoryForTests();
 
   // Need to reset the initial login status.
   TestSystemTrayDelegate::SetInitialLoginStatus(user::LOGGED_IN_USER);
 
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
   CHECK(!wm::ScopedCaptureClient::IsActive());
 
-  views_delegate_.reset();
+  wm_state_.reset();
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {
   DCHECK(base::MessageLoopForUI::current() == message_loop_);
   aura::Env::CreateInstance(true);
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 aura::Window* AshTestHelper::CurrentContext() {
@@ skipping 17 matching lines @@
 bool AshTestHelper::SupportsHostWindowResize() {
 #if defined(OS_WIN)
   return false;
 #else
   return true;
 #endif
 }
 
 }  // namespace test
 }  // namespace ash