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..9701e37d31134c15585529075379799b69911946 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,6 +403,8 @@ group("chrome_content_manifest_overlays") {
   deps = [
     ":chrome_content_browser_manifest_overlay",
     ":chrome_content_gpu_manifest_overlay",
+    ":chrome_content_packaged_services_manifest_overlay",
+    ":chrome_content_packaged_services_manifest_overlay_for_mash",

[sky, 2017/02/15 00:35:26]

Should all the mash related stuff be guarded by enable_package_mash_services?

[Ken Rockot(use gerrit already), 2017/02/15 01:38:04]

Sure, done

[Ken Rockot(use gerrit already), 2017/02/15 01:38:05]

Done where possible. For now the catalog in //mash/BUILD.gn still needs to
reference the for_mash manifest target, but //mash/BUILD.gn otherwise doesn't
know about enable_package_mash_services, so I've left the manifest targets
defined unconditionally. I could teach it about that flag but that kinda seems
like it's just making the existing layering violation worse. WDYT?

     ":chrome_content_plugin_manifest_overlay",
     ":chrome_content_renderer_manifest_overlay",
     ":chrome_content_utility_manifest_overlay",
@@ -395,6 +418,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" ]
@@ -424,19 +457,29 @@ if (use_aura) {
     deps = [
       ":chrome_content_browser_manifest",
       ":chrome_content_gpu_manifest",
+      ":chrome_content_packaged_services_manifest_for_mash",
       ":chrome_content_plugin_manifest",
       ":chrome_content_renderer_manifest",
       ":chrome_content_utility_manifest",
     ]
   }
 
+  chrome_embedded_services = [
+    ":chrome_content_browser_manifest",
+    ":chrome_content_gpu_manifest",
+    ":chrome_content_plugin_manifest",
+    ":chrome_content_renderer_manifest",
+    ":chrome_content_utility_manifest",
+  ]
+
+  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" ]
   }
 }