Use factory to create histograms, and refcounts to track lifetimes...

chrome/renderer/render_thread.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/renderer/render_thread.h"
 
 #include <v8.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 464 matching lines @@
 void RenderThread::CloseIdleConnections() {
   Send(new ViewHostMsg_CloseIdleConnections());
 }
 
 void RenderThread::SetCacheMode(bool enabled) {
   Send(new ViewHostMsg_SetCacheMode(enabled));
 }
 
 static void* CreateHistogram(
     const char *name, int min, int max, size_t buckets) {
-  Histogram* histogram = new Histogram(name, min, max, buckets);
-  if (histogram) {
-    histogram->SetFlags(kUmaTargetedHistogramFlag);
-  }
-  return histogram;
+  if (min <= 0)
+    min = 1;
+  scoped_refptr<Histogram> histogram =
+      Histogram::HistogramFactoryGet(name, min, max, buckets);
+  // We verify this was not being destructed by setting a novel "PlannedLeak"
+  // flag and watching out for the flag in the destructor.
+  histogram->SetFlags(kUmaTargetedHistogramFlag | kPlannedLeakFlag);
+  // We'll end up leaking these histograms, unless there is some code hiding in
+  // there to do the dec-ref.
+  histogram->AddRef();
+  return histogram.get();
 }
 
 static void AddHistogramSample(void* hist, int sample) {
   Histogram* histogram = static_cast<Histogram *>(hist);
   histogram->Add(sample);
 }
 
 void RenderThread::EnsureWebKitInitialized() {
   if (webkit_client_.get())
     return;
@@ skipping 186 matching lines @@
   spellchecker_->EnableAutoSpellCorrect(auto_spell_correct);
 }
 
 void RenderThread::OnSpellCheckWordAdded(const std::string& word) {
   spellchecker_->WordAdded(word);
 }
 
 void RenderThread::OnSpellCheckEnableAutoSpellCorrect(bool enable) {
   spellchecker_->EnableAutoSpellCorrect(enable);
 }