| Index: content/browser/child_process_launcher.cc
|
| diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
|
| index f7cf77224f44e04e098f4b121c9d4f2e73c5f00d..83e6c33c607e502351a6dcbf58152c812bf7d839 100644
|
| --- a/content/browser/child_process_launcher.cc
|
| +++ b/content/browser/child_process_launcher.cc
|
| @@ -166,14 +166,15 @@ class ChildProcessLauncher::Context
|
| #elif defined(OS_ANDROID)
|
| std::string process_type =
|
| cmd_line->GetSwitchValueASCII(switches::kProcessType);
|
| - base::GlobalDescriptors::Mapping files_to_register;
|
| - files_to_register.push_back(std::pair<base::GlobalDescriptors::Key, int>(
|
| - kPrimaryIPCChannel, ipcfd));
|
| + std::vector<content::FileDescriptorInfo> files_to_register;
|
| + files_to_register.push_back(
|
| + content::FileDescriptorInfo(kPrimaryIPCChannel,
|
| + base::FileDescriptor(ipcfd, false)));
|
| +
|
| content::GetContentClient()->browser()->
|
| GetAdditionalMappedFilesForChildProcess(*cmd_line, &files_to_register);
|
|
|
| - content::StartSandboxedProcess(cmd_line->argv(),
|
| - ipcfd, files_to_register,
|
| + content::StartSandboxedProcess(cmd_line->argv(), files_to_register,
|
| base::Bind(&ChildProcessLauncher::Context::OnSandboxedProcessStarted,
|
| this_object, client_thread_id));
|
|
|
|
|