summaryrefslogtreecommitdiffstats
path: root/base/trace_event
diff options
context:
space:
mode:
authorglider <glider@chromium.org>2015-02-20 03:44:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-20 11:45:33 +0000
commit6b8d75a407d6ede3f58968141041760c8dd97ab1 (patch)
tree8a285af921555bfa06c2e72c2f83501a0a056efd /base/trace_event
parent2d0f86058fb9951e3671ace32fa0c670eb536020 (diff)
downloadchromium_src-6b8d75a407d6ede3f58968141041760c8dd97ab1.zip
chromium_src-6b8d75a407d6ede3f58968141041760c8dd97ab1.tar.gz
chromium_src-6b8d75a407d6ede3f58968141041760c8dd97ab1.tar.bz2
Remove the happens-before annotations from base/memory/singleton.h
Since we've deprecated TSan v1, these aren't used anymore and may potentially hide errors in lock-free synchronization that TSan v2 could detect otherwise. BUG=349861 TBR=nduca@chromium.org,scottmg@chromium.org R=danakj@chromium.org,kbr@chromium.org Review URL: https://codereview.chromium.org/790473002 Cr-Commit-Position: refs/heads/master@{#317297}
Diffstat (limited to 'base/trace_event')
-rw-r--r--base/trace_event/trace_event_synthetic_delay.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/trace_event/trace_event_synthetic_delay.cc b/base/trace_event/trace_event_synthetic_delay.cc
index 4b957c3..bad79cc 100644
--- a/base/trace_event/trace_event_synthetic_delay.cc
+++ b/base/trace_event/trace_event_synthetic_delay.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/memory/singleton.h"
+#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
#include "base/trace_event/trace_event_synthetic_delay.h"
namespace {