Force failing CHECK/DCHECKs to end the process on Windows....

base/cancellation_flag_unittest.cc

 // Copyright (c) 2009 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.
 
 // Tests of CancellationFlag class.
 
 #include "base/cancellation_flag.h"
 
 #include "base/logging.h"
 #include "base/spin_wait.h"
@@ skipping 31 matching lines @@
 
 TEST(CancellationFlagTest, DoubleSetTest) {
   CancellationFlag flag;
   ASSERT_FALSE(flag.IsSet());
   flag.Set();
   ASSERT_TRUE(flag.IsSet());
   flag.Set();
   ASSERT_TRUE(flag.IsSet());
 }
 
-#if defined(OS_WIN)
-#define DISABLED_ON_WIN(x) DISABLED_##x
-#else
-#define DISABLED_ON_WIN(x) x
-#endif
-
-// CancellationFlag should die on a DCHECK if Set() is called from
-// other thread.
-// This test isn't Windows-friendly yet since ASSERT_DEATH doesn't catch tests
-// failed on DCHECK. See http://crbug.com/24885 for the details.
-TEST(CancellationFlagTest, DISABLED_ON_WIN(SetOnDifferentThreadDeathTest)) {
+TEST(CancellationFlagTest, SetOnDifferentThreadDeathTest) {
   // Checks that Set() can't be called from any other thread.
+  // CancellationFlag should die on a DCHECK if Set() is called from
+  // other thread.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   Thread t("CancellationFlagTest.SetOnDifferentThreadDeathTest");
   ASSERT_TRUE(t.Start());
   ASSERT_TRUE(t.message_loop());
   ASSERT_TRUE(t.IsRunning());
 
   CancellationFlag flag;
   t.message_loop()->PostTask(FROM_HERE, new CancelTask(&flag));
 }
 
 }  // namespace