diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 17:56:57 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 17:56:57 +0000 |
| commit | 10ed6e2eb5e4453da40bdaddb69da73372de150c (patch) | |
| tree | d6f7dbfaa035b017f1552d089fa21d22a9f88a4a /base/metrics | |
| parent | a506e8f0db3a685046f9163209837b221df0a201 (diff) | |
| download | chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.zip chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.tar.gz chromium_src-10ed6e2eb5e4453da40bdaddb69da73372de150c.tar.bz2 | |
Revert "Land http://codereview.chromium.org/6869009 for the third time."
This reverts commit d4ff483fbf60aad0b49fddd1937774edb3ba1d7e.
---
Introduce the ANNOTATE_LEAKING_OBJECT_PTR annotation that can be used to mark
heap allocated objects as intentionally leaked ones.
Annotate the histograms produced by {Histogram,BooleanHistogram,LinearHistogram,CustomHistogram}::FactoryGet(), as leaked.
Rename StatsHistogram::StatsHistogramFactoryGet to StatsHistogram::FactoryGet, annotate the result as leaky, update the suppressions.
---
TBR=glider@chromium.org
TEST=HistogramTest.RecordedStartupTest and WebSocketTest.ServerSentData in heapchecker bot wont hang.
BUG=79322
Review URL: http://codereview.chromium.org/6962016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
| -rw-r--r-- | base/metrics/histogram.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 16ee8e7..63e5ae6 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -14,7 +14,6 @@ #include <algorithm> #include <string> -#include "base/debug/leak_annotations.h" #include "base/logging.h" #include "base/pickle.h" #include "base/stringprintf.h" @@ -102,7 +101,6 @@ Histogram* Histogram::FactoryGet(const std::string& name, DCHECK_EQ(HISTOGRAM, histogram->histogram_type()); DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count)); - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -797,7 +795,6 @@ Histogram* LinearHistogram::FactoryGet(const std::string& name, DCHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type()); DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count)); - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -888,7 +885,6 @@ Histogram* BooleanHistogram::FactoryGet(const std::string& name, Flags flags) { } DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type()); - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } @@ -938,7 +934,6 @@ Histogram* CustomHistogram::FactoryGet(const std::string& name, DCHECK_EQ(histogram->histogram_type(), CUSTOM_HISTOGRAM); DCHECK(histogram->HasConstructorArguments(ranges[1], ranges.back(), ranges.size())); - ANNOTATE_LEAKING_OBJECT_PTR(histogram); // see crbug.com/79322 return histogram; } |