Promotes more accessors from WmShell to Shell

ash/virtual_keyboard_controller_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/virtual_keyboard_controller.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/device_hotplug_event_observer.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/keyboard/keyboard_export.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
@@ skipping 84 matching lines @@
  public:
   VirtualKeyboardControllerAutoTest() : notified_(false), suppressed_(false) {}
   ~VirtualKeyboardControllerAutoTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
     // Set the current list of devices to empty so that they don't interfere
     // with the test.
     UpdateKeyboardDevices(std::vector<ui::InputDevice>());
     UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
-    WmShell::Get()->system_tray_notifier()->AddVirtualKeyboardObserver(this);
+    Shell::Get()->system_tray_notifier()->AddVirtualKeyboardObserver(this);
   }
 
   void TearDown() override {
-    WmShell::Get()->system_tray_notifier()->RemoveVirtualKeyboardObserver(this);
+    Shell::Get()->system_tray_notifier()->RemoveVirtualKeyboardObserver(this);
     AshTestBase::TearDown();
   }
 
   void OnKeyboardSuppressionChanged(bool suppressed) override {
     notified_ = true;
     suppressed_ = suppressed;
   }
 
   void ResetObserver() {
     suppressed_ = false;
@@ skipping 197 matching lines @@
   UpdateTouchscreenDevices(screens);
   std::vector<ui::InputDevice> keyboard_devices;
   keyboard_devices.push_back(ui::InputDevice(
       1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
   UpdateKeyboardDevices(keyboard_devices);
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
 }
 
 }  // namespace test
 }  // namespace ash