Generate better catalog C++ sources

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"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
-#include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "base/trace_event/trace_event.h"
+#include "chrome/app/mash/chrome_mash_catalog.h"
 #include "components/tracing/common/trace_to_console.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "mash/package/mash_packaged_service.h"
 #include "mash/session/public/interfaces/constants.mojom.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
@@ skipping 13 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";
 
 bool IsChild() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kProcessType) &&
@@ skipping 93 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::unique_ptr<base::Value> manifest_value =
-      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_process_launcher_delegate, CreateChromeMashCatalog());
   service_manager::mojom::ServicePtr service;
   context_.reset(new service_manager::ServiceContext(
       base::MakeUnique<mash::MashPackagedService>(),
       service_manager::mojom::ServiceRequest(&service)));
   background_service_manager.RegisterService(
       service_manager::Identity(
           kChromeMashServiceName, service_manager::mojom::kRootUserID),
       std::move(service), nullptr);
 
   // Ping mash_session to ensure an instance is brought up
@@ skipping 78 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);
 }