Update from https://crrev.com/327068

base/threading/thread_local_storage_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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <process.h>
 #endif
 
 #include "base/threading/simple_thread.h"
@@ skipping 61 matching lines @@
 
 }  // namespace
 
 TEST(ThreadLocalStorageTest, Basics) {
   ThreadLocalStorage::Slot slot;
   slot.Set(reinterpret_cast<void*>(123));
   int value = reinterpret_cast<intptr_t>(slot.Get());
   EXPECT_EQ(value, 123);
 }
 
-#if defined(THREAD_SANITIZER) ||                    \
-    (defined(OS_WIN) && defined(ARCH_CPU_X86_64) && \
-     defined(INCREMENTAL_LINKING))
+#if defined(THREAD_SANITIZER) || \
+    (defined(OS_WIN) && defined(ARCH_CPU_X86_64) && !defined(NDEBUG))
 // Do not run the test under ThreadSanitizer. Because this test iterates its
 // own TSD destructor for the maximum possible number of times, TSan can't jump
 // in after the last destructor invocation, therefore the destructor remains
 // unsynchronized with the following users of the same TSD slot. This results
 // in race reports between the destructor and functions in other tests.
 //
-// It is disabled on Win x64 with incremental linking pending resolution of
-// http://crbug.com/251251.
+// It is disabled on Win x64 with incremental linking (i.e. "Debug") pending
+// resolution of http://crbug.com/251251.
 #define MAYBE_TLSDestructors DISABLED_TLSDestructors
 #else
 #define MAYBE_TLSDestructors TLSDestructors
 #endif
 TEST(ThreadLocalStorageTest, MAYBE_TLSDestructors) {
   // Create a TLS index with a destructor.  Create a set of
   // threads that set the TLS, while the destructor cleans it up.
   // After the threads finish, verify that the value is cleaned up.
   const int kNumThreads = 5;
   int values[kNumThreads];
@@ skipping 17 matching lines @@
     delete threads[index];
     delete thread_delegates[index];
 
     // Verify that the destructor was called and that we reset.
     EXPECT_EQ(values[index], kFinalTlsValue);
   }
   tls_slot.Free();  // Stop doing callbacks to cleanup threads.
 }
 
 }  // namespace base