| Index: base/atomicops_internals_tsan.h | 
| diff --git a/base/atomicops_internals_tsan.h b/base/atomicops_internals_tsan.h | 
| index 47e1c357e455c187d83b8a0c0146427cf8be0fcb..24382fd9c010e44ec96fdc63dec6a138de33ada6 100644 | 
| --- a/base/atomicops_internals_tsan.h | 
| +++ b/base/atomicops_internals_tsan.h | 
| @@ -8,22 +8,6 @@ | 
| #ifndef BASE_ATOMICOPS_INTERNALS_TSAN_H_ | 
| #define BASE_ATOMICOPS_INTERNALS_TSAN_H_ | 
|  | 
| -#include "base/base_export.h" | 
| - | 
| -// This struct is not part of the public API of this module; clients may not | 
| -// use it.  (However, it's exported via BASE_EXPORT because clients implicitly | 
| -// do use it at link time by inlining these functions.) | 
| -// Features of this x86.  Values may not be correct before main() is run, | 
| -// but are set conservatively. | 
| -struct AtomicOps_x86CPUFeatureStruct { | 
| -  bool has_amd_lock_mb_bug;  // Processor has AMD memory-barrier bug; do lfence | 
| -                             // after acquire compare-and-swap. | 
| -}; | 
| -BASE_EXPORT extern struct AtomicOps_x86CPUFeatureStruct | 
| -    AtomicOps_Internalx86CPUFeatures; | 
| - | 
| -#define ATOMICOPS_COMPILER_BARRIER() __asm__ __volatile__("" : : : "memory") | 
| - | 
| #include <sanitizer/tsan_interface_atomic.h> | 
|  | 
| namespace base { | 
| @@ -199,6 +183,4 @@ inline void MemoryBarrier() { | 
| }  // namespace base::subtle | 
| }  // namespace base | 
|  | 
| -#undef ATOMICOPS_COMPILER_BARRIER | 
| - | 
| #endif  // BASE_ATOMICOPS_INTERNALS_TSAN_H_ | 
|  |