diff options
| author | earthdok <earthdok@chromium.org> | 2015-02-09 10:36:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 18:36:58 +0000 |
| commit | 4ae456dc14bfcdbca01aad3388e71c0a4d824d97 (patch) | |
| tree | 30b2ebd59161448d545d4c3ad3d33d2b7318ea16 /content/child/child_thread_impl.cc | |
| parent | f55ad376407ab7287e64058de0c5a1fa8f00aedf (diff) | |
| download | chromium_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/child/child_thread_impl.cc')
| -rw-r--r-- | content/child/child_thread_impl.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc index 3fee9b3..d5d7a3d 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. |