Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1802)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 2910383002: mash: Add catalog/manifest etc. for telemetry tests binary for mash. (Closed)
Patch Set: . Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2527a7aacfb92b2596fdabd822da623c4aa50986 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_telemetry_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"))
+ return CreateChromeTelemetryCatalog();
return CreateChromeMashCatalog();
+ }
#endif // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
return nullptr;
}
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/app/mash/BUILD.gn » ('j') | chrome/app/mash/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698