[NOT FOR COMMIT] Fully replace SkCanvas uses.

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 4a7dd8ca91b2ee73db1376fffd57362fc716266b..2c7fc9762aaf3fa04a1dcfee419b4c6ae27ae665 100644
--- a/content/renderer/media/webmediaplayer_ms_compositor.cc
+++ b/content/renderer/media/webmediaplayer_ms_compositor.cc
@@ -19,6 +19,7 @@
 #include "media/base/video_util.h"
 #include "media/filters/video_renderer_algorithm.h"
 #include "media/renderers/skcanvas_video_renderer.h"
+#include "skia/ext/cdl_surface.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
@@ -47,7 +48,7 @@ scoped_refptr<media::VideoFrame> CopyFrame(
         media::PIXEL_FORMAT_I420, frame->coded_size(), frame->visible_rect(),
         frame->natural_size(), frame->timestamp());
 
-    sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
+    sk_sp<CdlSurface> surface = CdlSurface::MakeRasterN32Premul(
         frame->visible_rect().width(), frame->visible_rect().height());
 
     ContextProviderCommandBuffer* const provider =
@@ -64,7 +65,7 @@ scoped_refptr<media::VideoFrame> CopyFrame(
     }
 
     SkPixmap pixmap;
-    const bool result = surface->getCanvas()->peekPixels(&pixmap);
+    const bool result = GetSkCanvas(surface->getCanvas())->peekPixels(&pixmap);
     DCHECK(result) << "Error trying to access SkSurface's pixels";
 
     const uint32 source_pixel_format =