Revert 86990 - Fix http://codereview.chromium.org/6869009 to ignore an existing object exactly once and land the CL again:

Introduce the ANNOTATE_LEAKING_OBJECT_PTR annotation that can be used to mark
heap allocated objects as intentionally leaked ones.
Annotate the histograms produced by {Histogram,BooleanHistogram,LinearHistogram,CustomHistogram}::FactoryGet(), as leaked.

Rename StatsHistogram::StatsHistogramFactoryGet to StatsHistogram::FactoryGet, annotate the result as leaky, update the suppressions.

BUG=79322
TBR=jar
Review URL: http://codereview.chromium.org/6976044

TBR=glider@chromium.org
Review URL: http://codereview.chromium.org/7071035

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

8 files changed, 7 insertions, 31 deletions

diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index ce1e04e..4e613a9 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -338,7 +338,6 @@
               # 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 2d636f2..e1086fe 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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,22 +18,10 @@
 #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 5b6c59e..63e5ae6 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"
@@ -98,8 +97,6 @@ Histogram* Histogram::FactoryGet(const std::string& name,
     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 @@ Histogram* LinearHistogram::FactoryGet(const std::string& name,
     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 @@ Histogram* BooleanHistogram::FactoryGet(const std::string& name, Flags flags) {
     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 @@ Histogram* CustomHistogram::FactoryGet(const std::string& name,
     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);
diff --git a/net/disk_cache/stats.cc b/net/disk_cache/stats.cc
index af3b941..6fdd31c 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::FactoryGet("DiskCache.SizeStats");
+          StatsHistogram::StatsHistogramFactoryGet("DiskCache.SizeStats");
       size_histogram_->Init(this);
     }
   }
diff --git a/net/disk_cache/stats_histogram.cc b/net/disk_cache/stats_histogram.cc
index bea5fd9..6d3097a 100644
--- a/net/disk_cache/stats_histogram.cc
+++ b/net/disk_cache/stats_histogram.cc
@@ -4,7 +4,6 @@
 
 #include "net/disk_cache/stats_histogram.h"
 
-#include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "net/disk_cache/stats.h"
 
@@ -22,7 +21,8 @@ StatsHistogram::~StatsHistogram() {
     stats_ = NULL;
 }
 
-StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
+StatsHistogram* StatsHistogram::StatsHistogramFactoryGet(
+    const std::string& name) {
   Histogram* histogram(NULL);
 
   Sample minimum = 1;
@@ -38,8 +38,6 @@ StatsHistogram* StatsHistogram::FactoryGet(const std::string& name) {
     stats_histogram->InitializeBucketRange();
     stats_histogram->SetFlags(kUmaTargetedHistogramFlag);
     histogram = StatisticsRecorder::RegisterOrDeleteDuplicate(stats_histogram);
-    if (histogram == stats_histogram)
-        ANNOTATE_LEAKING_OBJECT_PTR(return_histogram); // see crbug.com/79322
   }
 
   DCHECK(HISTOGRAM == histogram->histogram_type());
diff --git a/net/disk_cache/stats_histogram.h b/net/disk_cache/stats_histogram.h
index f41c384..7f513ce 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) {}
   virtual ~StatsHistogram();
 
-  static StatsHistogram* FactoryGet(const std::string& name);
+  static StatsHistogram* StatsHistogramFactoryGet(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/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 741c90c..ea4e486 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -148,7 +148,7 @@
    Intentional leak of stats histogram to avoid shutdown races
    Heapcheck:Leak
    ...
-   fun:disk_cache::StatsHistogram::FactoryGet
+   fun:disk_cache::StatsHistogram::StatsHistogramFactoryGet
 }
 {
    String name pushed into deliberately leaked histograms
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index db5150a..e730fe8 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_cache14StatsHistogram10FactoryGet*
+   fun:_ZN10disk_cache14StatsHistogram24StatsHistogramFactoryGet*
 }
 
 #-----------------------------------------------------------------------