Revert "Land http://codereview.chromium.org/6869009 for the third time."

This reverts commit d4ff483fbf60aad0b49fddd1937774edb3ba1d7e.

---

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.

---

TBR=glider@chromium.org
TEST=HistogramTest.RecordedStartupTest and WebSocketTest.ServerSentData in heapchecker bot wont hang.
BUG=79322

Review URL: http://codereview.chromium.org/6962016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86853 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 3 deletions

diff --git a/net/disk_cache/stats_histogram.cc b/net/disk_cache/stats_histogram.cc
index 14d2d70..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;
@@ -49,7 +49,6 @@ StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
   // 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;
 }