Reduce creation of ViewsDelegate

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 9cf348850067dd63fbc3da40c76e2f73af558f86..a59019b79030b8a732e1b451b30bcd43b43a4f2a 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -7,6 +7,7 @@
 #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"
@@ -22,7 +23,6 @@
 #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"
@@ -56,7 +56,7 @@ AshTestHelper::~AshTestHelper() {
 }
 
 void AshTestHelper::SetUp(bool start_session) {
-  wm_state_.reset(new wm::WMState);
+  views_delegate_.reset(new AshTestViewsDelegate);
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
@@ -133,7 +133,7 @@ void AshTestHelper::TearDown() {
 
   CHECK(!wm::ScopedCaptureClient::IsActive());
 
-  wm_state_.reset();
+  views_delegate_.reset();
 }
 
 void AshTestHelper::RunAllPendingInMessageLoop() {