summaryrefslogtreecommitdiffstats
path: root/content/browser/child_process_launcher.cc
diff options
context:
space:
mode:
authorearthdok <earthdok@chromium.org>2015-02-09 10:36:17 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-09 18:36:58 +0000
commit4ae456dc14bfcdbca01aad3388e71c0a4d824d97 (patch)
tree30b2ebd59161448d545d4c3ad3d33d2b7318ea16 /content/browser/child_process_launcher.cc
parentf55ad376407ab7287e64058de0c5a1fa8f00aedf (diff)
downloadchromium_src-4ae456dc14bfcdbca01aad3388e71c0a4d824d97.zip
chromium_src-4ae456dc14bfcdbca01aad3388e71c0a4d824d97.tar.gz
chromium_src-4ae456dc14bfcdbca01aad3388e71c0a4d824d97.tar.bz2
Enable clean child process exit in sanitizer builds on ChromeOS.
This was blocked on a WebRTC issue for a long time. However, latest trybot runs appear green. BUG=360622, 324216, 307043 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/227533008 Cr-Commit-Position: refs/heads/master@{#315350}
Diffstat (limited to 'content/browser/child_process_launcher.cc')
-rw-r--r--content/browser/child_process_launcher.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index fbc1a55..e6e5c32 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -163,10 +163,9 @@ ChildProcessLauncher::Context::Context()
zygote_(false),
#endif
starting_(true),
- // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622
-#if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
- defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
- defined(UNDEFINED_SANITIZER)) && !defined(OS_CHROMEOS)
+#if defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
+ defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
+ defined(UNDEFINED_SANITIZER)
terminate_child_on_shutdown_(false) {
#else
terminate_child_on_shutdown_(true) {