[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 457 matching lines @@
   // would.
   FrameView* view = m_webViewHelper.webView()->mainFrameImpl()->frameView();
   PaintLayer* rootLayer = view->layoutViewItem().layer();
   LayoutRect paintRect(0, 0, kWidth, kHeight);
   PaintLayerPaintingInfo paintingInfo(rootLayer, paintRect,
                                       GlobalPaintNormalPhase, LayoutSize());
   PaintLayerPainter(*rootLayer)
       .paintLayerContents(pictureBuilder.context(), paintingInfo,
                           PaintLayerPaintingCompositingAllPhases);
 
-  pictureBuilder.endRecording()->playback(&canvas);
+  pictureBuilder.endRecording()->playback(CdlCanvas::Make(&canvas).get());
 
   // The result should be a blend of red and green.
   SkColor color = bitmap.getColor(kWidth / 2, kHeight / 2);
   EXPECT_TRUE(redChannel(color));
   EXPECT_TRUE(greenChannel(color));
 }
 
 TEST_P(WebViewTest, FocusIsInactive) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), "visible_iframe.html");
@@ skipping 3871 matching lines @@
       .translate(50, 55)
       .scale(1. / 2.f);
   EXPECT_EQ(expectedMatrix,
             webViewImpl->getDeviceEmulationTransformForTesting());
   // visibleContentRect doesn't change.
   EXPECT_EQ(IntRect(50, 55, 50, 75),
             *devToolsEmulator->visibleContentRectForPainting());
 }
 
 }  // namespace blink