Move 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 8c1479cd833e37aa71babb35db4bd3988a72b9bf..05953cbcb72fd44a393ac3820b8acceadc1c51ad 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -126,8 +126,6 @@ WmShellMus::WmShellMus(
   DCHECK(primary_root_window_);
 
   immersive_handler_factory_.reset(new ImmersiveHandlerFactoryMus);
-
-  SetKeyboardUI(KeyboardUIMus::Create(window_manager_->connector()));
 }
 
 WmShellMus::~WmShellMus() {
@@ -323,6 +321,10 @@ WmShellMus::CreateImmersiveFullscreenController() {
   return base::MakeUnique<ImmersiveFullscreenController>();
 }
 
+std::unique_ptr<KeyboardUI> WmShellMus::CreateKeyboardUI() {
+  return KeyboardUIMus::Create(window_manager_->connector());
+}
+
 std::unique_ptr<KeyEventWatcher> WmShellMus::CreateKeyEventWatcher() {
   // TODO: needs implementation for mus, http://crbug.com/649600.
   NOTIMPLEMENTED();