3 files changed, 4 insertions, 6 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);
     }
   }
diff --git a/net/disk_cache/stats_histogram.cc b/net/disk_cache/stats_histogram.cc
index bea5fd9..6d3097a 100644
--- a/net/disk_cache/stats_histogram.cc
+++ b/net/disk_cache/stats_histogram.cc
@@ -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 @@ StatsHistogram::~StatsHistogram() {
     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 @@ StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
     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());
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);