
See crbug.com/1407326. This fixes (1) and adds a test to utility_process_host_browsertest.cc to ensure that this works in the future when exec'ing a process (i.e. not launching from a zygote). Bug: 692619, 1407326 Change-Id: I334400ebefac116611d3fc93d5ff5a7d83908eb7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4159897 Commit-Queue: Alex Moshchuk <alexmos@chromium.org> Commit-Queue: Matthew Denton <mpdenton@chromium.org> Auto-Submit: Matthew Denton <mpdenton@chromium.org> Reviewed-by: Alex Moshchuk <alexmos@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Cr-Commit-Position: refs/heads/main@{#1104132}
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
// Copyright 2017 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef CONTENT_COMMON_SHARED_FILE_UTIL_H_
|
|
#define CONTENT_COMMON_SHARED_FILE_UTIL_H_
|
|
|
|
#include <map>
|
|
#include <string>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/component_export.h"
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
|
|
namespace content {
|
|
|
|
// Populates the global instance of base::FileDescriptorStore using the
|
|
// information from the command line, assuming base::GlobalDescriptors has been
|
|
// initialized to hold the dynamically-generated descriptors (e.g. as happens in
|
|
// the zygote).
|
|
void PopulateFileDescriptorStoreFromGlobalDescriptors();
|
|
|
|
// Similar to PopulateFileDescriptorStoreFromGlobalDescriptors(), this will
|
|
// populate the global instance of base::FileDescriptorStore, but takes the FDs
|
|
// directly from the FD table, using the default FD numbers (i.e. descriptor_id
|
|
// + base::GlobalDescriptors::kBaseDescriptor). On Posix systems, exec'd
|
|
// processes should use this instead of
|
|
// PopulateFileDescriptorStoreFromGlobalDescriptors().
|
|
void PopulateFileDescriptorStoreFromFdTable();
|
|
|
|
class SharedFileSwitchValueBuilder final {
|
|
public:
|
|
void AddEntry(const std::string& key_str, int key_id);
|
|
const std::string& switch_value() const { return switch_value_; }
|
|
|
|
private:
|
|
std::string switch_value_;
|
|
};
|
|
|
|
absl::optional<std::map<int, std::string>> ParseSharedFileSwitchValue(
|
|
const std::string& value);
|
|
|
|
} // namespace content
|
|
|
|
#endif // CONTENT_COMMON_SHARED_FILE_UTIL_H_
|