chromeos: Promotes more from WmShell to Shell

ash/mus/window_manager.cc

Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 8818e3cbdd393d96889b57860a3bdf4eaa865c69..3476cc5f50d21775db6d12b1fa4bf715074796a2 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -195,10 +195,12 @@ void WindowManager::CreateShell(
   ShellInitParams init_params;
   WmShellMus* wm_shell = new WmShellMus(
       WmWindow::Get(window_tree_host->window()),
-      shell_delegate_for_test_ ? std::move(shell_delegate_for_test_)
-                               : base::MakeUnique<ShellDelegateMus>(connector_),
       this, pointer_watcher_event_router_.get(),
       create_session_state_delegate_stub_for_test_);
+  // Shell::CreateInstance() takes ownership of ShellDelegate.
+  init_params.delegate = shell_delegate_for_test_
+                             ? shell_delegate_for_test_.release()
+                             : new ShellDelegateMus(connector_);
   init_params.primary_window_tree_host = window_tree_host.release();
   init_params.wm_shell = wm_shell;
   init_params.blocking_pool = blocking_pool_.get();