Files required by a service now listed in manifest.

content/browser/service_manager/service_manager_context.cc

 // Copyright 2015 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 "content/browser/service_manager/service_manager_context.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.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"
 #include "content/grit/content_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #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"
 #include "services/device/public/interfaces/constants.mojom.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/service_manager/service_manager.h"
@@ skipping 91 matching lines @@
     if (overlay_value) {
       base::DictionaryValue* manifest_dictionary = nullptr;
       bool result = manifest_value->GetAsDictionary(&manifest_dictionary);
       DCHECK(result);
       base::DictionaryValue* overlay_dictionary = nullptr;
       result = overlay_value->GetAsDictionary(&overlay_dictionary);
       DCHECK(result);
       MergeDictionary(manifest_dictionary, overlay_dictionary);
     }
 
+    std::unique_ptr<catalog::RequiredFileMap> required_files =
+        base::MakeUnique<catalog::RequiredFileMap>();
+    if (catalog::PopulateRequiredFiles(*manifest_value, required_files.get())) {
+      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;
   }
 
  private:
   // catalog::ManifestProvider:
   std::unique_ptr<base::Value> GetManifest(const std::string& name) override {
     auto it = manifests_.find(name);
     return it != manifests_.end() ? it->second->CreateDeepCopy() : nullptr;
@@ skipping 144 matching lines @@
       ServiceManagerConnection::GetForProcess()->GetConnector()->Clone();
 
   ServiceManagerConnection::GetForProcess()->Start();
 
   ContentBrowserClient::OutOfProcessServiceMap sandboxed_services;
   GetContentClient()
       ->browser()
       ->RegisterOutOfProcessServices(&sandboxed_services);
   for (const auto& service : sandboxed_services) {
     ServiceManagerConnection::GetForProcess()->AddServiceRequestHandler(
-      service.first,
-        base::Bind(&StartServiceInUtilityProcess, service.first, service.second,
-                   true /* use_sandbox */));
+        service.first, base::Bind(&StartServiceInUtilityProcess, service.first,
+                                  service.second, true /* use_sandbox */));
   }
 
   ContentBrowserClient::OutOfProcessServiceMap unsandboxed_services;
   GetContentClient()
       ->browser()
       ->RegisterUnsandboxedOutOfProcessServices(&unsandboxed_services);
   unsandboxed_services.insert(
       std::make_pair(shape_detection::mojom::kServiceName,
                      base::ASCIIToUTF16("Shape Detection Service")));
   for (const auto& service : unsandboxed_services) {
@@ skipping 31 matching lines @@
                           base::Bind(&DestroyConnectorOnIOThread));
 }
 
 // static
 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return g_io_thread_connector.Get().get();
 }
 
 }  // namespace content