Promotes a handful of members from WmShell to Shell

ash/common/system/ime/tray_ime_chromeos_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/common/system/ime/tray_ime_chromeos.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 class TrayIMETest : public test::AshTestBase {
  public:
   TrayIMETest() {}
@@ skipping 30 matching lines @@
   std::unique_ptr<views::View> detailed_view_;
 
   bool keyboard_suppressed_ = false;
   std::vector<ui::TouchscreenDevice> touchscreen_devices_to_restore_;
   std::vector<ui::InputDevice> keyboard_devices_to_restore_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayIMETest);
 };
 
 void TrayIMETest::SetAccessibilityKeyboardEnabled(bool enabled) {
-  WmShell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(enabled);
+  Shell::GetInstance()->accessibility_delegate()->SetVirtualKeyboardEnabled(
+      enabled);
   keyboard::SetAccessibilityKeyboardEnabled(enabled);
   AccessibilityNotificationVisibility notification =
       enabled ? A11Y_NOTIFICATION_SHOW : A11Y_NOTIFICATION_NONE;
   WmShell::Get()->system_tray_notifier()->NotifyAccessibilityModeChanged(
       notification);
 }
 
 void TrayIMETest::SetIMELength(int length) {
   tray_->ime_list_.clear();
   IMEInfo ime;
@@ skipping 122 matching lines @@
   // Clicking again should disable the keyboard.
   toggle = GetToggleView();
   tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
                          ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   toggle->OnGestureEvent(&tap);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
   EXPECT_TRUE(default_view()->visible());
 }
 
 }  // namespace ash