Run NonThreadSafeDeathTests in the threadsafe gtest mode.

base/threading/non_thread_safe_unittest.cc

 // Copyright (c) 2012 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/threading/non_thread_safe.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 95 matching lines @@
   // Verify that DoStuff asserts in debug builds only when called
   // on a different thread.
   CallDoStuffOnThread call_on_thread(non_thread_safe_class.get());
 
   call_on_thread.Start();
   call_on_thread.Join();
 }
 
 #if DCHECK_IS_ON()
 TEST(NonThreadSafeDeathTest, MethodNotAllowedOnDifferentThreadInDebug) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DCHECK_DEATH({ NonThreadSafeClass::MethodOnDifferentThreadImpl(); });
 }
 #else
 TEST(NonThreadSafeTest, MethodAllowedOnDifferentThreadInRelease) {
   NonThreadSafeClass::MethodOnDifferentThreadImpl();
 }
 #endif  // DCHECK_IS_ON()
 
 void NonThreadSafeClass::DestructorOnDifferentThreadImpl() {
   std::unique_ptr<NonThreadSafeClass> non_thread_safe_class(
       new NonThreadSafeClass);
 
   // Verify that the destructor asserts in debug builds only
   // when called on a different thread.
   DeleteNonThreadSafeClassOnThread delete_on_thread(
       non_thread_safe_class.release());
 
   delete_on_thread.Start();
   delete_on_thread.Join();
 }
 
 #if DCHECK_IS_ON()
 TEST(NonThreadSafeDeathTest, DestructorNotAllowedOnDifferentThreadInDebug) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DCHECK_DEATH(
       { NonThreadSafeClass::DestructorOnDifferentThreadImpl(); });
 }
 #else
 TEST(NonThreadSafeTest, DestructorAllowedOnDifferentThreadInRelease) {
   NonThreadSafeClass::DestructorOnDifferentThreadImpl();
 }
 #endif  // DCHECK_IS_ON()
 
 }  // namespace base