| Index: content/browser/child_process_launcher.cc
|
| diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
|
| index fbc1a5568252a4da3823e7d6c2a382cbc0fa0d17..e6e5c32f851e9218d12c641339dcd75f7527330e 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) {
|
|
|