Remove an unnecessary leak annotation.

Add memory leak suppressing for StatisticsRecorderTest.

Review URL: https://chromiumcodereview.appspot.com/10827132

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

base/metrics/statistics_recorder.cc

@@ -132,7 +132,6 @@ const BucketRanges* StatisticsRecorder::RegisterOrDeleteDuplicateRanges(
   // We haven't found a BucketRanges which has the same ranges. Register the
   // new BucketRanges.
   checksum_matching_list->push_front(ranges);
-  ANNOTATE_LEAKING_OBJECT_PTR(ranges);
   return ranges;
 }
 

tools/valgrind/memcheck/suppressions.txt

@@ -970,6 +970,19 @@
    ...
    fun:_ZN10disk_cache14StatsHistogram10FactoryGet*
 }
+{
+   Intentional leak for Histogram (in StatisticsRecorderTest, NotInitialized).
+   Memcheck:Leak
+   fun:_Znw*
+   fun:_ZN4base42StatisticsRecorderTest_NotInitialized_Test8TestBodyEv
+}
+{
+   Intentional leak for list<const BucketRanges*>(in StatisticsRecorderTest, RegisterBucketRanges).
+   Memcheck:Leak
+   fun:_Znw*
+   fun:_ZN4base18StatisticsRecorder31RegisterOrDeleteDuplicateRangesEPKNS_12BucketRangesE
+   fun:_ZN4base48StatisticsRecorderTest_RegisterBucketRanges_Test8TestBodyEv
+}
 {
    # See http://code.google.com/p/chromium/issues/detail?id=70062#c8
    bug_70062 (Intentional)