[NOT FOR COMMIT] Fully replace SkCanvas uses.

ui/views/color_chooser/color_chooser_view.cc

Index: ui/views/color_chooser/color_chooser_view.cc
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index b11734be05015cc16bc0dae248bcbc2be09dc46b..b8c42f9892feb5b7a33c6f4d6306c7464ff5b4f2 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -102,9 +102,9 @@ void DrawGradientRect(const gfx::Rect& rect, SkColor start_color,
     points[1].iset(rect.width() + 1, 0);
   else
     points[1].iset(0, rect.height() + 1);
-  SkPaint paint;
-  paint.setShader(SkGradientShader::MakeLinear(points, colors, NULL, 2,
-                                               SkShader::kClamp_TileMode));
+  CdlPaint paint;
+  paint.setShader(WrapSkShader(SkGradientShader::MakeLinear(
+      points, colors, NULL, 2, SkShader::kClamp_TileMode)));
   canvas->DrawRect(rect, paint);
 }
 
@@ -210,9 +210,9 @@ void ColorChooserView::HueView::OnPaint(gfx::Canvas* canvas) {
       SkIntToScalar(width()) - SK_ScalarHalf,
       SkIntToScalar(level_ - kHueIndicatorSize));
 
-  SkPaint indicator_paint;
+  CdlPaint indicator_paint;
   indicator_paint.setColor(SK_ColorBLACK);
-  indicator_paint.setStyle(SkPaint::kFill_Style);
+  indicator_paint.setStyle(CdlPaint::kFill_Style);
   canvas->DrawPath(left_indicator_path, indicator_paint);
   canvas->DrawPath(right_indicator_path, indicator_paint);
 }