Revert of Make cc/paint have concrete types

media/renderers/skcanvas_video_renderer_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 <GLES3/gl3.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/aligned_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 656 matching lines @@
 TEST_F(SkCanvasVideoRendererTest, CorrectFrameSizeToVisibleRect) {
   int fWidth{16}, fHeight{16};
   SkImageInfo imInfo =
       SkImageInfo::MakeN32(fWidth, fHeight, kOpaque_SkAlphaType);
 
   sk_sp<const GrGLInterface> glInterface(GrGLCreateNullInterface());
   sk_sp<GrContext> grContext(
       GrContext::Create(kOpenGL_GrBackend,
                         reinterpret_cast<GrBackendContext>(glInterface.get())));
 
-  sk_sp<SkSurface> surface =
-      SkSurface::MakeRenderTarget(grContext.get(), SkBudgeted::kYes, imInfo);
-  cc::PaintCanvas canvas(surface->getCanvas());
+  sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRenderTarget(
+      grContext.get(), SkBudgeted::kYes, imInfo);
+  cc::PaintCanvas* canvas = surface->getCanvas();
 
   TestGLES2Interface gles2;
   Context3D context_3d(&gles2, grContext.get());
   gfx::Size coded_size(fWidth, fHeight);
   gfx::Size visible_size(fWidth / 2, fHeight / 2);
 
   gpu::MailboxHolder mailbox_holders[VideoFrame::kMaxPlanes];
   for (size_t i = 0; i < VideoFrame::kMaxPlanes; i++) {
     mailbox_holders[i] = gpu::MailboxHolder(
         gpu::Mailbox::Generate(), gpu::SyncToken(), GL_TEXTURE_RECTANGLE_ARB);
   }
 
   auto video_frame = VideoFrame::WrapNativeTextures(
       PIXEL_FORMAT_I420, mailbox_holders, base::Bind(EmptyCallback), coded_size,
       gfx::Rect(visible_size), visible_size,
       base::TimeDelta::FromMilliseconds(4));
 
   gfx::RectF visible_rect(visible_size.width(), visible_size.height());
   cc::PaintFlags flags;
-  renderer_.Paint(video_frame, &canvas, visible_rect, flags, VIDEO_ROTATION_0,
+  renderer_.Paint(video_frame, canvas, visible_rect, flags, VIDEO_ROTATION_0,
                   context_3d);
 
   EXPECT_EQ(fWidth / 2, renderer_.LastImageDimensionsForTesting().width());
   EXPECT_EQ(fWidth / 2, renderer_.LastImageDimensionsForTesting().height());
 }
 
 TEST_F(SkCanvasVideoRendererTest, TexImage2D_Y16_RGBA32F) {
   // Create test frame.
   // |offset_x| and |offset_y| define visible rect's offset to coded rect.
   const int offset_x = 3;
@@ skipping 93 matching lines @@
         EXPECT_EQ(expected_value, data[(i + j * width)]);
       }
     }
   });
   SkCanvasVideoRenderer::TexSubImage2D(GL_TEXTURE_2D, &gles2, video_frame.get(),
                                        0, GL_RED, GL_FLOAT, 2 /*xoffset*/,
                                        1 /*yoffset*/, false /*flip_y*/, true);
 }
 
 }  // namespace media