--- a/base/thread_annotations.h 2022-06-21 21:52:33.363987695 +0200 +++ b/base/thread_annotations.h 2022-06-24 16:18:54.238568316 +0200 @@ -40,6 +40,8 @@ #include "base/dcheck_is_on.h" #include "build/build_config.h" +#include + #if defined(__clang__) #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x)) #else @@ -227,21 +229,7 @@ // but the compiler cannot confirm that. #define TS_UNCHECKED_READ(x) thread_safety_analysis::ts_unchecked_read(x) -namespace thread_safety_analysis { - -// Takes a reference to a guarded data member, and returns an unguarded -// reference. -template -inline const T& ts_unchecked_read(const T& v) NO_THREAD_SAFETY_ANALYSIS { - return v; -} - -template -inline T& ts_unchecked_read(T& v) NO_THREAD_SAFETY_ANALYSIS { - return v; -} -} // namespace thread_safety_analysis // The above is imported as-is from abseil-cpp. The following Chromium-specific // synonyms are added for Chromium concepts (SequenceChecker/ThreadChecker).