Rename paint data structures

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

Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index a727e0d3336aa7ce6e2bf73318e8f253dcfdafe0..3b0244401fb760f64ba46d3a7c82e6a2189dd6cc 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -461,8 +461,10 @@ TEST_P(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent) {
   // Set canvas background to red with alpha.
   SkBitmap bitmap;
   bitmap.allocN32Pixels(kWidth, kHeight);
-  SkCanvas canvas(bitmap);
-  canvas.clear(kAlphaRed);
+  SkCanvas bitmapCanvas(bitmap);
+  bitmapCanvas.clear(kAlphaRed);
+
+  PaintCanvasPassThrough canvas(&bitmapCanvas);
 
   SkPictureBuilder pictureBuilder(FloatRect(0, 0, kWidth, kHeight));
 
@@ -476,7 +478,6 @@ TEST_P(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent) {
   PaintLayerPainter(*rootLayer)
       .paintLayerContents(pictureBuilder.context(), paintingInfo,
                           PaintLayerPaintingCompositingAllPhases);
-
   pictureBuilder.endRecording()->playback(&canvas);
 
   // The result should be a blend of red and green.