| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index bb4d4d545fb342b89eb2322f1c511289bdbecc49..1a178107f830921c4348f2aafd5b7e1e7d14fa60 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -136,10 +136,12 @@
|
| #include "chrome/browser/ui/crypto_module_password_dialog.h"
|
| #endif
|
|
|
| +using base::FileDescriptor;
|
| using content::AccessTokenStore;
|
| using content::BrowserThread;
|
| using content::BrowserURLHandler;
|
| using content::ChildProcessSecurityPolicy;
|
| +using content::FileDescriptorInfo;
|
| using content::QuotaPermissionContext;
|
| using content::RenderViewHost;
|
| using content::SiteInstance;
|
| @@ -1664,11 +1666,12 @@ bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() {
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| const CommandLine& command_line,
|
| - base::GlobalDescriptors::Mapping* mappings) {
|
| + std::vector<FileDescriptorInfo>* mappings) {
|
| int crash_signal_fd = GetCrashSignalFD(command_line);
|
| if (crash_signal_fd >= 0) {
|
| - mappings->push_back(std::pair<base::GlobalDescriptors::Key, int>(
|
| - kCrashDumpSignal, crash_signal_fd));
|
| + mappings->push_back(FileDescriptorInfo(kCrashDumpSignal,
|
| + FileDescriptor(crash_signal_fd,
|
| + false)));
|
| }
|
| }
|
| #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
|