Add LOCAL_ prefix to non-UMA histogram macros.

base/metrics/sparse_histogram.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_METRICS_SPARSE_HISTOGRAM_H_
 #define BASE_METRICS_SPARSE_HISTOGRAM_H_
 
 #include <map>
 #include <string>
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/sample_map.h"
 #include "base/synchronization/lock.h"
 
 namespace base {
 
 // The common code for different SparseHistogram macros.
 #define HISTOGRAM_SPARSE_COMMON(name, sample, flag) \

[Ilya Sherman, 2014/08/26 00:23:28]

Optional nit: Should we perhaps add a "PRIVATE_" prefix to this macro?  One the
one hand, I don't think there's much likelihood of accidental use.  On the other
hand, it does seem like the sort of thing that would be made more hidden if it
weren't a macro.

     do { \
       base::HistogramBase* histogram( \
           base::SparseHistogram::FactoryGet(name, flag)); \
       DCHECK_EQ(histogram->histogram_name(), name); \
       histogram->Add(sample); \
     } while (0)
 
-#define HISTOGRAM_SPARSE_SLOWLY(name, sample) \
+#define LOCAL_HISTOGRAM_SPARSE_SLOWLY(name, sample) \
     HISTOGRAM_SPARSE_COMMON(name, sample, base::HistogramBase::kNoFlags)

[Ilya Sherman, 2014/08/26 00:23:28]

Actually, are there any uses of local sparse histograms?  Maybe we should try
making sparse histograms be UMA-only in flavor, and see if anyone complains?

[Alexei Svitkine (slow), 2014/08/26 00:54:01]

SGTM. Done.

Also, did a little bit of cleanup to the expanded block (e.g. removed the name
dcheck since it's not necessary because the object is never cached.)

 
 #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 {
  public:
   // If there's one with same name, return the existing one. If not, create a
   // new one.
   static HistogramBase* FactoryGet(const std::string& name, int32 flags);
 
   virtual ~SparseHistogram();
 
@@ skipping 43 matching lines @@
   mutable base::Lock lock_;
 
   SampleMap samples_;
 
   DISALLOW_COPY_AND_ASSIGN(SparseHistogram);
 };
 
 }  // namespace base
 
 #endif  // BASE_METRICS_SPARSE_HISTOGRAM_H_