| Index: content/browser/service_manager/service_manager_context.cc
|
| diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
|
| index db56719c833e15ef86a50ad54b1117d3f36b5614..a398ae9a5d1a36c9d2b413870f8daa7cbdb06777 100644
|
| --- a/content/browser/service_manager/service_manager_context.cc
|
| +++ b/content/browser/service_manager/service_manager_context.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/process/process_handle.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "content/browser/child_process_launcher.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| #include "content/browser/service_manager/merge_dictionary.h"
|
| #include "content/common/service_manager/service_manager_connection_impl.h"
|
| @@ -30,6 +31,7 @@
|
| #include "mojo/edk/embedder/embedder.h"
|
| #include "services/catalog/catalog.h"
|
| #include "services/catalog/manifest_provider.h"
|
| +#include "services/catalog/public/cpp/manifest_parsing_util.h"
|
| #include "services/catalog/public/interfaces/constants.mojom.h"
|
| #include "services/catalog/store.h"
|
| #include "services/device/device_service.h"
|
| @@ -141,6 +143,13 @@ class BuiltinManifestProvider : public catalog::ManifestProvider {
|
| MergeDictionary(manifest_dictionary, overlay_dictionary);
|
| }
|
|
|
| + base::Optional<catalog::RequiredFileMap> required_files =
|
| + catalog::RetrieveRequiredFiles(*manifest_value);
|
| + if (required_files) {
|
| + ChildProcessLauncher::SetRegisteredFilesForService(
|
| + name.as_string(), std::move(*required_files));
|
| + }
|
| +
|
| auto result = manifests_.insert(
|
| std::make_pair(name.as_string(), std::move(manifest_value)));
|
| DCHECK(result.second) << "Duplicate manifest entry: " << name;
|
|
|