chromeos: Promotes more from WmShell to Shell

ash/mus/bridge/wm_shell_mus.cc

Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index f23863e4080cffd6e8e0aeff0f78a49b85e97a99..90ee85b536f8002ab04467b35455092770f5c0eb 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -115,18 +115,16 @@ class SessionStateDelegateStub : public SessionStateDelegate {
 
 WmShellMus::WmShellMus(
     WmWindow* primary_root_window,
-    std::unique_ptr<ShellDelegate> shell_delegate,
     WindowManager* window_manager,
     views::PointerWatcherEventRouter* pointer_watcher_event_router,
     bool create_session_state_delegate_stub)
-    : WmShell(std::move(shell_delegate)),
+    : WmShell(),

[James Cook, 2017/03/11 00:40:43]

nit: I don't think this line is needed.

[sky, 2017/03/13 15:23:19]

Done.

       window_manager_(window_manager),
       primary_root_window_(primary_root_window),
       pointer_watcher_event_router_(pointer_watcher_event_router) {
   if (create_session_state_delegate_stub)
     session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
   DCHECK(primary_root_window_);
-  WmShell::Set(this);
 
   uint16_t accelerator_namespace_id = 0u;
   const bool add_result =
@@ -146,7 +144,6 @@ WmShellMus::WmShellMus(
 }
 
 WmShellMus::~WmShellMus() {
-  WmShell::Set(nullptr);
 }
 
 // static