Make browser process a singleton service

mash/BUILD.gn

 # Copyright 2015 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/nacl/config.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 # Target that builders build.
@@ skipping 40 matching lines @@
 
     # TODO(rockot): It seems like a layering violation to have these service
     # names referenced here, but it's the most convenient thing to do for now,
     # and this is only for developers.
     #
     # Note that there are no build-time dependencies on the actual Chrome
     # binary implied by mash:all or other targets here. This only ensures that
     # if you have such a binary built, the runner will be able to locate it.
     "//chrome/app:chrome_content_browser_manifest",
     "//chrome/app:chrome_content_gpu_manifest",
+    "//chrome/app:chrome_content_packaged_services_manifest_for_mash",
     "//chrome/app:chrome_content_plugin_manifest",
     "//chrome/app:chrome_content_renderer_manifest",
     "//chrome/app:chrome_content_utility_manifest",
   ]
 
-  executable_overrides = [ "content_browser:@EXE_DIR/chrome" ]
+  executable_overrides = [ "content_packaged_services:@EXE_DIR/chrome" ]
 
   catalog_deps = [ "//mash/example:catalog" ]
 
   if (is_chromeos) {
     standalone_services += [ "//ash/mus:manifest" ]
   }
 
   if (is_linux && !is_android) {
     standalone_services += [ "//components/font_service:manifest" ]
   }
@@ skipping 74 matching lines @@
     testonly = true
     sources = get_target_outputs(":mash_unittests_catalog")
     outputs = [
       "${root_out_dir}/mash_unittests_catalog.json",
     ]
     deps = [
       ":mash_unittests_catalog",
     ]
   }
 }