| Index: base/metrics/sparse_histogram.h
|
| diff --git a/base/metrics/sparse_histogram.h b/base/metrics/sparse_histogram.h
|
| index 07d56603a5d8b4b7a85caadedbbf67d6dba39215..c1149163f59b4cb5b8d6dff303bd1a3721a07105 100644
|
| --- a/base/metrics/sparse_histogram.h
|
| +++ b/base/metrics/sparse_histogram.h
|
| @@ -19,39 +19,13 @@
|
|
|
| namespace base {
|
|
|
| -// The common code for different SparseHistogram macros.
|
| -#define HISTOGRAM_SPARSE_COMMON(name, sample, flag) \
|
| +#define UMA_HISTOGRAM_SPARSE_SLOWLY(name, sample) \
|
| do { \
|
| - base::HistogramBase* histogram( \
|
| - base::SparseHistogram::FactoryGet(name, flag)); \
|
| - DCHECK_EQ(histogram->histogram_name(), name); \
|
| + base::HistogramBase* histogram = base::SparseHistogram::FactoryGet( \
|
| + name, base::HistogramBase::kUmaTargetedHistogramFlag); \
|
| histogram->Add(sample); \
|
| } while (0)
|
|
|
| -#define HISTOGRAM_SPARSE_SLOWLY(name, sample) \
|
| - HISTOGRAM_SPARSE_COMMON(name, sample, base::HistogramBase::kNoFlags)
|
| -
|
| -#define UMA_HISTOGRAM_SPARSE_SLOWLY(name, sample) \
|
| - HISTOGRAM_SPARSE_COMMON(name, sample, \
|
| - base::HistogramBase::kUmaTargetedHistogramFlag)
|
| -
|
| -//------------------------------------------------------------------------------
|
| -// Define debug only version of macros.
|
| -#ifndef NDEBUG
|
| -
|
| -#define DHISTOGRAM_SPARSE_SLOWLY(name, sample) \
|
| - HISTOGRAM_SPARSE_SLOWLY(name, sample)
|
| -
|
| -#else // NDEBUG
|
| -
|
| -#define DHISTOGRAM_SPARSE_SLOWLY(name, sample) \
|
| - while (0) { \
|
| - static_cast<void>(name); \
|
| - static_cast<void>(sample); \
|
| - }
|
| -
|
| -#endif // NDEBUG
|
| -
|
| class HistogramSamples;
|
|
|
| class BASE_EXPORT_PRIVATE SparseHistogram : public HistogramBase {
|
|
|