7 files changed, 25 insertions, 6 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 1e96171..f289149 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -338,6 +338,7 @@
               # Do the same for heap leak checker.
               '-Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi',
               '-Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl',
+              '-Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv',
           ]},
         }],
         [ 'linux_use_debugallocation==1', {
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h
index e1086fe..2d636f2 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -18,10 +18,22 @@
 #define ANNOTATE_SCOPED_MEMORY_LEAK \
     HeapLeakChecker::Disabler heap_leak_checker_disabler
 
+// Annotate an object pointer as referencing a leaky object. This object and all
+// the heap objects referenced by it will be ignored by the heap checker.
+//
+// X should be referencing an active allocated object. If it is not, the
+// annotation will be ignored.
+// No object should be annotated with ANNOTATE_SCOPED_MEMORY_LEAK twice.
+// Once an object is annotated with ANNOTATE_SCOPED_MEMORY_LEAK, it cannot be
+// deleted.
+#define ANNOTATE_LEAKING_OBJECT_PTR(X) \
+    HeapLeakChecker::IgnoreObject(X)
+
 #else
 
 // If tcmalloc is not used, the annotations should be no-ops.
 #define ANNOTATE_SCOPED_MEMORY_LEAK
+#define ANNOTATE_LEAKING_OBJECT_PTR(X)
 
 #endif
 
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index 4262853..3c72b387 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -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 @@ 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;
 }
 
@@ -794,6 +796,7 @@ 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;
 }
 
@@ -884,6 +887,7 @@ 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;
 }
 
@@ -933,6 +937,7 @@ 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;
 }
 
diff --git a/net/disk_cache/stats.cc b/net/disk_cache/stats.cc
index 6fdd31c..af3b941 100644
--- a/net/disk_cache/stats.cc
+++ b/net/disk_cache/stats.cc
@@ -151,7 +151,7 @@ bool Stats::Init(BackendImpl* backend, uint32* storage_addr) {
       // Stats may be reused when the cache is re-created, but we want only one
       // histogram at any given time.
       size_histogram_ =
-          StatsHistogram::StatsHistogramFactoryGet("DiskCache.SizeStats");
+          StatsHistogram::FactoryGet("DiskCache.SizeStats");
       size_histogram_->Init(this);
     }
   }
diff --git a/net/disk_cache/stats_histogram.cc b/net/disk_cache/stats_histogram.cc
index 6d3097a..14d2d70 100644
--- a/net/disk_cache/stats_histogram.cc
+++ b/net/disk_cache/stats_histogram.cc
@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/stats_histogram.h"
 
+#include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "net/disk_cache/stats.h"
 
@@ -21,8 +22,7 @@ StatsHistogram::~StatsHistogram() {
     stats_ = NULL;
 }
 
-StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
-    const std::string& name) {
+StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
   Histogram* histogram(NULL);
 
   Sample minimum = 1;
@@ -49,6 +49,7 @@ StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
   // 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;
 }
 
diff --git a/net/disk_cache/stats_histogram.h b/net/disk_cache/stats_histogram.h
index 83d359c..627286bf 100644
--- a/net/disk_cache/stats_histogram.h
+++ b/net/disk_cache/stats_histogram.h
@@ -35,7 +35,7 @@ class StatsHistogram : public base::Histogram {
       : Histogram(name, minimum, maximum, bucket_count), init_(false) {}
   ~StatsHistogram();
 
-  static StatsHistogram* StatsHistogramFactoryGet(const std::string& name);
+  static StatsHistogram* FactoryGet(const std::string& name);
 
   // We'll be reporting data from the given set of cache stats.
   bool Init(const Stats* stats);
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index b9d63ac..df0fe0f 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -873,7 +873,7 @@
    Histograms via FactoryGet including Stats for disk_cache
    Memcheck:Leak
    fun:_Znw*
-   fun:_ZN10disk_cache14StatsHistogram24StatsHistogramFactoryGet*
+   fun:_ZN10disk_cache14StatsHistogram10FactoryGet*
 }
 
 #-----------------------------------------------------------------------