Use std::string instead of WTF::String / TextStream

cc/CCHeadsUpDisplayLayerImpl.cpp

 // 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 "config.h"
 
 #include "CCHeadsUpDisplayLayerImpl.h"
 
+#include "base/stringprintf.h"
 #include "CCDebugRectHistory.h"
 #include "CCFontAtlas.h"
 #include "CCFrameRateCounter.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCQuadSink.h"
 #include "CCTextureDrawQuad.h"
 #include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include "SkBitmap.h"
 #include "SkColorMatrixFilter.h"
 #include "SkPaint.h"
 #include "skia/ext/platform_canvas.h"
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 static inline SkPaint createPaint()
 {
     // The SkCanvas is in RGBA but the shader is expecting BGRA, so we need to
     // swizzle our colors when drawing to the SkCanvas.
     SkColorMatrix swizzleMatrix;
     for (int i = 0; i < 20; ++i)
         swizzleMatrix.fMat[i] = 0;
@@ skipping 110 matching lines @@
 
     if (settings.showFPSCounter)
         platformLayerTreeTop = fpsCounterTop + fpsCounterHeight;
     else
         platformLayerTreeTop = 0;
 
     if (settings.showFPSCounter)
         drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
 
     if (settings.showPlatformLayerTree && m_fontAtlas) {
-        String layerTree = layerTreeHostImpl()->layerTreeAsText();
+        std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, IntPoint(2, platformLayerTreeTop), bounds());
     }
 
     if (settings.showDebugRects())
         drawDebugRects(canvas, layerTreeHostImpl()->debugRectHistory());
 }
 
 void CCHeadsUpDisplayLayerImpl::drawFPSCounter(SkCanvas* canvas, CCFrameRateCounter* fpsCounter, int top, int height)
 {
     float textWidth = 170; // so text fits on linux.
@@ skipping 55 matching lines @@
     double averageFPS, stdDeviation;
     fpsCounter->getAverageFPSAndStandardDeviation(averageFPS, stdDeviation);
 
     // Draw background.
     SkPaint paint = createPaint();
     paint.setColor(SK_ColorBLACK);
     canvas->drawRect(SkRect::MakeXYWH(2, top, width, height), paint);
 
     // Draw FPS text.
     if (m_fontAtlas)
-        m_fontAtlas->drawText(canvas, createPaint(), String::format("FPS: %4.1f +/- %3.1f", averageFPS, stdDeviation), IntPoint(10, height / 3), IntSize(width, height));
+        m_fontAtlas->drawText(canvas, createPaint(), base::StringPrintf("FPS: %4.1f +/- %3.1f", averageFPS, stdDeviation), IntPoint(10, height / 3), IntSize(width, height));
 }
 
 void CCHeadsUpDisplayLayerImpl::drawDebugRects(SkCanvas* canvas, CCDebugRectHistory* debugRectHistory)
 {
     const Vector<CCDebugRect>& debugRects = debugRectHistory->debugRects();
 
     for (size_t i = 0; i < debugRects.size(); ++i) {
         SkColor strokeColor = 0;
         SkColor fillColor = 0;
 
@@ skipping 37 matching lines @@
         canvas->drawRect(skRect, paint);
 
         paint.setColor(strokeColor);
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setStrokeWidth(2);
         canvas->drawRect(skRect, paint);
     }
 }
 
 }