Index: content/child/child_thread_impl.cc |
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc |
index 4db2e27c338d85b87b5c888475530dfdf04e61e8..b13614428188d34371bf4fc73da09614298f5cd7 100644 |
--- a/content/child/child_thread_impl.cc |
+++ b/content/child/child_thread_impl.cc |
@@ -79,10 +79,9 @@ base::LazyInstance<base::ThreadLocalPointer<ChildThreadImpl> > g_lazy_tls = |
// plugins), PluginThread has EnsureTerminateMessageFilter. |
#if defined(OS_POSIX) |
-// 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) |
// A thread delegate that waits for |duration| and then exits the process with |
// _exit(0). |
class WaitAndExitDelegate : public base::PlatformThread::Delegate { |
@@ -137,10 +136,9 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter { |
// |
// So, we install a filter on the sender so that we can process this event |
// here and kill the process. |
- // 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) |
// 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. |