Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

chrome/browser/chrome_browser_application_mac_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/histogram.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 47 matching lines @@
 
   // Record some unknown exceptions.
   RecordExceptionWithUma(ExceptionNamed(@"CustomName"));
   RecordExceptionWithUma(ExceptionNamed(@"Custom Name"));
   RecordExceptionWithUma(ExceptionNamed(@""));
   RecordExceptionWithUma(nil);
 
   // We should have exactly the right number of exceptions.
   StatisticsRecorder::GetSnapshot("OSX.NSException", &histograms);
   EXPECT_EQ(1U, histograms.size());
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histograms[0]->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histograms[0]->flags());
   Histogram::SampleSet sample;
   histograms[0]->SnapshotSample(&sample);
   EXPECT_EQ(4, sample.counts(0));
   EXPECT_EQ(1, sample.counts(1));
   EXPECT_EQ(3, sample.counts(2));
   EXPECT_EQ(2, sample.counts(3));
 
   // The unknown exceptions should end up in the overflow bucket.
   EXPECT_EQ(kUnknownNSException + 1, histograms[0]->bucket_count());
   EXPECT_EQ(4, sample.counts(kUnknownNSException));
 }
 
 }  // chrome_browser_application_mac