Flatten mash overlay back into Chrome overlay

chrome/app/mash/BUILD.gn

 # Copyright 2016 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("//services/service_manager/public/service_manifest.gni")
 
 source_set("mash") {
   sources = [
     "mash_runner.cc",
     "mash_runner.h",
@@ skipping 11 matching lines @@
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp/standalone_service",
     "//services/service_manager/public/interfaces",
     "//services/service_manager/runner:init",
     "//services/service_manager/runner/common",
     "//services/service_manager/runner/host:lib",
     "//services/service_manager/standalone:lib",
     "//url",
   ]
   data_deps = [
-    ":browser_manifest",
     ":mash_manifest",
     "//chrome/app:service_manifests",
   ]
 
   if (is_linux && !is_android) {
     deps += [ "//components/font_service:lib" ]
   }
 }
 
 service_manifest("mash_manifest") {
@@ skipping 23 matching lines @@
   if (is_chromeos) {
     deps += [ "//ash/mus:manifest" ]
     packaged_services += [ "ash" ]
   }
 
   if (is_linux && !is_android) {
     deps += [ "//components/font_service:manifest" ]
     packaged_services += [ "font_service" ]
   }
 }
-
-service_manifest("browser_manifest") {
-  name = "content_browser"
-  source = "${root_out_dir}/Packages/chrome_content_browser/manifest.json"
-  output_name = "chrome_mash_content_browser"
-  deps = [
-    "//chrome/app:chrome_content_browser_manifest",
-  ]
-  overlays = [ "chrome_mash_content_browser_manifest_overlay.json" ]
-}