diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-27 15:17:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-17 08:46:12 +0000 |
| commit | e6304895ce7a8e0238f497ec85a3969ff3919715 (patch) | |
| tree | 7fc037a19e8f878c9226b930cc1295a59a788eb3 | |
| parent | 5f5ef8df7562df4520fda6ad1fa07e9f1a27df30 (diff) | |
| download | qtwebengine-chromium-e6304895ce7a8e0238f497ec85a3969ff3919715.tar.gz | |
Allow non-Chrome projects to run
Change-Id: Iddb00ae4d7362da4b90b7f185acb6914c1b4ff4b
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/content/browser/child_process_launcher_helper_posix.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/browser/child_process_launcher_helper_posix.cc b/chromium/content/browser/child_process_launcher_helper_posix.cc index 39bb2858286..3b8948d86bb 100644 --- a/chromium/content/browser/child_process_launcher_helper_posix.cc +++ b/chromium/content/browser/child_process_launcher_helper_posix.cc @@ -85,8 +85,8 @@ std::unique_ptr<PosixFileDescriptorInfo> CreateDefaultPosixFilesToMap( // Mac shared memory doesn't use file descriptors. #if !defined(OS_MACOSX) int fd = base::FieldTrialList::GetFieldTrialDescriptor(); - DCHECK_NE(fd, -1); - files_to_register->Share(service_manager::kFieldTrialDescriptor, fd); + if (fd != -1) + files_to_register->Share(service_manager::kFieldTrialDescriptor, fd); const bool mojo_channel_mac = false; #else |