| Index: chrome/app/mash/BUILD.gn | 
| diff --git a/chrome/app/mash/BUILD.gn b/chrome/app/mash/BUILD.gn | 
| index f6f8e3804bacb45f9e707b747048fd9a059b3627..cd6f8641a8a0244aca27557107e96484a3d0abc5 100644 | 
| --- a/chrome/app/mash/BUILD.gn | 
| +++ b/chrome/app/mash/BUILD.gn | 
| @@ -65,7 +65,7 @@ source_set("embedded_services") { | 
| } | 
| } | 
|  | 
| -catalog("catalog") { | 
| +catalog("catalog_common") { | 
| embedded_services = [ | 
| "//ash/autoclick/mus:manifest", | 
| "//ash/touch_hud/mus:manifest", | 
| @@ -76,7 +76,6 @@ catalog("catalog") { | 
| "//services/ui:manifest", | 
| "//services/ui/ime/test_ime_driver:manifest", | 
| ] | 
| -  catalog_deps = [ "//chrome/app:catalog_for_mash" ] | 
| standalone_services = [ | 
| "//mash/example/views_examples:manifest", | 
| "//mash/simple_wm:manifest", | 
| @@ -95,11 +94,30 @@ catalog("catalog") { | 
| } | 
| } | 
|  | 
| +catalog("catalog") { | 
| +  catalog_deps = [ | 
| +    ":catalog_common", | 
| +    "//chrome/app:catalog_for_mash", | 
| +  ] | 
| +} | 
| + | 
| catalog_cpp_source("chrome_mash_catalog") { | 
| catalog = ":catalog" | 
| generated_function_name = "CreateChromeMashCatalog" | 
| } | 
|  | 
| +catalog("catalog_test") { | 
| +  catalog_deps = [ | 
| +    ":catalog_common", | 
| +    "//chrome/app:catalog_for_tests_mash", | 
| +  ] | 
| +} | 
| + | 
| +catalog_cpp_source("chrome_test_catalog") { | 
| +  catalog = ":catalog_test" | 
| +  generated_function_name = "CreateChromeTestCatalog" | 
| +} | 
| + | 
| if (is_chromeos) { | 
| catalog("catalog_mus") { | 
| catalog_deps = [ "//chrome/app:catalog" ] | 
|  |