diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index 0bef8abb81dd..e6c1499b2a5d 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -75,3 +75,4 @@ color_chooser_win.patch fix_disable_usage_of_abort_report_np_in_mas_builds.patch fix_disable_usage_of_pthread_fchdir_np_and_pthread_chdir_np_in_mas.patch fix_disable_usage_of_setapplicationisdaemon_and.patch +fixme_disable_field-trial_descriptor_dcheck.patch diff --git a/patches/common/chromium/fixme_disable_field-trial_descriptor_dcheck.patch b/patches/common/chromium/fixme_disable_field-trial_descriptor_dcheck.patch new file mode 100644 index 000000000000..b28538dc8f10 --- /dev/null +++ b/patches/common/chromium/fixme_disable_field-trial_descriptor_dcheck.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jeremy Apthorp +Date: Thu, 21 Feb 2019 17:17:51 -0800 +Subject: FIXME: disable field-trial descriptor DCHECK + + +diff --git a/content/browser/child_process_launcher_helper_posix.cc b/content/browser/child_process_launcher_helper_posix.cc +index 30f424d662bdc72e692bf86d0270ef1cb50fd8fc..2b2ed424152f5feccad81eef3c89892d6189f477 100644 +--- a/content/browser/child_process_launcher_helper_posix.cc ++++ b/content/browser/child_process_launcher_helper_posix.cc +@@ -83,8 +83,9 @@ std::unique_ptr 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); ++ //DCHECK_NE(fd, -1); ++ if (fd >= 0) ++ files_to_register->Share(service_manager::kFieldTrialDescriptor, fd); + #endif + + DCHECK(mojo_channel_remote_endpoint.is_valid());