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

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 92 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/hugepage_text/hugepage_text.h"
 #endif
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 #include "chrome/app/mash/chrome_mash_catalog.h"
+#include "chrome/app/mash/chrome_test_catalog.h"
 #include "chrome/app/mash/embedded_services.h"
 #include "mash/common/config.h"                                   // nogncheck
 #include "mash/quick_launch/public/interfaces/constants.mojom.h"  // nogncheck
 #include "services/ui/public/interfaces/constants.mojom.h"        // nogncheck
 
 #if defined(OS_CHROMEOS)
 #include "chrome/app/mash/chrome_mus_catalog.h"
 #endif
 
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
@@ skipping 1004 matching lines @@
   return service_manager::ProcessType::kDefault;
 }
 
 std::unique_ptr<base::Value> ChromeMainDelegate::CreateServiceCatalog() {
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   const auto& command_line = *base::CommandLine::ForCurrentProcess();
 #if defined(OS_CHROMEOS)
   if (command_line.HasSwitch(switches::kMus))
     return CreateChromeMusCatalog();
 #endif  // defined(OS_CHROMEOS)
-  if (command_line.HasSwitch(switches::kMash))
+  if (command_line.HasSwitch(switches::kMash)) {
+    if (command_line.HasSwitch("use-test-config"))

[sky, 2017/06/01 20:45:24]

Should we consider a completely separate build target for this? Having a
separate build target could mean we only expose test-only interfaces in custom
builds and not the main line chrome.

[sadrul, 2017/06/01 20:49:43]

Yep. That's where I was initially going. To do that, we would need to install
some sort of hook into here from before ChromeMain() is called. I thought that
would be too much, but I can do that if you think that's OK.

+      return CreateChromeTestCatalog();
     return CreateChromeMashCatalog();
+  }
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   return nullptr;
 }
 
 void ChromeMainDelegate::AdjustServiceProcessCommandLine(
     const service_manager::Identity& identity,
     base::CommandLine* command_line) {
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   // Add kMusConfig so that launched processes know what config they are
   // running in.
@@ skipping 62 matching lines @@
 
 std::unique_ptr<service_manager::Service>
 ChromeMainDelegate::CreateEmbeddedService(const std::string& service_name) {
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   auto mash_service = CreateEmbeddedMashService(service_name);
   if (mash_service)
     return mash_service;
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   return nullptr;
 }