Clean up unused "mash" targets in //chrome/app/BUILD.gn

Some of these were from the old enable_mash_packaged_app flag (which
no longer exists) and from when the test_chrome telemetry binary
had separate dependencies (it doesn't anymore).

Bug: none
Test: compiles
Change-Id: I15dc5fb447302d4ff86c0819595092067f3c71ba
Reviewed-on: https://chromium-review.googlesource.com/823078Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523953}

chrome/app/BUILD.gn

@@ -428,12 +428,6 @@ service_manifest("chrome_manifest") {
   source = "chrome_manifest.json"
 }
 
-service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") {
-  source =
-      "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
-  packaged_services = chrome_packaged_services
-}
-
 service_manifest("chrome_content_packaged_services_manifest_overlay") {
   source =
       "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
@@ -488,10 +482,6 @@ group("chrome_content_manifest_overlays") {
     ":chrome_content_renderer_manifest_overlay",
     ":chrome_content_utility_manifest_overlay",
   ]
-
-  if (enable_mus) {
-    deps += [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ]
-  }
 }
 
 if (use_aura) {
@@ -506,11 +496,6 @@ if (use_aura) {
     overlays = [ ":chrome_content_packaged_services_manifest_overlay" ]
   }
 
-  service_manifest("chrome_content_packaged_services_manifest_for_mash") {
-    source_manifest = "//content/public/app:packaged_services_manifest"
-    overlays = [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ]
-  }
-
   service_manifest("chrome_content_browser_manifest") {
     source_manifest = "//content/public/app:browser_manifest"
     overlays = [ ":chrome_content_browser_manifest_overlay" ]
@@ -549,10 +534,6 @@ if (use_aura) {
       ":chrome_content_renderer_manifest",
       ":chrome_content_utility_manifest",
     ]
-
-    if (enable_mus) {
-      deps += [ ":chrome_content_packaged_services_manifest_for_mash" ]
-    }
   }
 
   chrome_embedded_services = [
@@ -567,18 +548,4 @@ if (use_aura) {
     embedded_services = chrome_embedded_services +
                         [ ":chrome_content_packaged_services_manifest" ]
   }
-
-  catalog("catalog_for_mash") {
-    embedded_services =
-        chrome_embedded_services +
-        [ ":chrome_content_packaged_services_manifest_for_mash" ]
-  }
-
-  catalog("catalog_for_tests_mash") {
-    embedded_services = chrome_embedded_services + [
-                          ":chrome_content_packaged_services_manifest_for_mash",
-                          ":chrome_test_browser_manifest",
-                        ]
-    embedded_services -= [ ":chrome_content_browser_manifest" ]
-  }
 }