Fix cc/paint skia type mismatches

content/renderer/media/image_capture_frame_grabber.cc

 // Copyright 2016 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 "content/renderer/media/image_capture_frame_grabber.h"
 
 #include "cc/paint/paint_canvas.h"
 #include "cc/paint/paint_surface.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/video_frame.h"
@@ skipping 52 matching lines @@
   if (first_frame_received_)
     return;
   first_frame_received_ = true;
 
   const SkAlphaType alpha = media::IsOpaque(frame->format())
                                 ? kOpaque_SkAlphaType
                                 : kPremul_SkAlphaType;
   const SkImageInfo info = SkImageInfo::MakeN32(
       frame->visible_rect().width(), frame->visible_rect().height(), alpha);
 
-  sk_sp<cc::PaintSurface> surface = cc::PaintSurface::MakeRaster(info);
+  sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
   DCHECK(surface);
 
   SkPixmap pixmap;
-  if (!cc::ToPixmap(surface->getCanvas(), &pixmap)) {
-    DLOG(ERROR) << "Error trying to map PaintSurface's pixels";
+  if (!skia::GetWritablePixels(surface->getCanvas(), &pixmap)) {
+    DLOG(ERROR) << "Error trying to map SkSurface's pixels";
     callback.Run(sk_sp<SkImage>());
     return;
   }
 
   const uint32 destination_pixel_format =
       (kN32_SkColorType == kRGBA_8888_SkColorType) ? libyuv::FOURCC_ABGR
                                                    : libyuv::FOURCC_ARGB;
 
   libyuv::ConvertFromI420(frame->visible_data(media::VideoFrame::kYPlane),
                           frame->stride(media::VideoFrame::kYPlane),
@@ skipping 66 matching lines @@
 
   MediaStreamVideoSink::DisconnectFromTrack();
   frame_grab_in_progress_ = false;
   if (image)
     callbacks.PassCallbacks()->onSuccess(image);
   else
     callbacks.PassCallbacks()->onError();
 }
 
 }  // namespace content