Moves mash/wm into ash/mus

chrome/app/mash/mash_runner.cc

Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 57d7b041fc0dc9566680a408d722e69305434fdc..10e4958b1de588b6f6fead339984deed68b68540 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/app/mash/mash_runner.h"
 
+#include "ash/mus/window_manager_application.h"
 #include "ash/sysui/sysui_application.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ -20,7 +21,6 @@
 #include "mash/quick_launch/quick_launch_application.h"
 #include "mash/session/session.h"
 #include "mash/task_viewer/task_viewer.h"
-#include "mash/wm/window_manager_application.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/native_runner_delegate.h"
@@ -87,7 +87,7 @@ class DefaultShellClient : public shell::ShellClient,
     if (name == "mojo:ash_sysui")
       return base::WrapUnique(new ash::sysui::SysUIApplication);
     if (name == "mojo:desktop_wm")
-      return base::WrapUnique(new mash::wm::WindowManagerApplication);
+      return base::WrapUnique(new ash::mus::WindowManagerApplication);
     if (name == "mojo:mash_session")
       return base::WrapUnique(new mash::session::Session);
     if (name == "mojo:mus")