Use proper histogram macros for Renderer4 histograms.

cc/overdraw_metrics.cc

Index: cc/overdraw_metrics.cc
diff --git a/cc/overdraw_metrics.cc b/cc/overdraw_metrics.cc
index 8f4df245ed0a6a5ff181d3d6a509d86a57bce357..40dbd653da672cf5ffd892f2ff6e6bf371ca39e4 100644
--- a/cc/overdraw_metrics.cc
+++ b/cc/overdraw_metrics.cc
@@ -144,23 +144,57 @@ void OverdrawMetrics::recordMetricsInternal(MetricsType metricsType, const Layer
 
     switch (metricsType) {
     case DrawingToScreen: {
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountOpaque_Draw", static_cast<int>(normalization * m_pixelsDrawnOpaque), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountTranslucent_Draw", static_cast<int>(normalization * m_pixelsDrawnTranslucent), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountCulled_Draw", static_cast<int>(normalization * m_pixelsCulledForDrawing), 100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountOpaque_Draw",
+            static_cast<int>(normalization * m_pixelsDrawnOpaque),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountTranslucent_Draw",
+            static_cast<int>(normalization * m_pixelsDrawnTranslucent),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountCulled_Draw",
+            static_cast<int>(normalization * m_pixelsCulledForDrawing),
+            100, 1000000, 50);
 
         TRACE_COUNTER_ID1("cc", "DrawPixelsCulled", layerTreeHost, m_pixelsCulledForDrawing);
         TRACE_EVENT2("cc", "OverdrawMetrics", "PixelsDrawnOpaque", m_pixelsDrawnOpaque, "PixelsDrawnTranslucent", m_pixelsDrawnTranslucent);
         break;
     }
     case UpdateAndCommit: {
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountPainted", static_cast<int>(normalization * m_pixelsPainted), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountOpaque_Upload", static_cast<int>(normalization * m_pixelsUploadedOpaque), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.pixelCountTranslucent_Upload", static_cast<int>(normalization * m_pixelsUploadedTranslucent), 100, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.tileCountCulled_Upload", static_cast<int>(tileNormalization * m_tilesCulledForUpload), 100, 10000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.renderSurfaceTextureBytes_ViewportScaled", static_cast<int>(byteNormalization * m_renderSurfaceTextureUseBytes), 10, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.renderSurfaceTextureBytes_Unscaled", static_cast<int>(m_renderSurfaceTextureUseBytes / 1000), 1000, 100000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.contentsTextureBytes_ViewportScaled", static_cast<int>(byteNormalization * m_contentsTextureUseBytes), 10, 1000000, 50);
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.contentsTextureBytes_Unscaled", static_cast<int>(m_contentsTextureUseBytes / 1000), 1000, 100000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountPainted",
+            static_cast<int>(normalization * m_pixelsPainted),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountOpaque_Upload",
+            static_cast<int>(normalization * m_pixelsUploadedOpaque),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.pixelCountTranslucent_Upload",
+            static_cast<int>(normalization * m_pixelsUploadedTranslucent),
+            100, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.tileCountCulled_Upload",
+            static_cast<int>(tileNormalization * m_tilesCulledForUpload),
+            100, 10000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.renderSurfaceTextureBytes_ViewportScaled",
+            static_cast<int>(
+                byteNormalization * m_renderSurfaceTextureUseBytes),
+            10, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.renderSurfaceTextureBytes_Unscaled",
+            static_cast<int>(m_renderSurfaceTextureUseBytes / 1000),
+            1000, 100000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.contentsTextureBytes_ViewportScaled",
+            static_cast<int>(byteNormalization * m_contentsTextureUseBytes),
+            10, 1000000, 50);
+        UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "Renderer4.contentsTextureBytes_Unscaled",
+            static_cast<int>(m_contentsTextureUseBytes / 1000),
+            1000, 100000000, 50);
 
         {
             TRACE_COUNTER_ID1("cc", "UploadTilesCulled", layerTreeHost, m_tilesCulledForUpload);