cc/paint: Remove cc::PaintSurface.

content/renderer/media/webmediaplayer_ms_compositor.cc

Index: content/renderer/media/webmediaplayer_ms_compositor.cc
diff --git a/content/renderer/media/webmediaplayer_ms_compositor.cc b/content/renderer/media/webmediaplayer_ms_compositor.cc
index c0097d78adaaa40d298a886ef6f5a994265e897d..338af8707b2c013494f77495596935be2d77d325 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -11,7 +11,7 @@
 #include "base/hash.h"
 #include "base/single_thread_task_runner.h"
 #include "base/values.h"
-#include "cc/paint/paint_surface.h"
+#include "cc/paint/skia_paint_canvas.h"
 #include "content/renderer/media/webmediaplayer_ms.h"
 #include "content/renderer/render_thread_impl.h"
 #include "media/base/media_switches.h"
@@ -48,15 +48,16 @@ scoped_refptr<media::VideoFrame> CopyFrame(
         media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(),
         frame->natural_size(), frame->timestamp());
 
-    sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRasterN32Premul(
-        frame->visible_rect().width(), frame->visible_rect().height());
+    std::unique_ptr<cc::SkiaPaintCanvas> canvas(
+        cc::SkiaPaintCanvas::CreateRasterZeroed(SkImageInfo::MakeN32Premul(
+            frame->visible_rect().width(), frame->visible_rect().height())));
 
     ui::ContextProviderCommandBuffer* const provider =
         RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
-    if (surface && provider) {
+    if (canvas && provider) {
       DCHECK(provider->ContextGL());
       video_renderer->Copy(
-          frame.get(), surface->getCanvas(),
+          frame.get(), canvas.get(),
           media::Context3D(provider->ContextGL(), provider->GrContext()));
     } else {
       // Return a black frame (yuv = {0, 0x80, 0x80}).
@@ -65,7 +66,7 @@ scoped_refptr<media::VideoFrame> CopyFrame(
     }
 
     SkPixmap pixmap;
-    const bool result = surface->getCanvas()->peekPixels(&pixmap);
+    const bool result = cc::ToPixmap(canvas.get(), &pixmap);
     DCHECK(result) << "Error trying to access PaintSurface's pixels";
 
     const uint32 source_pixel_format =