| Index: base/threading/thread_local_storage_unittest.cc
|
| diff --git a/base/threading/thread_local_storage_unittest.cc b/base/threading/thread_local_storage_unittest.cc
|
| index bcc1d1b9db5250a566b9c77cbb82262883390255..b10cac1082064a551975180d7a1c1e5942983493 100644
|
| --- a/base/threading/thread_local_storage_unittest.cc
|
| +++ b/base/threading/thread_local_storage_unittest.cc
|
| @@ -2,21 +2,10 @@
|
| // 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"
|
| #include "base/threading/thread_local_storage.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -#if defined(OS_WIN)
|
| -// Ignore warnings about ptr->int conversions that we use when
|
| -// storing ints into ThreadLocalStorage.
|
| -#pragma warning(disable : 4311 4312)
|
| -#endif
|
| -
|
| namespace base {
|
|
|
| namespace {
|
| @@ -79,8 +68,7 @@ TEST(ThreadLocalStorageTest, Basics) {
|
| EXPECT_EQ(value, 123);
|
| }
|
|
|
| -#if defined(THREAD_SANITIZER) || \
|
| - (defined(OS_WIN) && defined(ARCH_CPU_X86_64) && !defined(NDEBUG))
|
| +#if defined(THREAD_SANITIZER)
|
| // 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
|
|
|