summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/stats_histogram.h
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 08:42:55 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 08:42:55 +0000
commitc736d3cc492a2e7fff505069ad1df01926359352 (patch)
treea98c227cb3462221e1716b0bad96113615e1e010 /net/disk_cache/stats_histogram.h
parent404fcd6d813d0b78d6236029673e98fb914815e1 (diff)
downloadchromium_src-c736d3cc492a2e7fff505069ad1df01926359352.zip
chromium_src-c736d3cc492a2e7fff505069ad1df01926359352.tar.gz
chromium_src-c736d3cc492a2e7fff505069ad1df01926359352.tar.bz2
Revert 86990 - Fix http://codereview.chromium.org/6869009 to ignore an existing object exactly once and land the CL again:
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. BUG=79322 TBR=jar Review URL: http://codereview.chromium.org/6976044 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/7071035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/stats_histogram.h')
-rw-r--r--net/disk_cache/stats_histogram.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/disk_cache/stats_histogram.h b/net/disk_cache/stats_histogram.h
index f41c384..7f513ce 100644
--- a/net/disk_cache/stats_histogram.h
+++ b/net/disk_cache/stats_histogram.h
@@ -35,7 +35,7 @@ class StatsHistogram : public base::Histogram {
: Histogram(name, minimum, maximum, bucket_count), init_(false) {}
virtual ~StatsHistogram();
- static StatsHistogram* FactoryGet(const std::string& name);
+ static StatsHistogram* StatsHistogramFactoryGet(const std::string& name);
// We'll be reporting data from the given set of cache stats.
bool Init(const Stats* stats);