| Index: content/child/child_thread.cc
|
| diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
|
| index bd4d4efd30c65db190f598e485b8284beadbf19d..75fd6017e1830d5851d36491f53d38f091c75ce7 100644
|
| --- a/content/child/child_thread.cc
|
| +++ b/content/child/child_thread.cc
|
| @@ -81,7 +81,8 @@ base::LazyInstance<base::ThreadLocalPointer<ChildThread> > g_lazy_tls =
|
|
|
| // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622
|
| #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
|
| - defined(THREAD_SANITIZER)) && !defined(OS_CHROMEOS)
|
| + defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
|
| + defined(UNDEFINED_SANITIZER)) && !defined(OS_CHROMEOS)
|
| // A thread delegate that waits for |duration| and then exits the process with
|
| // _exit(0).
|
| class WaitAndExitDelegate : public base::PlatformThread::Delegate {
|
| @@ -138,7 +139,8 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
|
| // here and kill the process.
|
| // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622
|
| #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
|
| - defined(THREAD_SANITIZER)) && !defined(OS_CHROMEOS)
|
| + defined(MEMORY_SANITIZER) || defined(THREAD_SANITIZER) || \
|
| + defined(UNDEFINED_SANITIZER)) && !defined(OS_CHROMEOS)
|
| // Some sanitizer tools rely on exit handlers (e.g. to run leak detection,
|
| // or dump code coverage data to disk). Instead of exiting the process
|
| // immediately, we give it 60 seconds to run exit handlers.
|
|
|