Adds the ability to run chromeos with mus

chrome/app/mash/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/nacl/config.gni")
 import("//chrome/common/features.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 assert(enable_package_mash_services)
@@ skipping 20 matching lines @@
     "//services/service_manager/public/interfaces",
     "//services/service_manager/runner:init",
     "//services/service_manager/runner/common",
     "//services/service_manager/runner/host:lib",
     "//services/service_manager/standalone",
     "//services/ui/public/interfaces:constants",
     "//url",
   ]
 
   if (is_chromeos) {
-    deps += [ "//ash/resources" ]
+    deps += [
+      ":chrome_mus_catalog",
+      "//ash/resources",
+    ]
   }
 
   if (is_posix) {
     deps += [ "//chrome/app:shutdown_signal_handlers" ]
   }
 
   if (is_linux && !is_android) {
     deps += [ "//components/font_service:lib" ]
   }
 }
@@ skipping 22 matching lines @@
   if (enable_nacl) {
     packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
     if (is_win && target_cpu == "x86") {
       packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ]
     }
   }
 }
 
 catalog("catalog") {
   embedded_services = [ ":mash_manifest" ]
-  catalog_deps = [ "//chrome/app:catalog_for_mash" ]
+  catalog_deps = [ "//chrome/app:catalog_for_mus" ]
   standalone_services = [
     "//mash/example/views_examples:manifest",
     "//mash/simple_wm:manifest",
   ]
 }
 
 catalog_cpp_source("chrome_mash_catalog") {
   catalog = ":catalog"
   generated_function_name = "CreateChromeMashCatalog"
 }
 
 source_set("mash_service_overrides") {
   testonly = true
   data = [
     "mash_service_overrides.json",
   ]
 }
+
+if (is_chromeos) {
+  service_manifest("mus_manifest") {
+    name = "chrome_mus"
+    source = "chrome_mus_manifest.json"
+    packaged_services = [
+      "//services/ui:manifest",
+
+      # TODO(sky): verify if we need this.
+      "//services/ui/ime/test_ime_driver:manifest",
+    ]
+
+    if (enable_nacl) {
+      packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
+    }
+  }
+
+  catalog("catalog_mus") {
+    embedded_services = [ ":mus_manifest" ]
+    catalog_deps = [ "//chrome/app:catalog_for_mus" ]
+  }
+
+  catalog_cpp_source("chrome_mus_catalog") {
+    catalog = ":catalog_mus"
+    generated_function_name = "CreateChromeMusCatalog"
+  }
+}