ui: Fix cc/paint skia type mismatches

ui/gfx/render_text_unittest.cc

 // 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.
 
 #include "ui/gfx/render_text.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 3741 matching lines @@
       L"TEST some stuff",
       L"WWWWWWWWWW",
       L"gAXAXAXAXAXAXA",
       // TODO(dschuyler): A-Ring draws outside GetStringSize; crbug.com/459812.
       // L"g\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5X\x00C5",
       L"\x0647\x0654\x0647\x0654\x0647\x0654\x0647\x0654\x0645\x0631\x062D"
       L"\x0628\x0627"};
   const Size kCanvasSize(300, 50);
   const int kTestSize = 10;
 
-  sk_sp<SkSurface> surface =
-      SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
+  sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul(
+      kCanvasSize.width(), kCanvasSize.height());
   Canvas canvas(surface->getCanvas(), 1.0f);
   RenderText* render_text = GetRenderText();
   render_text->SetHorizontalAlignment(ALIGN_LEFT);
   render_text->SetColor(SK_ColorBLACK);
 
   for (auto* string : kTestStrings) {
     surface->getCanvas()->clear(SK_ColorWHITE);
     render_text->SetText(WideToUTF16(string));
     const Size string_size = render_text->GetStringSize();
     render_text->ApplyBaselineStyle(SUPERSCRIPT, Range(1, 2));
     render_text->ApplyBaselineStyle(SUPERIOR, Range(3, 4));
     render_text->ApplyBaselineStyle(INFERIOR, Range(5, 6));
     render_text->ApplyBaselineStyle(SUBSCRIPT, Range(7, 8));
     render_text->SetWeight(Font::Weight::BOLD);
     render_text->SetDisplayRect(
         Rect(kTestSize, kTestSize, string_size.width(), string_size.height()));
     // Allow the RenderText to paint outside of its display rect.
     render_text->set_clip_to_display_rect(false);
     ASSERT_LE(string_size.width() + kTestSize * 2, kCanvasSize.width());
 
     render_text->Draw(&canvas);
     ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width());
     SkPixmap pixmap;
-    surface->peekPixels(&pixmap);
+    surface->getCanvas()->peekPixels(&pixmap);
     const uint32_t* buffer = static_cast<const uint32_t*>(pixmap.addr());
     ASSERT_NE(nullptr, buffer);
     TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(),
                                     kCanvasSize.height());
     {
 #if !defined(OS_CHROMEOS)
       int top_test_height = kTestSize;
 #if defined(OS_WIN)
       // Windows 8+ draws 1 pixel above the display rect.
       if (base::win::GetVersion() >= base::win::VERSION_WIN8)
@@ skipping 47 matching lines @@
 }
 #endif  // !defined(OS_WIN)
 
 // Ensure that the text will clip to the display rect. Draws to a canvas and
 // checks whether any pixel beyond the bounding rectangle is colored.
 TEST_P(RenderTextTest, TextDoesClip) {
   const wchar_t* kTestStrings[] = {L"TEST", L"W", L"WWWW", L"gAXAXWWWW"};
   const Size kCanvasSize(300, 50);
   const int kTestSize = 10;
 
-  sk_sp<SkSurface> surface =
-      SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height());
+  sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul(
+      kCanvasSize.width(), kCanvasSize.height());
   Canvas canvas(surface->getCanvas(), 1.0f);
   RenderText* render_text = GetRenderText();
   render_text->SetHorizontalAlignment(ALIGN_LEFT);
   render_text->SetColor(SK_ColorBLACK);
 
   for (auto* string : kTestStrings) {
     surface->getCanvas()->clear(SK_ColorWHITE);
     render_text->SetText(WideToUTF16(string));
     const Size string_size = render_text->GetStringSize();
     int fake_width = string_size.width() / 2;
     int fake_height = string_size.height() / 2;
     render_text->SetDisplayRect(
         Rect(kTestSize, kTestSize, fake_width, fake_height));
     render_text->set_clip_to_display_rect(true);
     render_text->Draw(&canvas);
     ASSERT_LT(string_size.width() + kTestSize, kCanvasSize.width());
     SkPixmap pixmap;
-    surface->peekPixels(&pixmap);
+    surface->getCanvas()->peekPixels(&pixmap);
     const uint32_t* buffer = static_cast<const uint32_t*>(pixmap.addr());
     ASSERT_NE(nullptr, buffer);
     TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(),
                                     kCanvasSize.height());
     {
       SCOPED_TRACE("TextDoesClip Top Side");
       rect_buffer.EnsureSolidRect(SK_ColorWHITE, 0, 0, kCanvasSize.width(),
                                   kTestSize);
     }
 
@@ skipping 482 matching lines @@
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 #endif
 
 INSTANTIATE_TEST_CASE_P(,
                         RenderTextHarfBuzzTest,
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 
 }  // namespace gfx