Generate better catalog C++ sources

services/service_manager/public/tools/test/service_test.gni

Index: services/service_manager/public/tools/test/service_test.gni
diff --git a/services/service_manager/public/tools/test/service_test.gni b/services/service_manager/public/tools/test/service_test.gni
index 9f5508c552255345dbfdc22f44869e6eb7cc4168..ad7e3581a21bdd2c2e66f09e0f352f0a264b2277 100644
--- a/services/service_manager/public/tools/test/service_test.gni
+++ b/services/service_manager/public/tools/test/service_test.gni
@@ -32,6 +32,6 @@ template("service_test") {
 
   catalog_cpp_source(catalog_source_target) {
     catalog = invoker.catalog
-    output_symbol_name = "service_manager::test::kServiceTestCatalog"
+    generated_function_name = "service_manager::test::CreateTestCatalog"
   }
 }