Bake chrome mash catalog into MashRunner

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 <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 43 matching lines @@
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/debug/leak_annotations.h"
 #include "chrome/app/mash/mash_crash_reporter_client.h"
 #include "components/crash/content/app/breakpad_linux.h" // nogncheck
 #endif
 
 using service_manager::mojom::ServiceFactory;
 
+// Defined externally by the ":catalog_cpp_source" target.
+extern const char kChromeMashCatalogContents[];
+
 namespace {
 
 // kProcessType used to identify child processes.
 const char* kMashChild = "mash-child";
 
 const char kChromeMashServiceName[] = "chrome_mash";
 
-const base::FilePath::CharType kChromeMashCatalogFilename[] =
-    FILE_PATH_LITERAL("chrome_mash_catalog.json");
-
 bool IsChild() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kProcessType) &&
          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
              switches::kProcessType) == kMashChild;
 }
 
 void InitializeResources() {
   ui::RegisterPathProvider();
   const std::string locale =
@@ skipping 86 matching lines @@
 
   mojo::edk::Init();
 
   base::Thread ipc_thread("IPC thread");
   ipc_thread.StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
   mojo::edk::ScopedIPCSupport ipc_support(
       ipc_thread.task_runner(),
       mojo::edk::ScopedIPCSupport::ShutdownPolicy::FAST);
 
-  std::string catalog_contents;
-  base::FilePath exe_path;
-  base::PathService::Get(base::DIR_EXE, &exe_path);
-  base::FilePath catalog_path = exe_path.Append(kChromeMashCatalogFilename);
-  bool result = base::ReadFileToString(catalog_path, &catalog_contents);
-  DCHECK(result);
   std::unique_ptr<base::Value> manifest_value =
-      base::JSONReader::Read(catalog_contents);
+      base::JSONReader::Read(kChromeMashCatalogContents);
   DCHECK(manifest_value);
 
   // TODO(sky): refactor BackgroundServiceManager so can supply own context, we
   // shouldn't we using context as it has a lot of stuff we don't really want
   // in chrome.
   ServiceProcessLauncherDelegateImpl service_process_launcher_delegate;
   service_manager::BackgroundServiceManager background_service_manager(
       &service_process_launcher_delegate, std::move(manifest_value));
   service_manager::mojom::ServicePtr service;
   context_.reset(new service_manager::ServiceContext(
@@ skipping 86 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);
 }