Make browser process a singleton service

chrome/app/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//ppapi/features/features.gni")
 import("//printing/features/features.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
@@ skipping 336 matching lines @@
   }
 
   if (enable_plugins && enable_nacl) {
     deps += [
       "//components/nacl/browser",
       "//components/nacl/renderer/plugin:nacl_trusted_plugin",
     ]
   }
 }
 
+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") {
   source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json"
 }
 
 service_manifest("chrome_content_plugin_manifest_overlay") {
   source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json"
 }
 
 service_manifest("chrome_content_renderer_manifest_overlay") {
   source = "//chrome/browser/chrome_content_renderer_manifest_overlay.json"
 }
 
 service_manifest("chrome_content_utility_manifest_overlay") {
   source = "//chrome/browser/chrome_content_utility_manifest_overlay.json"
 }
 
 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",
   ]
 }
 
 if (use_aura) {
   # NOTE: These rules generate compiled versions of the content service
   # manifests with Chrome's overlays applied. These are only used at run-time,
   # and only when running Chrome inside the Mash environment. In production
   # 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" ]
   }
 
   service_manifest("chrome_content_gpu_manifest") {
     source_manifest = "//content/public/app:gpu_manifest"
     overlays = [ ":chrome_content_gpu_manifest_overlay" ]
   }
 
   service_manifest("chrome_content_plugin_manifest") {
     source_manifest = "//content/public/app:plugin_manifest"
     overlays = [ ":chrome_content_plugin_manifest_overlay" ]
   }
 
   service_manifest("chrome_content_renderer_manifest") {
     source_manifest = "//content/public/app:renderer_manifest"
     overlays = [ ":chrome_content_renderer_manifest_overlay" ]
   }
 
   service_manifest("chrome_content_utility_manifest") {
     source_manifest = "//content/public/app:utility_manifest"
     overlays = [ ":chrome_content_utility_manifest_overlay" ]
   }
 
   group("service_manifests") {
     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" ]
   }
 }