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

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index d105144bb2c1d3e8c697a85189cdee73519c86ba..7868242505d0712e5d9a0c9b7a54655f8c470a99 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -110,6 +110,7 @@
 
 #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
@@ -1134,8 +1135,11 @@ std::unique_ptr<base::Value> ChromeMainDelegate::CreateServiceCatalog() {
   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;
 }