Promotes more accessors from WmShell to Shell

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index c5a7ad23fd31278ce280ecfb245d94427161affc..c930a90952e1f1ebf7c7a4fcb5b38ce9fbdd1f36 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -44,13 +44,8 @@ class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
 struct ShellInitParams;
-class ShutdownController;
-class SystemTrayNotifier;
-class VpnList;
-class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
-class WindowSelectorController;
 class WmDisplayObserver;
 class WmWindow;
 class WorkspaceEventHandler;
@@ -73,24 +68,6 @@ class ASH_EXPORT WmShell {
 
   virtual void Shutdown();
 
-  ShutdownController* shutdown_controller() {
-    return shutdown_controller_.get();
-  }
-
-  SystemTrayNotifier* system_tray_notifier() {
-    return system_tray_notifier_.get();
-  }
-
-  VpnList* vpn_list() { return vpn_list_.get(); }
-
-  WindowCycleController* window_cycle_controller() {
-    return window_cycle_controller_.get();
-  }
-
-  WindowSelectorController* window_selector_controller() {
-    return window_selector_controller_.get();
-  }
-
   // Returns true when ash is running as a service_manager::Service.
   virtual bool IsRunningInMash() const = 0;
 
@@ -255,22 +232,12 @@ class ASH_EXPORT WmShell {
   virtual std::unique_ptr<AcceleratorController>
   CreateAcceleratorController() = 0;
 
-  void DeleteWindowCycleController();
-
-  void DeleteWindowSelectorController();
-
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
 
   static WmShell* instance_;
 
-  std::unique_ptr<ShutdownController> shutdown_controller_;
-  std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
-  std::unique_ptr<VpnList> vpn_list_;
-  std::unique_ptr<WindowCycleController> window_cycle_controller_;
-  std::unique_ptr<WindowSelectorController> window_selector_controller_;
-
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;