Index: base/metrics/statistics_recorder_unittest.cc |
diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc |
index 906e642254957b0ac79e9217920b577ba3d678a9..cabeb714e5b5395cab4f4ca1b793e1ab349b388f 100644 |
--- a/base/metrics/statistics_recorder_unittest.cc |
+++ b/base/metrics/statistics_recorder_unittest.cc |
@@ -222,29 +222,18 @@ TEST_F(StatisticsRecorderTest, RegisterHistogramWithMacros) { |
"TestHistogramCounts", 1, 1000000, 50, HistogramBase::kNoFlags); |
// The histogram we got from macro is the same as from FactoryGet. |
- HISTOGRAM_COUNTS("TestHistogramCounts", 30); |
+ LOCAL_HISTOGRAM_COUNTS("TestHistogramCounts", 30); |
registered_histograms.clear(); |
StatisticsRecorder::GetHistograms(®istered_histograms); |
ASSERT_EQ(1u, registered_histograms.size()); |
EXPECT_EQ(histogram, registered_histograms[0]); |
- HISTOGRAM_TIMES("TestHistogramTimes", TimeDelta::FromDays(1)); |
- HISTOGRAM_ENUMERATION("TestHistogramEnumeration", 20, 200); |
+ LOCAL_HISTOGRAM_TIMES("TestHistogramTimes", TimeDelta::FromDays(1)); |
+ LOCAL_HISTOGRAM_ENUMERATION("TestHistogramEnumeration", 20, 200); |
registered_histograms.clear(); |
StatisticsRecorder::GetHistograms(®istered_histograms); |
EXPECT_EQ(3u, registered_histograms.size()); |
- |
- // Debugging only macros. |
- DHISTOGRAM_TIMES("TestHistogramDebugTimes", TimeDelta::FromDays(1)); |
- DHISTOGRAM_COUNTS("TestHistogramDebugCounts", 30); |
- registered_histograms.clear(); |
- StatisticsRecorder::GetHistograms(®istered_histograms); |
-#ifndef NDEBUG |
- EXPECT_EQ(5u, registered_histograms.size()); |
-#else |
- EXPECT_EQ(3u, registered_histograms.size()); |
-#endif |
} |
TEST_F(StatisticsRecorderTest, BucketRangesSharing) { |
@@ -266,10 +255,10 @@ TEST_F(StatisticsRecorderTest, BucketRangesSharing) { |
} |
TEST_F(StatisticsRecorderTest, ToJSON) { |
- HISTOGRAM_COUNTS("TestHistogram1", 30); |
- HISTOGRAM_COUNTS("TestHistogram1", 40); |
- HISTOGRAM_COUNTS("TestHistogram2", 30); |
- HISTOGRAM_COUNTS("TestHistogram2", 40); |
+ LOCAL_HISTOGRAM_COUNTS("TestHistogram1", 30); |
+ LOCAL_HISTOGRAM_COUNTS("TestHistogram1", 40); |
+ LOCAL_HISTOGRAM_COUNTS("TestHistogram2", 30); |
+ LOCAL_HISTOGRAM_COUNTS("TestHistogram2", 40); |
std::string json(StatisticsRecorder::ToJSON(std::string())); |