Make browser process a singleton service

chrome/app/BUILD.gn

Index: chrome/app/BUILD.gn
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index bda4d41248e4f9f857d0cb91655fc7e7f236511a..010ecb459d630912220815265d61680837f34bc8 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -354,12 +354,33 @@ static_library("test_support") {
   }
 }
 
+chrome_packaged_services = [
+  ":chrome_manifest",
+  "//chrome/browser:preferences_manifest",
+  "//services/image_decoder:manifest",
+]
+
+service_manifest("chrome_manifest") {
+  source = "chrome_manifest.json"
+}
+
+service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") {
+  source =
+      "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
+  packaged_services = chrome_packaged_services
+}
+
+service_manifest("chrome_content_packaged_services_manifest_overlay") {
+  source =
+      "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
+  packaged_services = chrome_packaged_services
+  if (is_chromeos) {
+    packaged_services += [ "//ash/mus:manifest" ]
+  }
+}
+
 service_manifest("chrome_content_browser_manifest_overlay") {
   source = "//chrome/browser/chrome_content_browser_manifest_overlay.json"
-  packaged_services = [
-    "//chrome/browser:preferences_manifest",
-    "//services/image_decoder:manifest",
-  ]
 }
 
 service_manifest("chrome_content_gpu_manifest_overlay") {
@@ -382,10 +403,15 @@ group("chrome_content_manifest_overlays") {
   deps = [
     ":chrome_content_browser_manifest_overlay",
     ":chrome_content_gpu_manifest_overlay",
+    ":chrome_content_packaged_services_manifest_overlay",
     ":chrome_content_plugin_manifest_overlay",
     ":chrome_content_renderer_manifest_overlay",
     ":chrome_content_utility_manifest_overlay",
   ]
+
+  if (enable_package_mash_services) {
+    deps += [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ]
+  }
 }
 
 if (use_aura) {
@@ -395,6 +421,16 @@ if (use_aura) {
   # Chrome, the content manifests and Chrome's overlays are baked into browser
   # resources and merged at runtime.
 
+  service_manifest("chrome_content_packaged_services_manifest") {
+    source_manifest = "//content/public/app:packaged_services_manifest"
+    overlays = [ ":chrome_content_packaged_services_manifest_overlay" ]
+  }
+
+  service_manifest("chrome_content_packaged_services_manifest_for_mash") {
+    source_manifest = "//content/public/app:packaged_services_manifest"
+    overlays = [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ]
+  }
+
   service_manifest("chrome_content_browser_manifest") {
     source_manifest = "//content/public/app:browser_manifest"
     overlays = [ ":chrome_content_browser_manifest_overlay" ]
@@ -428,15 +464,30 @@ if (use_aura) {
       ":chrome_content_renderer_manifest",
       ":chrome_content_utility_manifest",
     ]
+
+    if (enable_package_mash_services) {
+      deps += [ ":chrome_content_packaged_services_manifest_for_mash" ]
+    }
+  }
+
+  chrome_embedded_services = [
+    ":chrome_content_browser_manifest",
+    ":chrome_content_gpu_manifest",
+    ":chrome_content_plugin_manifest",
+    ":chrome_content_renderer_manifest",
+    ":chrome_content_utility_manifest",
+  ]
+
+  if (enable_package_mash_services) {
+    catalog("catalog_for_mash") {
+      embedded_services =
+          chrome_embedded_services +
+          [ ":chrome_content_packaged_services_manifest_for_mash" ]
+    }
   }
 
   catalog("catalog") {
-    embedded_services = [
-      ":chrome_content_browser_manifest",
-      ":chrome_content_gpu_manifest",
-      ":chrome_content_plugin_manifest",
-      ":chrome_content_renderer_manifest",
-      ":chrome_content_utility_manifest",
-    ]
+    embedded_services = chrome_embedded_services +
+                        [ ":chrome_content_packaged_services_manifest" ]
   }
 }