[NOT FOR COMMIT] Fully replace SkCanvas uses.

cc/blimp/layer_tree_host_unittest_serialization.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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "cc/animation/animation_host.h"
 #include "cc/blimp/layer_tree_host_remote.h"
 #include "cc/layers/empty_content_layer_client.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/solid_color_scrollbar_layer.h"
 #include "cc/proto/layer.pb.h"
 #include "cc/proto/layer_tree_host.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/remote_client_layer_factory.h"
 #include "cc/test/remote_compositor_test.h"
 #include "cc/test/serialization_test_utils.h"
 #include "cc/trees/layer_tree.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
+#include "skia/ext/cdl_paint.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
 #define EXPECT_CLIENT_LAYER_DIRTY(engine_layer)                                \
   do {                                                                         \
     Layer* client_layer = compositor_state_deserializer_->GetLayerForEngineId( \
@@ skipping 322 matching lines @@
 
   LayerTree* engine_layer_tree = layer_tree_host_remote_->GetLayerTree();
   scoped_refptr<Layer> root_layer_src = Layer::Create();
   engine_layer_tree->SetRootLayer(root_layer_src);
 
   // Ensure that a PictureLayer work correctly for multiple rounds of
   // serialization and deserialization.
   FakeContentLayerClient content_client;
   gfx::Size bounds(256, 256);
   content_client.set_bounds(bounds);
-  SkPaint simple_paint;
+  CdlPaint simple_paint;
   simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
   content_client.add_draw_rect(gfx::Rect(bounds), simple_paint);
   scoped_refptr<FakePictureLayer> picture_layer_src =
       FakePictureLayer::Create(&content_client);
 
   root_layer_src->AddChild(picture_layer_src);
   picture_layer_src->SetNearestNeighbor(!picture_layer_src->nearest_neighbor());
   picture_layer_src->SetNeedsDisplay();
   VerifySerializationAndDeserialization();
   layer_tree_host_in_process_->UpdateLayers();
   VerifySerializedPictureLayersAreIdentical(
       picture_layer_src.get(), compositor_state_deserializer_.get());
 
   // Another round.
   picture_layer_src->SetNeedsDisplay();
-  SkPaint new_paint;
+  CdlPaint new_paint;
   new_paint.setColor(SkColorSetARGB(255, 12, 32, 44));
   content_client.add_draw_rect(gfx::Rect(bounds), new_paint);
   VerifySerializationAndDeserialization();
   layer_tree_host_in_process_->UpdateLayers();
   VerifySerializedPictureLayersAreIdentical(
       picture_layer_src.get(), compositor_state_deserializer_.get());
 }
 
 TEST_F(LayerTreeHostSerializationTest, EmptyPictureLayerSerialization) {
   // Override the layer factor to create FakePictureLayers in the deserializer.
   compositor_state_deserializer_->SetLayerFactoryForTesting(
       base::MakeUnique<RemoteClientLayerFactory>());
 
   LayerTree* engine_layer_tree = layer_tree_host_remote_->GetLayerTree();
   scoped_refptr<Layer> root_layer_src = Layer::Create();
   engine_layer_tree->SetRootLayer(root_layer_src);
   scoped_refptr<FakePictureLayer> picture_layer_src =
       FakePictureLayer::Create(EmptyContentLayerClient::GetInstance());
   root_layer_src->AddChild(picture_layer_src);
   picture_layer_src->SetNeedsDisplay();
   VerifySerializationAndDeserialization();
   layer_tree_host_in_process_->UpdateLayers();
   VerifySerializedPictureLayersAreIdentical(
       picture_layer_src.get(), compositor_state_deserializer_.get());
 }
 
 }  // namespace cc