summaryrefslogtreecommitdiffstats
path: root/base/lazy_instance.h
diff options
context:
space:
mode:
authorearthdok@google.com <earthdok@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:09:32 +0000
committerearthdok@google.com <earthdok@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 22:09:32 +0000
commitb2206da557c9bb6e7758e02fe74153eacab5c677 (patch)
treec94110eba888c7364ebc4c703b3eef4c2b47f4c4 /base/lazy_instance.h
parent815deba9740c65b762544990af363817b0881268 (diff)
downloadchromium_src-b2206da557c9bb6e7758e02fe74153eacab5c677.zip
chromium_src-b2206da557c9bb6e7758e02fe74153eacab5c677.tar.gz
chromium_src-b2206da557c9bb6e7758e02fe74153eacab5c677.tar.bz2
Annotate LeakyLazyInstance as a leak. Remove HeapChecker suppressions.
The two suppressions removed by this CL have not fired for a long time, for some unknown reason. It's still a good idea to annotate all intentional leaks though. BUG=83345 R=jar@chromium.org,darin@chromium.org CC=glider@chromium.org Review URL: https://chromiumcodereview.appspot.com/16440006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/lazy_instance.h')
-rw-r--r--base/lazy_instance.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/lazy_instance.h b/base/lazy_instance.h
index 7021829..3935780 100644
--- a/base/lazy_instance.h
+++ b/base/lazy_instance.h
@@ -40,6 +40,7 @@
#include "base/atomicops.h"
#include "base/base_export.h"
#include "base/basictypes.h"
+#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"
@@ -91,6 +92,7 @@ struct LeakyLazyInstanceTraits {
static const bool kAllowedToAccessOnNonjoinableThread = true;
static Type* New(void* instance) {
+ ANNOTATE_SCOPED_MEMORY_LEAK;
return DefaultLazyInstanceTraits<Type>::New(instance);
}
static void Delete(Type* instance) {