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"
@@ skipping 41 matching lines @@
 // nothing useful.
 class StupidWatcher : public MessagePumpLibevent::Watcher {
  public:
   virtual ~StupidWatcher() {}
 
   // base:MessagePumpLibevent::Watcher interface
   virtual void OnFileCanReadWithoutBlocking(int fd) {}
   virtual void OnFileCanWriteWithoutBlocking(int fd) {}
 };
 
-#if GTEST_HAS_DEATH_TEST
+#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 // 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(
+  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
+#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
 
 class DeleteWatcher : public MessagePumpLibevent::Watcher {
  public:
   explicit DeleteWatcher(
       MessagePumpLibevent::FileDescriptorWatcher* controller)
       : controller_(controller) {
     DCHECK(controller_);
   }
   virtual ~DeleteWatcher() {}
 
@@ skipping 49 matching lines @@
   pump->WatchFileDescriptor(
       0, false, MessagePumpLibevent::WATCH_READ_WRITE, &watcher, &delegate);
 
   // Spoof a libevent notification.
   OnLibeventNotification(pump, &watcher);
 }
 
 }  // namespace
 
 }  // namespace base