Introduce the ANNOTATE_LEAKING_OBJECT_PTR annotation that can be used to mark

base/metrics/histogram.cc

Index: base/metrics/histogram.cc
===================================================================
--- base/metrics/histogram.cc	(revision 86993)
+++ base/metrics/histogram.cc	(working copy)
@@ -14,6 +14,7 @@
 #include <algorithm>
 #include <string>
 
+#include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
@@ -101,6 +102,7 @@
 
   DCHECK_EQ(HISTOGRAM, histogram->histogram_type());
   DCHECK(histogram->HasConstructorArguments(minimum, maximum, bucket_count));
+  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322

[jar (doing other things), 2011/05/27 18:13:02]

Perchance this line should appear only once, inside of
RegisterOrDeleteDuplicate().

This will also mean that you won't have to make so many changes in the patern
outside this file.

[Alexander Potapenko, 2011/05/30 08:00:38]

Indeed. I've forgotten to upload the actual diff for this file that compared
|histogram| to |tentative_histogram| in order to tell whether the object needs
to be annotated.
Anyway, adding the annotation to RegisterOrDeleteDuplicate() is more simple and
clear. Please see the updated patch.

   return histogram;
 }
 
@@ -795,6 +797,7 @@
 
   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;
 }
 
@@ -885,6 +888,7 @@
   }
 
   DCHECK_EQ(BOOLEAN_HISTOGRAM, histogram->histogram_type());
+  ANNOTATE_LEAKING_OBJECT_PTR(histogram);  // see crbug.com/79322
   return histogram;
 }
 
@@ -934,6 +938,7 @@
   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;
 }