| Index: base/lazy_instance.h
|
| diff --git a/base/lazy_instance.h b/base/lazy_instance.h
|
| index 05a7c5d81eccb0291706ae8e29c32aac8a9acd65..d52b5431c29bbf46232fd89fcbce7870c3d6801c 100644
|
| --- a/base/lazy_instance.h
|
| +++ b/base/lazy_instance.h
|
| @@ -43,7 +43,6 @@
|
| #include "base/debug/leak_annotations.h"
|
| #include "base/logging.h"
|
| #include "base/memory/aligned_memory.h"
|
| -#include "base/third_party/dynamic_annotations/dynamic_annotations.h"
|
| #include "base/threading/thread_restrictions.h"
|
|
|
| // LazyInstance uses its own struct initializer-list style static
|
| @@ -166,13 +165,6 @@ class LazyInstance {
|
| internal::CompleteLazyInstance(&private_instance_, value, this,
|
| Traits::kRegisterOnExit ? OnExit : NULL);
|
| }
|
| -
|
| - // This annotation helps race detectors recognize correct lock-less
|
| - // synchronization between different threads calling Pointer().
|
| - // We suggest dynamic race detection tool that "Traits::New" above
|
| - // and CompleteLazyInstance(...) happens before "return instance()" below.
|
| - // See the corresponding HAPPENS_BEFORE in CompleteLazyInstance(...).
|
| - ANNOTATE_HAPPENS_AFTER(&private_instance_);
|
| return instance();
|
| }
|
|
|
|
|