summaryrefslogtreecommitdiffstats
path: root/net/disk_cache/stats.cc
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 12:17:34 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 12:17:34 +0000
commitcbb661076550a2639f6891598e9b90526ce50a92 (patch)
tree55e013c6cfbed7f893163a62c39f46ff905b4817 /net/disk_cache/stats.cc
parent699f001d13a324ee99dcb5965878fde6c6cfa3f0 (diff)
downloadchromium_src-cbb661076550a2639f6891598e9b90526ce50a92.zip
chromium_src-cbb661076550a2639f6891598e9b90526ce50a92.tar.gz
chromium_src-cbb661076550a2639f6891598e9b90526ce50a92.tar.bz2
Revert 85898 - Re-land http://codereview.chromium.org/6869009 (except for the suppressions)
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. The previous commit broke the build on Linux Heapcheck, but looks like the problem has gone now. TBR=jar,willchan BUG=79322 Review URL: http://codereview.chromium.org/7048005 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/7049006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache/stats.cc')
-rw-r--r--net/disk_cache/stats.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/disk_cache/stats.cc b/net/disk_cache/stats.cc
index af3b941..6fdd31c 100644
--- a/net/disk_cache/stats.cc
+++ b/net/disk_cache/stats.cc
@@ -151,7 +151,7 @@ bool Stats::Init(BackendImpl* backend, uint32* storage_addr) {
// Stats may be reused when the cache is re-created, but we want only one
// histogram at any given time.
size_histogram_ =
- StatsHistogram::FactoryGet("DiskCache.SizeStats");
+ StatsHistogram::StatsHistogramFactoryGet("DiskCache.SizeStats");
size_histogram_->Init(this);
}
}