[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
index c36d894c7a50894cbadc70c3d9965c215f3e624b..8b97443def060e8d7ec63039837808b190761936 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -42,6 +42,8 @@
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
+#include "skia/ext/cdl_paint.h"
+#include "skia/ext/cdl_surface.h"
 #include "skia/ext/texture_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -210,7 +212,7 @@ class Canvas2DLayerBridgeTest : public Test {
         Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
         kN32_SkColorType)));
     EXPECT_TRUE(bridge->checkSurfaceValid());
-    SkPaint paint;
+    CdlPaint paint;
     uint32_t genID = bridge->getOrCreateSurface()->generationID();
     bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
     EXPECT_EQ(genID, bridge->getOrCreateSurface()->generationID());
@@ -307,7 +309,7 @@ class Canvas2DLayerBridgeTest : public Test {
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
           Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
-      SkPaint paint;
+      CdlPaint paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image =
           bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnitTests);
@@ -322,7 +324,7 @@ class Canvas2DLayerBridgeTest : public Test {
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
           Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
-      SkPaint paint;
+      CdlPaint paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image = bridge->newImageSnapshot(PreferNoAcceleration,
                                                       SnapshotReasonUnitTests);
@@ -460,7 +462,7 @@ class MockImageBuffer : public ImageBuffer {
       : ImageBuffer(
             wrapUnique(new UnacceleratedImageBufferSurface(IntSize(1, 1)))) {}
 
-  MOCK_CONST_METHOD1(resetCanvas, void(SkCanvas*));
+  MOCK_CONST_METHOD1(resetCanvas, void(CdlCanvas*));
 
   virtual ~MockImageBuffer() {}
 };