Use proper histogram macros for Renderer4 histograms.

cc/content_layer.cc

 // Copyright 2010 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/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 14 matching lines @@
 {
     return make_scoped_ptr(new ContentLayerPainter(client));
 }
 
 void ContentLayerPainter::paint(SkCanvas* canvas, gfx::Rect contentRect, gfx::RectF& opaque)
 {
     base::TimeTicks paintStart = base::TimeTicks::HighResNow();
     m_client->paintContents(canvas, contentRect, opaque);
     base::TimeTicks paintEnd = base::TimeTicks::HighResNow();
     double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart).InSecondsF();
-    HISTOGRAM_CUSTOM_COUNTS("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart).InMilliseconds(), 0, 120, 30);
-    HISTOGRAM_CUSTOM_COUNTS("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
+    UMA_HISTOGRAM_CUSTOM_COUNTS("Renderer4.AccelContentPaintDurationMS",
+                                (paintEnd - paintStart).InMilliseconds(),
+                                0, 120, 30);
+    UMA_HISTOGRAM_CUSTOM_COUNTS("Renderer4.AccelContentPaintMegapixPerSecond",
+                                pixelsPerSec / 1000000, 10, 210, 30);
 }
 
 const int ContentLayer::kLCDTextMaxChangeCount = 1;
 
 scoped_refptr<ContentLayer> ContentLayer::create(ContentLayerClient* client)
 {
     return make_scoped_refptr(new ContentLayer(client));
 }
 
 ContentLayer::ContentLayer(ContentLayerClient* client)
@@ skipping 96 matching lines @@
         // it does not really cause any invalidation.
         TRACE_EVENT_INSTANT0("cc", "ContentLayer::canUseLCDTextDidChange");
     }
     ++m_lcdTextChangeCount;
  
     // Need to repaint the layer with different text AA setting.
     setNeedsDisplay();
 }
 
 }  // namespace cc