Generate better catalog C++ sources

chrome/app/mash/BUILD.gn

Index: chrome/app/mash/BUILD.gn
diff --git a/chrome/app/mash/BUILD.gn b/chrome/app/mash/BUILD.gn
index e78d03795626f7aeca2225f0dfba2149327c379f..981d813b568ef6f55a11787b9c20d180918903e5 100644
--- a/chrome/app/mash/BUILD.gn
+++ b/chrome/app/mash/BUILD.gn
@@ -11,7 +11,7 @@ source_set("mash") {
     "mash_runner.h",
   ]
   deps = [
-    ":catalog_cpp_source",
+    ":chrome_mash_catalog",
     "//base:i18n",
     "//components/tracing:startup_tracing",
     "//content/public/common",
@@ -77,7 +77,7 @@ catalog("catalog") {
   catalog_deps = [ "//chrome/app:catalog" ]
 }
 
-catalog_cpp_source("catalog_cpp_source") {
+catalog_cpp_source("chrome_mash_catalog") {
   catalog = ":catalog"
-  output_symbol_name = "kChromeMashCatalogContents"
+  generated_function_name = "CreateChromeMashCatalog"
 }