Use proper histogram macros for Renderer4 histograms.

cc/frame_rate_counter.cc

 // Copyright 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.
 
 #include "cc/frame_rate_counter.h"
 
 #include <limits>
 
 #include "base/metrics/histogram.h"
 #include "cc/proxy.h"
@@ skipping 24 matching lines @@
 void FrameRateCounter::saveTimeStamp(base::TimeTicks timestamp)
 {
     m_ringBuffer.SaveToBuffer(timestamp);
 
     // Check if frame interval can be computed.
     if (m_ringBuffer.CurrentIndex() < 2)
         return;
 
     base::TimeDelta frameIntervalSeconds = recentFrameInterval(m_ringBuffer.BufferSize() - 1);
 
-    if (m_hasImplThread && m_ringBuffer.CurrentIndex() > 0)
-        HISTOGRAM_CUSTOM_COUNTS("Renderer4.CompositorThreadImplDrawDelay", frameIntervalSeconds.InMilliseconds(), 1, 120, 60);
+    if (m_hasImplThread && m_ringBuffer.CurrentIndex() > 0) {
+        UMA_HISTOGRAM_CUSTOM_COUNTS("Renderer4.CompositorThreadImplDrawDelay",
+                                    frameIntervalSeconds.InMilliseconds(),
+                                    1, 120, 60);
+    }
 
     if (!isBadFrameInterval(frameIntervalSeconds) &&
         frameIntervalSeconds.InSecondsF() > kDroppedFrameTime)
         ++m_droppedFrameCount;
 }
 
 bool FrameRateCounter::isBadFrameInterval(base::TimeDelta intervalBetweenConsecutiveFrames) const
 {
     double delta = intervalBetweenConsecutiveFrames.InSecondsF();
     bool schedulerAllowsDoubleFrames = !m_hasImplThread;
@@ skipping 63 matching lines @@
 {
     DCHECK(n < m_ringBuffer.BufferSize());
 
     if (m_ringBuffer.IsFilledIndex(n))
         return m_ringBuffer.ReadBuffer(n);
 
     return base::TimeTicks();
 }
 
 }  // namespace cc