Revert 270290 "Reduce creation of ViewsDelegate"

trunk/src/ash/test/ash_test_helper.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace aura {
 class Window;
 }  // namespace aura
 
 namespace base {
 class MessageLoopForUI;
 }  // namespace base
 
 namespace ui {
 class ScopedAnimationDurationScaleMode;
 }  // namespace ui
 
-namespace views {
-class ViewsDelegate;
+namespace wm {
+class WMState;
 }
 
 namespace ash {
 namespace test {
 
 class TestScreenshotDelegate;
 class TestShellDelegate;
 
 // A helper class that does common initialization required for Ash. Creates a
 // root window and an ash::Shell instance with a test delegate.
@@ skipping 35 matching lines @@
   static bool SupportsHostWindowResize();
 
  private:
   base::MessageLoopForUI* message_loop_;  // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
   // Owned by ash::AcceleratorController
   TestScreenshotDelegate* test_screenshot_delegate_;
 
-  scoped_ptr<views::ViewsDelegate> views_delegate_;
+  scoped_ptr<wm::WMState> wm_state_;
 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_