Flatten mash overlay back into Chrome overlay

chrome/app/mash/mash_runner.cc

 // 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.
 
 #include "chrome/app/mash/mash_runner.h"
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 38 matching lines @@
 
 using service_manager::mojom::ServiceFactory;
 
 namespace {
 
 // kProcessType used to identify child processes.
 const char* kMashChild = "mash-child";
 
 const char kChromeMashServiceName[] = "chrome_mash";
 
-const char kChromeMashContentBrowserPackageName[] =
-    "chrome_mash_content_browser";
+const char kChromeContentBrowserPackageName[] = "chrome_content_browser";
 const char kChromeContentGpuPackageName[] = "chrome_content_gpu";
 const char kChromeContentRendererPackageName[] = "chrome_content_renderer";
 const char kChromeContentUtilityPackageName[] = "chrome_content_utility";
 
 const char kPackagesPath[] = "Packages";
 const char kManifestFilename[] = "manifest.json";
 
 base::FilePath GetPackageManifestPath(const std::string& package_name) {
   base::FilePath exe = base::CommandLine::ForCurrentProcess()->GetProgram();
   return exe.DirName().AppendASCII(kPackagesPath).AppendASCII(package_name)
@@ skipping 96 matching lines @@
     base::RunLoop run_loop;
     catalog_connection->AddConnectionCompletedClosure(run_loop.QuitClosure());
     run_loop.Run();
   }
 
   // Synchronously override manifests needed for content process services.
   catalog::mojom::CatalogControlPtr catalog_control;
   catalog_connection->GetInterface(&catalog_control);
   CHECK(catalog_control->OverrideManifestPath(
       content::mojom::kBrowserServiceName,
-      GetPackageManifestPath(kChromeMashContentBrowserPackageName)));
+      GetPackageManifestPath(kChromeContentBrowserPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::mojom::kGpuServiceName,
       GetPackageManifestPath(kChromeContentGpuPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::mojom::kRendererServiceName,
       GetPackageManifestPath(kChromeContentRendererPackageName)));
   CHECK(catalog_control->OverrideManifestPath(
       content::mojom::kUtilityServiceName,
       GetPackageManifestPath(kChromeContentUtilityPackageName)));
 
@@ skipping 71 matching lines @@
       command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) {
     return;
   }
 
   // Include the pid as logging may not have been initialized yet (the pid
   // printed out by logging is wrong).
   LOG(WARNING) << "waiting for debugger to attach for service " << service_name
                << " pid=" << base::Process::Current().Pid();
   base::debug::WaitForDebugger(120, true);
 }