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

base/metrics/histogram.cc

Index: base/metrics/histogram.cc
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index 16ee8e7a778fb95e49b428cda7c043a7605df822..63e5ae6b8d79ee990dd548104cee0fd0b9edf8b2 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <string>
 
-#include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
@@ -102,7 +101,6 @@ Histogram* Histogram::FactoryGet(const std::string& name,
 
   DCHECK_EQ(HISTOGRAM, histogram->histogram_type());
   DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count));
-  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   return histogram;
 }
 
@@ -797,7 +795,6 @@ Histogram* LinearHistogram::FactoryGet(const std::string& name,
 
   DCHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type());
   DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count));
-  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   return histogram;
 }
 
@@ -888,7 +885,6 @@ Histogram* BooleanHistogram::FactoryGet(const std::string& name, Flags flags) {
   }
 
   DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type());
-  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   return histogram;
 }
 
@@ -938,7 +934,6 @@ Histogram* CustomHistogram::FactoryGet(const std::string& name,
   DCHECK_EQ(histogram->histogram_type(), CUSTOM_HISTOGRAM);
   DCHECK(histogram->HasConstructorArguments(ranges[1], ranges.back(),
                                             ranges.size()));
-  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   return histogram;
 }