Revert 86990 - Fix http://codereview.chromium.org/6869009 to ignore an existing object exactly on...

base/metrics/histogram.cc

Index: base/metrics/histogram.cc
===================================================================
--- base/metrics/histogram.cc	(revision 86992)
+++ base/metrics/histogram.cc	(working copy)
@@ -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"
@@ -98,8 +97,6 @@
     tentative_histogram->SetFlags(flags);
     histogram =
         StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram);
-    if (histogram == tentative_histogram)
-        ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   }
 
   DCHECK_EQ(HISTOGRAM, histogram->histogram_type());
@@ -794,8 +791,6 @@
     tentative_histogram->SetFlags(flags);
     histogram =
         StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram);
-    if (histogram == tentative_histogram)
-        ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   }
 
   DCHECK_EQ(LINEAR_HISTOGRAM, histogram->histogram_type());
@@ -887,8 +882,6 @@
     tentative_histogram->SetFlags(flags);
     histogram =
         StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram);
-    if (histogram == tentative_histogram)
-        ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   }
 
   DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type());
@@ -936,8 +929,6 @@
     tentative_histogram->SetFlags(flags);
     histogram =
         StatisticsRecorder::RegisterOrDeleteDuplicate(tentative_histogram);
-    if (histogram == tentative_histogram)
-        ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   }
 
   DCHECK_EQ(histogram->histogram_type(), CUSTOM_HISTOGRAM);