Use a static catalog manifest for the standalone Mash runner

services/service_manager/standalone/context.cc

 // Copyright 2013 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 "services/service_manager/standalone/context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 143 matching lines @@
     mojo::edk::SetMachPortProvider(MachBroker::GetInstance()->port_provider());
 #endif
   }
 
   std::unique_ptr<ServiceProcessLauncherFactory>
       service_process_launcher_factory =
       base::MakeUnique<ServiceProcessLauncherFactoryImpl>(
           blocking_pool_.get(),
           init_params ? init_params->service_process_launcher_delegate
                       : nullptr);
-  std::unique_ptr<catalog::Store> store;
-  if (init_params)
-    store = std::move(init_params->catalog_store);
-  catalog_.reset(
-      new catalog::Catalog(blocking_pool_.get(), std::move(store), nullptr));
+  if (init_params && init_params->static_catalog) {
+    catalog_.reset(
+        new catalog::Catalog(std::move(init_params->static_catalog)));
+  } else {
+    catalog_.reset(
+        new catalog::Catalog(blocking_pool_.get(), nullptr));
+  }
   service_manager_.reset(
       new ServiceManager(std::move(service_process_launcher_factory),
                          catalog_->TakeService()));
 
   if (command_line.HasSwitch(::switches::kServiceOverrides)) {
     base::FilePath overrides_file(GetPathFromCommandLineSwitch(
         command_line.GetSwitchValueASCII(::switches::kServiceOverrides)));
     JSONFileValueDeserializer deserializer(overrides_file);
     int error = 0;
     std::string message;
@@ skipping 87 matching lines @@
   mojom::InterfaceProviderPtr local_interfaces;
 
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateServiceManagerIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
   params->set_remote_interfaces(mojo::MakeRequest(&remote_interfaces));
   service_manager_->Connect(std::move(params));
 }
 
 }  // namespace service_manager