Mash: Replaces "exe:chrome" with "service:content_browser"

chrome/app/mash/chrome_mash_manifest.json

Index: chrome/app/mash/chrome_mash_manifest.json
diff --git a/chrome/app/mash/chrome_mash_manifest.json b/chrome/app/mash/chrome_mash_manifest.json
index b03d5fb524dc3fba84c3d4fdf7f2e551c1a74f39..79ba4748555448e14d15d2e2a4409f7ec72c135a 100644
--- a/chrome/app/mash/chrome_mash_manifest.json
+++ b/chrome/app/mash/chrome_mash_manifest.json
@@ -1,10 +1,18 @@
 {
+  // NOTE: This is the manifest for service:chrome_mash, which is only used to
+  // package services for the Mash environment when baked into the Chrome binary
+  // (i.e. "chrome --mash")
+  //
+  // If you need to require or provide capabilities from Chrome itself within
+  // the Mash environment, you should instead modify
+  // chrome_mash_content_browser_manifest_overlay.json.
   "manifest_version": 1,
-  "name": "exe:chrome_mash",
-  "display_name": "Chrome",
+  "name": "service:chrome_mash",
+  "display_name": "Chrome Mash Packaged Services",
   "capabilities": {
     "required": {
-      "*": { "classes": [ "app" ] }
+      "service:mash_session": { "classes": [ "app" ] },
+      "service:catalog": { "classes": [ "control" ] }
     }
   }
 }