Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

chrome/browser/metrics/metrics_service.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.
 
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
@@ skipping 1859 matching lines @@
 }
 
 void MetricsService::RecordCurrentHistograms() {
   DCHECK(current_log_);
 
   StatisticsRecorder::Histograms histograms;
   StatisticsRecorder::GetHistograms(&histograms);
   for (StatisticsRecorder::Histograms::iterator it = histograms.begin();
        histograms.end() != it;
        ++it) {
-    if ((*it)->flags() & kUmaTargetedHistogramFlag)
+         if ((*it)->flags() & Histogram::kUmaTargetedHistogramFlag)
       // TODO(petersont): Only record historgrams if they are not precluded by
       // the UMA response data.
       // Bug http://code.google.com/p/chromium/issues/detail?id=2739.
       RecordHistogram(**it);
   }
 }
 
 void MetricsService::RecordHistogram(const Histogram& histogram) {
   // Get up-to-date snapshot of sample stats.
   Histogram::SampleSet snapshot;
@@ skipping 29 matching lines @@
     thread_id = PlatformThread::CurrentId();
   return PlatformThread::CurrentId() == thread_id;
 }
 
 #if defined(OS_CHROMEOS)
 void MetricsService::StartExternalMetrics(Profile* profile) {
   external_metrics_ = new chromeos::ExternalMetrics;
   external_metrics_->Start(profile);
 }
 #endif