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

Unified Diff: net/disk_cache/stats_histogram.cc

Issue 7071035: Revert 86990 - Fix http://codereview.chromium.org/6869009 to ignore an existing object exactly on... (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 86992)
+++ net/disk_cache/stats_histogram.cc (working copy)
@@ -4,7 +4,6 @@
#include "net/disk_cache/stats_histogram.h"
-#include "base/debug/leak_annotations.h"
#include "base/logging.h"
#include "net/disk_cache/stats.h"
@@ -22,7 +21,8 @@
stats_ = NULL;
}
-StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
+StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
+ const std::string& name) {
Histogram* histogram(NULL);
Sample minimum = 1;
@@ -38,8 +38,6 @@
stats_histogram->InitializeBucketRange();
stats_histogram->SetFlags(kUmaTargetedHistogramFlag);
histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(stats_histogram);
- if (histogram == stats_histogram)
- ANNOTATE_LEAKING_OBJECT_PTR(return_histogram); // see crbug.com/79322
}
DCHECK(HISTOGRAM == histogram->histogram_type());
« 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