mash: Add catalog/manifest etc. for telemetry tests binary for mash.

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 82 matching lines @@
   if (enable_nacl && is_chromeos) {
     embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
   }
 }
 
 catalog_cpp_source("chrome_mash_catalog") {
   catalog = ":catalog"
   generated_function_name = "CreateChromeMashCatalog"
 }
 
+catalog("catalog_telemetry") {

[Ken Rockot(use gerrit already), 2017/05/31 11:34:23]

You should be able to consolidate most of the duplication into a common base
catalog target, and then add that to the catalog_deps of both the ":catalog" and
":catalog_telemetry" targets.

[sadrul, 2017/05/31 13:19:24]

Done.

+  embedded_services = [
+    "//ash/autoclick/mus:manifest",
+    "//ash/touch_hud/mus:manifest",
+    "//mash/catalog_viewer:manifest",
+    "//mash/quick_launch:manifest",
+    "//mash/session:manifest",
+    "//mash/task_viewer:manifest",
+    "//services/ui:manifest",
+    "//services/ui/ime/test_ime_driver:manifest",
+  ]
+  catalog_deps = [ "//chrome/app:catalog_for_telemetry_tests_mash" ]
+  standalone_services = [
+    "//mash/example/views_examples:manifest",
+    "//mash/simple_wm:manifest",
+  ]
+
+  if (is_chromeos) {
+    embedded_services += [ "//ash/mus:manifest" ]
+  }
+
+  if (is_linux && !is_android) {
+    embedded_services += [ "//components/font_service:manifest" ]
+  }
+
+  if (enable_nacl && is_chromeos) {
+    embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
+  }
+}
+
+catalog_cpp_source("chrome_telemetry_catalog") {
+  catalog = ":catalog_telemetry"
+  generated_function_name = "CreateChromeTelemetryCatalog"
+}
+
 if (is_chromeos) {
   catalog("catalog_mus") {
     catalog_deps = [ "//chrome/app:catalog" ]
     embedded_services = [
       "//services/ui:manifest",
 
       # TODO(sky): verify if we need this.
       "//services/ui/ime/test_ime_driver:manifest",
     ]
 
     if (enable_nacl) {
       embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
     }
   }
 
   catalog_cpp_source("chrome_mus_catalog") {
     catalog = ":catalog_mus"
     generated_function_name = "CreateChromeMusCatalog"
   }
 }