Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

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 487 matching lines @@
   std::set<std::string> active_extensions;
   user_script_slave_->GetActiveExtensions(&active_extensions);
   ExtensionProcessBindings::GetActiveExtensions(&active_extensions);
   child_process_logging::SetActiveExtensions(active_extensions);
 }
 
 static void* CreateHistogram(
     const char *name, int min, int max, size_t buckets) {
   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);
+  scoped_refptr<Histogram> histogram = Histogram::FactoryGet(
+      name, min, max, buckets, Histogram::kUmaTargetedHistogramFlag);
   // We'll end up leaking these histograms, unless there is some code hiding in
   // there to do the dec-ref.
+  // TODO(jar): Handle reference counting in webkit glue.
   histogram->AddRef();
   return histogram.get();
 }
 
 static void AddHistogramSample(void* hist, int sample) {
   Histogram* histogram = static_cast<Histogram *>(hist);
   histogram->Add(sample);
 }
 
 void RenderThread::EnsureWebKitInitialized() {
@@ skipping 210 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);
 }