Promotes a handful of members from WmShell to Shell

ash/accelerators/spoken_feedback_toggler_unittest.cc

 // Copyright 2014 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/accelerators/spoken_feedback_toggler.h"
 #include "ash/common/accessibility_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/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 {
 
 using SpokenFeedbackTogglerTest = test::AshTestBase;
 
 TEST_F(SpokenFeedbackTogglerTest, Basic) {
   SpokenFeedbackToggler::ScopedEnablerForTest scoped;
-  AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
+  AccessibilityDelegate* delegate =
+      Shell::GetInstance()->accessibility_delegate();
   ui::test::EventGenerator& generator = GetEventGenerator();
   EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());
 
   generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);
   EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());
   generator.ReleaseKey(ui::VKEY_F6, 0);
   EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());
 
   // Click and hold toggles the spoken feedback.
   generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);
@@ skipping 38 matching lines @@
 
   // Hotkey press and hold.
   generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);
   generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);
   generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);
   generator.ReleaseKey(ui::VKEY_F6, 0);
   EXPECT_EQ("3 1", delegate.GetKeyCountsAndReset());
 }
 
 }  // namespace ash