mash: Migrate AccessibilityDelegate access to WmShell.

ash/accelerators/spoken_feedback_toggler_unittest.cc

Index: ash/accelerators/spoken_feedback_toggler_unittest.cc
diff --git a/ash/accelerators/spoken_feedback_toggler_unittest.cc b/ash/accelerators/spoken_feedback_toggler_unittest.cc
index 4f70e50ff7fee6366b6c7c7abe235626d60b992d..75885f6d40e7c4fccb90efde1ea127d239479601 100644
--- a/ash/accelerators/spoken_feedback_toggler_unittest.cc
+++ b/ash/accelerators/spoken_feedback_toggler_unittest.cc
@@ -4,20 +4,20 @@
 
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/common/accessibility_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/test/test_window_delegate.h"
+#include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 
 namespace ash {
 
-typedef ash::test::AshTestBase SpokenFeedbackTogglerTest;
+typedef test::AshTestBase SpokenFeedbackTogglerTest;

[James Cook, 2016/06/28 22:34:25]

optional nit: using

[msw, 2016/06/28 22:49:50]

Done.

 
 TEST_F(SpokenFeedbackTogglerTest, Basic) {
   SpokenFeedbackToggler::ScopedEnablerForTest scoped;
-  Shell* shell = Shell::GetInstance();
-  AccessibilityDelegate* delegate = shell->accessibility_delegate();
+  AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
   ui::test::EventGenerator& generator = GetEventGenerator();
   EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());