Files required by a service now listed in manifest.

content/browser/child_process_launcher_helper_posix.cc

Index: content/browser/child_process_launcher_helper_posix.cc
diff --git a/content/browser/child_process_launcher_helper_posix.cc b/content/browser/child_process_launcher_helper_posix.cc
index 9c3583ea6333501c26475c5c82177de78999cd5c..65f6746ca7781ed0a1f7f335d42701abdb9f0c61 100644
--- a/content/browser/child_process_launcher_helper_posix.cc
+++ b/content/browser/child_process_launcher_helper_posix.cc
@@ -5,20 +5,57 @@
 #include "content/browser/child_process_launcher_helper_posix.h"
 
 #include "base/command_line.h"
+#include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
+#include "base/posix/global_descriptors.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "content/browser/file_descriptor_info_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_descriptors.h"
+#include "content/public/common/content_switches.h"
 #include "mojo/edk/embedder/platform_handle.h"
+#include "services/catalog/public/cpp/manifest_parsing_util.h"
+#include "services/service_manager/public/cpp/shared_file_util.h"
 
 namespace content {
 namespace internal {
 
+namespace {
+
+base::LazyInstance<std::map<std::string, catalog::RequiredFileMap>>
+    g_required_files_by_service = LAZY_INSTANCE_INITIALIZER;

[dcheng, 2017/02/15 22:01:03]

This can be a function-level static as well too (just wrap it inside a function
to hold and return it)

[Jay Civelli, 2017/02/15 23:08:06]

Done.

+
+base::PlatformFile OpenFileIfNecessary(const base::FilePath& path,
+                                       base::MemoryMappedFile::Region* region) {
+  static auto opened_files =
+      new std::map<base::FilePath, std::pair<base::PlatformFile,
+                                             base::MemoryMappedFile::Region>>;
+
+  const auto& iter = opened_files->find(path);
+  if (iter != opened_files->end()) {
+    *region = iter->second.second;
+    return iter->second.first;
+  }
+  base::File file = OpenFileToShare(path, region);
+  if (!file.IsValid()) {
+    return base::kInvalidPlatformFile;
+  }
+  // g_opened_files becomes the owner of the file descriptor.
+  base::PlatformFile fd = file.TakePlatformFile();
+  (*opened_files)[path] = std::make_pair(fd, *region);
+  return fd;
+}
+
+}  // namespace
+
 std::unique_ptr<FileDescriptorInfo> CreateDefaultPosixFilesToMap(
-    const base::CommandLine& command_line,
     int child_process_id,
-    const mojo::edk::PlatformHandle& mojo_client_handle) {
+    const mojo::edk::PlatformHandle& mojo_client_handle,
+    bool include_service_required_files,
+    const std::string& process_type,
+    base::CommandLine* command_line) {
   std::unique_ptr<FileDescriptorInfo> files_to_register(
       FileDescriptorInfoImpl::Create());
 
@@ -33,11 +70,69 @@ std::unique_ptr<FileDescriptorInfo> CreateDefaultPosixFilesToMap(
   // GetAdditionalMappedFilesForChildProcess a no op on Mac.
 #if !defined(OS_MACOSX)
   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-      command_line, child_process_id, files_to_register.get());
+      *command_line, child_process_id, files_to_register.get());
 #endif
 
+  if (!include_service_required_files)
+    return files_to_register;
+
+  static auto* service_name_resolver = new std::map<std::string, std::string>(
+      {// The service names are defined in the JSON manifests, so we don't have
+       // a constant accessible for them.
+       // TODO(jcivelli): remove this map once the service name is accessible
+       // from the command line crbug.com/687250
+       {switches::kGpuProcess, "content_gpu"},
+       {switches::kPpapiPluginProcess, "content_plugin"},
+       {switches::kRendererProcess, "content_renderer"},
+       {switches::kUtilityProcess, "content_utility"},
+       {"ppapi-broker", "ppapi_broker"},
+       {"nacl-loader", "nacl_loader"},
+       {"nacl-loader-nonsfi", "nacl_loader_nonsfi"}});

[dcheng, 2017/02/15 22:01:03]

Ditto: from a code organization perspective, it might be nice to break this out
into a helper function that holds the static map.

[Jay Civelli, 2017/02/15 23:08:06]

Done.

+
+  // Also include the files specified in the services' manifests.
+  const auto& service_name_iter = service_name_resolver->find(process_type);
+  DCHECK(service_name_iter != service_name_resolver->end())
+      << "No service found for process type " << process_type;
+  const std::string& service_name = service_name_iter->second;
+  auto files_iter = g_required_files_by_service.Get().find(service_name);
+  if (files_iter != g_required_files_by_service.Get().end()) {
+    const catalog::RequiredFileMap& required_files_map = files_iter->second;
+    base::GlobalDescriptors::Key key = kContentDynamicDescriptorStart;
+    service_manager::SharedFileSwitchValueBuilder file_switch_value_builder;
+    for (const auto& key_path_iter : required_files_map) {
+      base::MemoryMappedFile::Region region;
+      base::PlatformFile file =
+          OpenFileIfNecessary(key_path_iter.second, &region);
+      if (file == base::kInvalidPlatformFile) {
+        DLOG(ERROR) << "Ignoring invalid file " << key_path_iter.second.value();
+        continue;
+      }
+      file_switch_value_builder.AddEntry(key_path_iter.first, key);
+      files_to_register->ShareWithRegion(key, file, region);
+      key++;
+      DCHECK(key < kContentDynamicDescriptorMax);
+    }
+    command_line->AppendSwitchASCII(switches::kSharedFiles,
+                                    file_switch_value_builder.switch_value());
+  }
+
   return files_to_register;
 }
 
+void SetFilesToShareForServicePosix(const std::string& service_name,
+                                    catalog::RequiredFileMap required_files) {
+  if (required_files.empty())
+    return;
+
+  if (!base::StartsWith(service_name, "content_",
+                        base::CompareCase::INSENSITIVE_ASCII)) {
+    // Not a content child service, ignore.
+    return;
+  }
+
+  DCHECK(g_required_files_by_service.Get().count(service_name) == 0);
+  g_required_files_by_service.Get()[service_name] = std::move(required_files);
+}
+
 }  // namespace internal
 }  // namespace content