Moves mash/wm into ash/mus

ash/mus/BUILD.gn

Index: ash/mus/BUILD.gn
diff --git a/mash/wm/BUILD.gn b/ash/mus/BUILD.gn
similarity index 95%
rename from mash/wm/BUILD.gn
rename to ash/mus/BUILD.gn
index 62e84b62feaabeb761827ce2cfb4fe6b3fd5adf2..e6fb9de0766dc79d575b2a038beac142092d22d6 100644
--- a/mash/wm/BUILD.gn
+++ b/ash/mus/BUILD.gn
@@ -82,13 +82,13 @@ source_set("lib") {
 
   public_deps = [
     "//ash",
+    "//ash/mus/resources",
     "//ash/public/interfaces",
     "//base",
     "//components/mus/common:mus_common",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//mash/session/public/interfaces",
-    "//mash/wm/resources",
     "//mojo/common:common_base",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
@@ -107,7 +107,7 @@ source_set("lib") {
   ]
 }
 
-mojo_native_application("wm") {
+mojo_native_application("mus") {
   output_name = "desktop_wm"

[msw, 2016/06/02 20:28:34]

We probably ought to rename this sometime... not now.

[sky, 2016/06/02 21:31:51]

Yep. I plan on renaming to ash.

 
   sources = [
@@ -127,7 +127,7 @@ mojo_native_application("wm") {
     "//components/mus",
   ]
 
-  resources = [ "$root_out_dir/mash_wm_resources.pak" ]
+  resources = [ "$root_out_dir/ash_mus_resources.pak" ]
 }
 
 mojo_application_manifest("manifest") {
@@ -137,15 +137,15 @@ mojo_application_manifest("manifest") {
 
 repack("resources") {
   sources = [
-    "$root_gen_dir/mash/wm/resources/mash_wm_resources_100_percent.pak",
+    "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
     "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
   ]
-  output = "$root_out_dir/mash_wm_resources.pak"
+  output = "$root_out_dir/ash_mus_resources.pak"
   deps = [
-    "//mash/wm/resources",
+    "//ash/mus/resources",
     "//ui/resources",
     "//ui/strings",
     "//ui/views/mus:resources",
@@ -199,7 +199,7 @@ source_set("unittests") {
   ]
 
   data_deps = [
-    ":wm",
+    ":mus",
     "//mash/quick_launch",
   ]
 }