Enable ThreadChecker in non-debug builds if DCHECK_ALWAYS_ON is

base/message_pump_libevent_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_pump_libevent.h"
 
 #include <unistd.h>
 
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
+#include "base/threading/thread_checker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_SYSTEM_LIBEVENT)
 #include <event.h>
 #else
 #include "third_party/libevent/event.h"
 #endif
 
 namespace base {
 
@@ skipping 39 matching lines @@
 };
 
 #if GTEST_HAS_DEATH_TEST
 
 // Test to make sure that we catch calling WatchFileDescriptor off of the
 // wrong thread.
 TEST_F(MessagePumpLibeventTest, TestWatchingFromBadThread) {
   MessagePumpLibevent::FileDescriptorWatcher watcher;
   StupidWatcher delegate;
 
-  ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor(

[Nico, 2011/12/21 18:10:11]

How is ASSERT_DEBUG_DEATH a useful test? I think we should just kill this test.

-      STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate),
-      "Check failed: "
-      "watch_file_descriptor_caller_checker_.CalledOnValidThread()");
+  if (base::ThreadChecker::IsEnabled()) {
+    ASSERT_DEATH(
+        io_loop()->WatchFileDescriptor(STDOUT_FILENO,
+                                       false,
+                                       MessageLoopForIO::WATCH_READ,
+                                       &watcher,
+                                       &delegate),
+        "Check failed: "
+        "watch_file_descriptor_caller_checker_.CalledOnValidThread()");
+  }
 }
 
 #endif  // GTEST_HAS_DEATH_TEST
 
 class DeleteWatcher : public MessagePumpLibevent::Watcher {
  public:
   explicit DeleteWatcher(
       MessagePumpLibevent::FileDescriptorWatcher* controller)
       : controller_(controller) {
     DCHECK(controller_);
@@ skipping 52 matching lines @@
   pump->WatchFileDescriptor(
       0, false, MessagePumpLibevent::WATCH_READ_WRITE, &watcher, &delegate);
 
   // Spoof a libevent notification.
   OnLibeventNotification(pump, &watcher);
 }
 
 }  // namespace
 
 }  // namespace base