[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/playback/recording_source_unittest.cc

 // Copyright 2015 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 <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/region.h"
 #include "cc/playback/raster_source.h"
 #include "cc/test/fake_client_picture_cache.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_engine_picture_cache.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/skia_common.h"
+#include "skia/ext/cdl_paint.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
 namespace cc {
 namespace {
 
 std::unique_ptr<FakeRecordingSource> CreateRecordingSource(
     const gfx::Rect& viewport) {
   gfx::Rect layer_rect(viewport.right(), viewport.bottom());
@@ skipping 156 matching lines @@
     EXPECT_TRUE(images.empty());
   }
 }
 
 TEST(RecordingSourceTest, NoDiscardableImages) {
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
 
-  SkPaint simple_paint;
+  CdlPaint simple_paint;
   simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
 
   SkBitmap non_discardable_bitmap;
   non_discardable_bitmap.allocN32Pixels(128, 128);
   non_discardable_bitmap.setImmutable();
   sk_sp<SkImage> non_discardable_image =
       SkImage::MakeFromBitmap(non_discardable_bitmap);
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
                                              simple_paint);
@@ skipping 165 matching lines @@
                                               gfx::SizeF(1.f, 1.f), &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
     EXPECT_TRUE(images[1].image() == discardable_image[0][1]);
     EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
   }
 }
 
 }  // namespace
 }  // namespace cc