Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: net/disk_cache/stats_histogram.cc

Issue 7062016: Land http://codereview.chromium.org/6869009 for the third time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/disk_cache/stats_histogram.h ('k') | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/stats_histogram.cc
===================================================================
--- net/disk_cache/stats_histogram.cc (revision 86786)
+++ net/disk_cache/stats_histogram.cc (working copy)
@@ -4,6 +4,7 @@
#include "net/disk_cache/stats_histogram.h"
+#include "base/debug/leak_annotations.h"
#include "base/logging.h"
#include "net/disk_cache/stats.h"
@@ -21,8 +22,7 @@
stats_ = NULL;
}
-StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
- const std::string& name) {
+StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
Histogram* histogram(NULL);
Sample minimum = 1;
@@ -49,6 +49,7 @@
// Validate upcast by seeing that we're probably providing the checksum.
CHECK_EQ(return_histogram->StatsHistogram::CalculateRangeChecksum(),
return_histogram->CalculateRangeChecksum());
+ ANNOTATE_LEAKING_OBJECT_PTR(return_histogram); // see crbug.com/79322
return return_histogram;
}
« no previous file with comments | « net/disk_cache/stats_histogram.h ('k') | tools/heapcheck/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698