85 files changed, 36 insertions, 62 deletions

diff --git a/base/data/vectorcanvastest/basicdrawing/00_pc_clean.png b/skia/ext/data/vectorcanvastest/basicdrawing/00_pc_clean.png
index a5435f2..a5435f2 100644
--- a/base/data/vectorcanvastest/basicdrawing/00_pc_clean.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/00_pc_clean.png
diff --git a/base/data/vectorcanvastest/basicdrawing/00_vc_clean.png b/skia/ext/data/vectorcanvastest/basicdrawing/00_vc_clean.png
index a5435f2..a5435f2 100644
--- a/base/data/vectorcanvastest/basicdrawing/00_vc_clean.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/00_vc_clean.png
diff --git a/base/data/vectorcanvastest/basicdrawing/01_pc_drawargb.png b/skia/ext/data/vectorcanvastest/basicdrawing/01_pc_drawargb.png
index a5435f2..a5435f2 100644
--- a/base/data/vectorcanvastest/basicdrawing/01_pc_drawargb.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/01_pc_drawargb.png
diff --git a/base/data/vectorcanvastest/basicdrawing/01_vc_drawargb.png b/skia/ext/data/vectorcanvastest/basicdrawing/01_vc_drawargb.png
index a5435f2..a5435f2 100644
--- a/base/data/vectorcanvastest/basicdrawing/01_vc_drawargb.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/01_vc_drawargb.png
diff --git a/base/data/vectorcanvastest/basicdrawing/02_pc_drawline_black.png b/skia/ext/data/vectorcanvastest/basicdrawing/02_pc_drawline_black.png
index c21fdf1..c21fdf1 100644
--- a/base/data/vectorcanvastest/basicdrawing/02_pc_drawline_black.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/02_pc_drawline_black.png
diff --git a/base/data/vectorcanvastest/basicdrawing/02_vc_drawline_black.png b/skia/ext/data/vectorcanvastest/basicdrawing/02_vc_drawline_black.png
index c21fdf1..c21fdf1 100644
--- a/base/data/vectorcanvastest/basicdrawing/02_vc_drawline_black.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/02_vc_drawline_black.png
diff --git a/base/data/vectorcanvastest/basicdrawing/03_pc_drawrect_green.png b/skia/ext/data/vectorcanvastest/basicdrawing/03_pc_drawrect_green.png
index dfc46a8..dfc46a8 100644
--- a/base/data/vectorcanvastest/basicdrawing/03_pc_drawrect_green.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/03_pc_drawrect_green.png
diff --git a/base/data/vectorcanvastest/basicdrawing/03_vc_drawrect_green.png b/skia/ext/data/vectorcanvastest/basicdrawing/03_vc_drawrect_green.png
index dfc46a8..dfc46a8 100644
--- a/base/data/vectorcanvastest/basicdrawing/03_vc_drawrect_green.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/03_vc_drawrect_green.png
diff --git a/base/data/vectorcanvastest/basicdrawing/04_pc_drawrect_noop.png b/skia/ext/data/vectorcanvastest/basicdrawing/04_pc_drawrect_noop.png
index dfc46a8..dfc46a8 100644
--- a/base/data/vectorcanvastest/basicdrawing/04_pc_drawrect_noop.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/04_pc_drawrect_noop.png
diff --git a/base/data/vectorcanvastest/basicdrawing/04_vc_drawrect_noop.png b/skia/ext/data/vectorcanvastest/basicdrawing/04_vc_drawrect_noop.png
index dfc46a8..dfc46a8 100644
--- a/base/data/vectorcanvastest/basicdrawing/04_vc_drawrect_noop.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/04_vc_drawrect_noop.png
diff --git a/base/data/vectorcanvastest/basicdrawing/05_pc_drawrect_noop.png b/skia/ext/data/vectorcanvastest/basicdrawing/05_pc_drawrect_noop.png
index 69cc6dc..69cc6dc 100644
--- a/base/data/vectorcanvastest/basicdrawing/05_pc_drawrect_noop.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/05_pc_drawrect_noop.png
diff --git a/base/data/vectorcanvastest/basicdrawing/05_vc_drawrect_noop.png b/skia/ext/data/vectorcanvastest/basicdrawing/05_vc_drawrect_noop.png
index 69cc6dc..69cc6dc 100644
--- a/base/data/vectorcanvastest/basicdrawing/05_vc_drawrect_noop.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/05_vc_drawrect_noop.png
diff --git a/base/data/vectorcanvastest/basicdrawing/06_pc_drawpaint_black.png b/skia/ext/data/vectorcanvastest/basicdrawing/06_pc_drawpaint_black.png
index 9cbff6e..9cbff6e 100644
--- a/base/data/vectorcanvastest/basicdrawing/06_pc_drawpaint_black.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/06_pc_drawpaint_black.png
diff --git a/base/data/vectorcanvastest/basicdrawing/06_vc_drawpaint_black.png b/skia/ext/data/vectorcanvastest/basicdrawing/06_vc_drawpaint_black.png
index 9cbff6e..9cbff6e 100644
--- a/base/data/vectorcanvastest/basicdrawing/06_vc_drawpaint_black.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/06_vc_drawpaint_black.png
diff --git a/base/data/vectorcanvastest/basicdrawing/07_pc_drawline_left_to_right.png b/skia/ext/data/vectorcanvastest/basicdrawing/07_pc_drawline_left_to_right.png
index bbdfc36..bbdfc36 100644
--- a/base/data/vectorcanvastest/basicdrawing/07_pc_drawline_left_to_right.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/07_pc_drawline_left_to_right.png
diff --git a/base/data/vectorcanvastest/basicdrawing/07_vc_drawline_left_to_right.png b/skia/ext/data/vectorcanvastest/basicdrawing/07_vc_drawline_left_to_right.png
index bbdfc36..bbdfc36 100644
--- a/base/data/vectorcanvastest/basicdrawing/07_vc_drawline_left_to_right.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/07_vc_drawline_left_to_right.png
diff --git a/base/data/vectorcanvastest/basicdrawing/08_pc_drawline_red.png b/skia/ext/data/vectorcanvastest/basicdrawing/08_pc_drawline_red.png
index 9dc35f0..9dc35f0 100644
--- a/base/data/vectorcanvastest/basicdrawing/08_pc_drawline_red.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/08_pc_drawline_red.png
diff --git a/base/data/vectorcanvastest/basicdrawing/08_vc_drawline_red.png b/skia/ext/data/vectorcanvastest/basicdrawing/08_vc_drawline_red.png
index 9dc35f0..9dc35f0 100644
--- a/base/data/vectorcanvastest/basicdrawing/08_vc_drawline_red.png
+++ b/skia/ext/data/vectorcanvastest/basicdrawing/08_vc_drawline_red.png
diff --git a/base/data/vectorcanvastest/bitmaps/00_pc_opaque.png b/skia/ext/data/vectorcanvastest/bitmaps/00_pc_opaque.png
index 812b1ca..812b1ca 100644
--- a/base/data/vectorcanvastest/bitmaps/00_pc_opaque.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/00_pc_opaque.png
diff --git a/base/data/vectorcanvastest/bitmaps/00_vc_opaque.png b/skia/ext/data/vectorcanvastest/bitmaps/00_vc_opaque.png
index 812b1ca..812b1ca 100644
--- a/base/data/vectorcanvastest/bitmaps/00_vc_opaque.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/00_vc_opaque.png
diff --git a/base/data/vectorcanvastest/bitmaps/01_pc_alpha.png b/skia/ext/data/vectorcanvastest/bitmaps/01_pc_alpha.png
index 1d1342b..1d1342b 100644
--- a/base/data/vectorcanvastest/bitmaps/01_pc_alpha.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/01_pc_alpha.png
diff --git a/base/data/vectorcanvastest/bitmaps/01_vc_alpha.png b/skia/ext/data/vectorcanvastest/bitmaps/01_vc_alpha.png
index 1d1342b..1d1342b 100644
--- a/base/data/vectorcanvastest/bitmaps/01_vc_alpha.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/01_vc_alpha.png
diff --git a/base/data/vectorcanvastest/bitmaps/bitmap_alpha.png b/skia/ext/data/vectorcanvastest/bitmaps/bitmap_alpha.png
index a19d09d..a19d09d 100644
--- a/base/data/vectorcanvastest/bitmaps/bitmap_alpha.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/bitmap_alpha.png
diff --git a/base/data/vectorcanvastest/bitmaps/bitmap_opaque.png b/skia/ext/data/vectorcanvastest/bitmaps/bitmap_opaque.png
index 3560d27..3560d27 100644
--- a/base/data/vectorcanvastest/bitmaps/bitmap_opaque.png
+++ b/skia/ext/data/vectorcanvastest/bitmaps/bitmap_opaque.png
diff --git a/base/data/vectorcanvastest/circles/00_pc_circle_stroke.png b/skia/ext/data/vectorcanvastest/circles/00_pc_circle_stroke.png
index 896631b..896631b 100644
--- a/base/data/vectorcanvastest/circles/00_pc_circle_stroke.png
+++ b/skia/ext/data/vectorcanvastest/circles/00_pc_circle_stroke.png
diff --git a/base/data/vectorcanvastest/circles/00_vc_circle_stroke.png b/skia/ext/data/vectorcanvastest/circles/00_vc_circle_stroke.png
index c265be3..c265be3 100644
--- a/base/data/vectorcanvastest/circles/00_vc_circle_stroke.png
+++ b/skia/ext/data/vectorcanvastest/circles/00_vc_circle_stroke.png
diff --git a/base/data/vectorcanvastest/circles/01_pc_circle_fill.png b/skia/ext/data/vectorcanvastest/circles/01_pc_circle_fill.png
index 92b647d..92b647d 100644
--- a/base/data/vectorcanvastest/circles/01_pc_circle_fill.png
+++ b/skia/ext/data/vectorcanvastest/circles/01_pc_circle_fill.png
diff --git a/base/data/vectorcanvastest/circles/01_vc_circle_fill.png b/skia/ext/data/vectorcanvastest/circles/01_vc_circle_fill.png
index f5270ce..f5270ce 100644
--- a/base/data/vectorcanvastest/circles/01_vc_circle_fill.png
+++ b/skia/ext/data/vectorcanvastest/circles/01_vc_circle_fill.png
diff --git a/base/data/vectorcanvastest/circles/02_pc_circle_over_strike.png b/skia/ext/data/vectorcanvastest/circles/02_pc_circle_over_strike.png
index 64ae06a..64ae06a 100644
--- a/base/data/vectorcanvastest/circles/02_pc_circle_over_strike.png
+++ b/skia/ext/data/vectorcanvastest/circles/02_pc_circle_over_strike.png
diff --git a/base/data/vectorcanvastest/circles/02_vc_circle_over_strike.png b/skia/ext/data/vectorcanvastest/circles/02_vc_circle_over_strike.png
index 4d3d1b0..4d3d1b0 100644
--- a/base/data/vectorcanvastest/circles/02_vc_circle_over_strike.png
+++ b/skia/ext/data/vectorcanvastest/circles/02_vc_circle_over_strike.png
diff --git a/base/data/vectorcanvastest/circles/03_pc_circle_stroke_and_fill.png b/skia/ext/data/vectorcanvastest/circles/03_pc_circle_stroke_and_fill.png
index 6aeeb49..6aeeb49 100644
--- a/base/data/vectorcanvastest/circles/03_pc_circle_stroke_and_fill.png
+++ b/skia/ext/data/vectorcanvastest/circles/03_pc_circle_stroke_and_fill.png
diff --git a/base/data/vectorcanvastest/circles/03_vc_circle_stroke_and_fill.png b/skia/ext/data/vectorcanvastest/circles/03_vc_circle_stroke_and_fill.png
index f073a3e..f073a3e 100644
--- a/base/data/vectorcanvastest/circles/03_vc_circle_stroke_and_fill.png
+++ b/skia/ext/data/vectorcanvastest/circles/03_vc_circle_stroke_and_fill.png
diff --git a/base/data/vectorcanvastest/circles/04_pc_mixed_stroke.png b/skia/ext/data/vectorcanvastest/circles/04_pc_mixed_stroke.png
index e4a044f..e4a044f 100644
--- a/base/data/vectorcanvastest/circles/04_pc_mixed_stroke.png
+++ b/skia/ext/data/vectorcanvastest/circles/04_pc_mixed_stroke.png
diff --git a/base/data/vectorcanvastest/circles/04_vc_mixed_stroke.png b/skia/ext/data/vectorcanvastest/circles/04_vc_mixed_stroke.png
index efd9e3a..efd9e3a 100644
--- a/base/data/vectorcanvastest/circles/04_vc_mixed_stroke.png
+++ b/skia/ext/data/vectorcanvastest/circles/04_vc_mixed_stroke.png
diff --git a/base/data/vectorcanvastest/clippingclean/00_pc_clipped.png b/skia/ext/data/vectorcanvastest/clippingclean/00_pc_clipped.png
index 14ff949..14ff949 100644
--- a/base/data/vectorcanvastest/clippingclean/00_pc_clipped.png
+++ b/skia/ext/data/vectorcanvastest/clippingclean/00_pc_clipped.png
diff --git a/base/data/vectorcanvastest/clippingclean/00_vc_clipped.png b/skia/ext/data/vectorcanvastest/clippingclean/00_vc_clipped.png
index 14ff949..14ff949 100644
--- a/base/data/vectorcanvastest/clippingclean/00_vc_clipped.png
+++ b/skia/ext/data/vectorcanvastest/clippingclean/00_vc_clipped.png
diff --git a/base/data/vectorcanvastest/clippingclean/01_pc_unclipped.png b/skia/ext/data/vectorcanvastest/clippingclean/01_pc_unclipped.png
index 436f9a5..436f9a5 100644
--- a/base/data/vectorcanvastest/clippingclean/01_pc_unclipped.png
+++ b/skia/ext/data/vectorcanvastest/clippingclean/01_pc_unclipped.png
diff --git a/base/data/vectorcanvastest/clippingclean/01_vc_unclipped.png b/skia/ext/data/vectorcanvastest/clippingclean/01_vc_unclipped.png
index 436f9a5..436f9a5 100644
--- a/base/data/vectorcanvastest/clippingclean/01_vc_unclipped.png
+++ b/skia/ext/data/vectorcanvastest/clippingclean/01_vc_unclipped.png
diff --git a/base/data/vectorcanvastest/clippingcombined/00_pc_combined.png b/skia/ext/data/vectorcanvastest/clippingcombined/00_pc_combined.png
index 14ff949..14ff949 100644
--- a/base/data/vectorcanvastest/clippingcombined/00_pc_combined.png
+++ b/skia/ext/data/vectorcanvastest/clippingcombined/00_pc_combined.png
diff --git a/base/data/vectorcanvastest/clippingcombined/00_vc_combined.png b/skia/ext/data/vectorcanvastest/clippingcombined/00_vc_combined.png
index 14ff949..14ff949 100644
--- a/base/data/vectorcanvastest/clippingcombined/00_vc_combined.png
+++ b/skia/ext/data/vectorcanvastest/clippingcombined/00_vc_combined.png
diff --git a/base/data/vectorcanvastest/clippingintersect/00_pc_intersect.png b/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png
index 89df4fb..89df4fb 100644
--- a/base/data/vectorcanvastest/clippingintersect/00_pc_intersect.png
+++ b/skia/ext/data/vectorcanvastest/clippingintersect/00_pc_intersect.png
diff --git a/base/data/vectorcanvastest/clippingintersect/00_vc_intersect.png b/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png
index 89df4fb..89df4fb 100644
--- a/base/data/vectorcanvastest/clippingintersect/00_vc_intersect.png
+++ b/skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png
diff --git a/base/data/vectorcanvastest/clippingpath/00_pc_path.png b/skia/ext/data/vectorcanvastest/clippingpath/00_pc_path.png
index 8807649..8807649 100644
--- a/base/data/vectorcanvastest/clippingpath/00_pc_path.png
+++ b/skia/ext/data/vectorcanvastest/clippingpath/00_pc_path.png
diff --git a/base/data/vectorcanvastest/clippingpath/00_vc_path.png b/skia/ext/data/vectorcanvastest/clippingpath/00_vc_path.png
index 8807649..8807649 100644
--- a/base/data/vectorcanvastest/clippingpath/00_vc_path.png
+++ b/skia/ext/data/vectorcanvastest/clippingpath/00_vc_path.png
diff --git a/base/data/vectorcanvastest/clippingrect/00_pc_rect.png b/skia/ext/data/vectorcanvastest/clippingrect/00_pc_rect.png
index 9c365e1..9c365e1 100644
--- a/base/data/vectorcanvastest/clippingrect/00_pc_rect.png
+++ b/skia/ext/data/vectorcanvastest/clippingrect/00_pc_rect.png
diff --git a/base/data/vectorcanvastest/clippingrect/00_vc_rect.png b/skia/ext/data/vectorcanvastest/clippingrect/00_vc_rect.png
index 9c365e1..9c365e1 100644
--- a/base/data/vectorcanvastest/clippingrect/00_vc_rect.png
+++ b/skia/ext/data/vectorcanvastest/clippingrect/00_vc_rect.png
diff --git a/base/data/vectorcanvastest/diagonallines/00_pc_nw-se.png b/skia/ext/data/vectorcanvastest/diagonallines/00_pc_nw-se.png
index 5736c35..5736c35 100644
--- a/base/data/vectorcanvastest/diagonallines/00_pc_nw-se.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/00_pc_nw-se.png
diff --git a/base/data/vectorcanvastest/diagonallines/00_vc_nw-se.png b/skia/ext/data/vectorcanvastest/diagonallines/00_vc_nw-se.png
index 5736c35..5736c35 100644
--- a/base/data/vectorcanvastest/diagonallines/00_vc_nw-se.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/00_vc_nw-se.png
diff --git a/base/data/vectorcanvastest/diagonallines/01_pc_sw-ne.png b/skia/ext/data/vectorcanvastest/diagonallines/01_pc_sw-ne.png
index bfffd8a..bfffd8a 100644
--- a/base/data/vectorcanvastest/diagonallines/01_pc_sw-ne.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/01_pc_sw-ne.png
diff --git a/base/data/vectorcanvastest/diagonallines/01_vc_sw-ne.png b/skia/ext/data/vectorcanvastest/diagonallines/01_vc_sw-ne.png
index ae6b753..ae6b753 100644
--- a/base/data/vectorcanvastest/diagonallines/01_vc_sw-ne.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/01_vc_sw-ne.png
diff --git a/base/data/vectorcanvastest/diagonallines/02_pc_ne-sw.png b/skia/ext/data/vectorcanvastest/diagonallines/02_pc_ne-sw.png
index 75acdad..75acdad 100644
--- a/base/data/vectorcanvastest/diagonallines/02_pc_ne-sw.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/02_pc_ne-sw.png
diff --git a/base/data/vectorcanvastest/diagonallines/02_vc_ne-sw.png b/skia/ext/data/vectorcanvastest/diagonallines/02_vc_ne-sw.png
index 86a6799..86a6799 100644
--- a/base/data/vectorcanvastest/diagonallines/02_vc_ne-sw.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/02_vc_ne-sw.png
diff --git a/base/data/vectorcanvastest/diagonallines/03_pc_se-nw.png b/skia/ext/data/vectorcanvastest/diagonallines/03_pc_se-nw.png
index 50502cc..50502cc 100644
--- a/base/data/vectorcanvastest/diagonallines/03_pc_se-nw.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/03_pc_se-nw.png
diff --git a/base/data/vectorcanvastest/diagonallines/03_vc_se-nw.png b/skia/ext/data/vectorcanvastest/diagonallines/03_vc_se-nw.png
index 362f6e7..362f6e7 100644
--- a/base/data/vectorcanvastest/diagonallines/03_vc_se-nw.png
+++ b/skia/ext/data/vectorcanvastest/diagonallines/03_vc_se-nw.png
diff --git a/base/data/vectorcanvastest/lineorientation/00_pc_horizontal.png b/skia/ext/data/vectorcanvastest/lineorientation/00_pc_horizontal.png
index 7bcd998..7bcd998 100644
--- a/base/data/vectorcanvastest/lineorientation/00_pc_horizontal.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/00_pc_horizontal.png
diff --git a/base/data/vectorcanvastest/lineorientation/00_vc_horizontal.png b/skia/ext/data/vectorcanvastest/lineorientation/00_vc_horizontal.png
index 46c9b0a..46c9b0a 100644
--- a/base/data/vectorcanvastest/lineorientation/00_vc_horizontal.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/00_vc_horizontal.png
diff --git a/base/data/vectorcanvastest/lineorientation/01_pc_vertical.png b/skia/ext/data/vectorcanvastest/lineorientation/01_pc_vertical.png
index 09f41db..09f41db 100644
--- a/base/data/vectorcanvastest/lineorientation/01_pc_vertical.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/01_pc_vertical.png
diff --git a/base/data/vectorcanvastest/lineorientation/01_vc_vertical.png b/skia/ext/data/vectorcanvastest/lineorientation/01_vc_vertical.png
index 7f5f1f7..7f5f1f7 100644
--- a/base/data/vectorcanvastest/lineorientation/01_vc_vertical.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/01_vc_vertical.png
diff --git a/base/data/vectorcanvastest/lineorientation/02_pc_horizontal_180.png b/skia/ext/data/vectorcanvastest/lineorientation/02_pc_horizontal_180.png
index 5966df6..5966df6 100644
--- a/base/data/vectorcanvastest/lineorientation/02_pc_horizontal_180.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/02_pc_horizontal_180.png
diff --git a/base/data/vectorcanvastest/lineorientation/02_vc_horizontal_180.png b/skia/ext/data/vectorcanvastest/lineorientation/02_vc_horizontal_180.png
index e43a844..e43a844 100644
--- a/base/data/vectorcanvastest/lineorientation/02_vc_horizontal_180.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/02_vc_horizontal_180.png
diff --git a/base/data/vectorcanvastest/lineorientation/03_pc_vertical_180.png b/skia/ext/data/vectorcanvastest/lineorientation/03_pc_vertical_180.png
index 9ac4825..9ac4825 100644
--- a/base/data/vectorcanvastest/lineorientation/03_pc_vertical_180.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/03_pc_vertical_180.png
diff --git a/base/data/vectorcanvastest/lineorientation/03_vc_vertical_180.png b/skia/ext/data/vectorcanvastest/lineorientation/03_vc_vertical_180.png
index d9e033a..d9e033a 100644
--- a/base/data/vectorcanvastest/lineorientation/03_vc_vertical_180.png
+++ b/skia/ext/data/vectorcanvastest/lineorientation/03_vc_vertical_180.png
diff --git a/base/data/vectorcanvastest/matrix/00_pc_translate1.png b/skia/ext/data/vectorcanvastest/matrix/00_pc_translate1.png
index fe27cb3..fe27cb3 100644
--- a/base/data/vectorcanvastest/matrix/00_pc_translate1.png
+++ b/skia/ext/data/vectorcanvastest/matrix/00_pc_translate1.png
diff --git a/base/data/vectorcanvastest/matrix/00_vc_translate1.png b/skia/ext/data/vectorcanvastest/matrix/00_vc_translate1.png
index fe27cb3..fe27cb3 100644
--- a/base/data/vectorcanvastest/matrix/00_vc_translate1.png
+++ b/skia/ext/data/vectorcanvastest/matrix/00_vc_translate1.png
diff --git a/base/data/vectorcanvastest/matrix/01_pc_translate2.png b/skia/ext/data/vectorcanvastest/matrix/01_pc_translate2.png
index 406bf57..406bf57 100644
--- a/base/data/vectorcanvastest/matrix/01_pc_translate2.png
+++ b/skia/ext/data/vectorcanvastest/matrix/01_pc_translate2.png
diff --git a/base/data/vectorcanvastest/matrix/01_vc_translate2.png b/skia/ext/data/vectorcanvastest/matrix/01_vc_translate2.png
index 406bf57..406bf57 100644
--- a/base/data/vectorcanvastest/matrix/01_vc_translate2.png
+++ b/skia/ext/data/vectorcanvastest/matrix/01_vc_translate2.png
diff --git a/base/data/vectorcanvastest/matrix/02_pc_scale.png b/skia/ext/data/vectorcanvastest/matrix/02_pc_scale.png
index 9e94fb0..9e94fb0 100644
--- a/base/data/vectorcanvastest/matrix/02_pc_scale.png
+++ b/skia/ext/data/vectorcanvastest/matrix/02_pc_scale.png
diff --git a/base/data/vectorcanvastest/matrix/02_vc_scale.png b/skia/ext/data/vectorcanvastest/matrix/02_vc_scale.png
index fde62aa..fde62aa 100644
--- a/base/data/vectorcanvastest/matrix/02_vc_scale.png
+++ b/skia/ext/data/vectorcanvastest/matrix/02_vc_scale.png
diff --git a/base/data/vectorcanvastest/matrix/03_pc_rotate.png b/skia/ext/data/vectorcanvastest/matrix/03_pc_rotate.png
index 7a43a2a..7a43a2a 100644
--- a/base/data/vectorcanvastest/matrix/03_pc_rotate.png
+++ b/skia/ext/data/vectorcanvastest/matrix/03_pc_rotate.png
diff --git a/base/data/vectorcanvastest/matrix/03_vc_rotate.png b/skia/ext/data/vectorcanvastest/matrix/03_vc_rotate.png
index 7a22b7f..7a22b7f 100644
--- a/base/data/vectorcanvastest/matrix/03_vc_rotate.png
+++ b/skia/ext/data/vectorcanvastest/matrix/03_vc_rotate.png
diff --git a/base/data/vectorcanvastest/patheffects/00_pc_dash_line.png b/skia/ext/data/vectorcanvastest/patheffects/00_pc_dash_line.png
index e08d3e2..e08d3e2 100644
--- a/base/data/vectorcanvastest/patheffects/00_pc_dash_line.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/00_pc_dash_line.png
diff --git a/base/data/vectorcanvastest/patheffects/00_vc_dash_line.png b/skia/ext/data/vectorcanvastest/patheffects/00_vc_dash_line.png
index e08d3e2..e08d3e2 100644
--- a/base/data/vectorcanvastest/patheffects/00_vc_dash_line.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/00_vc_dash_line.png
diff --git a/base/data/vectorcanvastest/patheffects/01_pc_dash_path.png b/skia/ext/data/vectorcanvastest/patheffects/01_pc_dash_path.png
index 3a301354..3a301354 100644
--- a/base/data/vectorcanvastest/patheffects/01_pc_dash_path.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/01_pc_dash_path.png
diff --git a/base/data/vectorcanvastest/patheffects/01_vc_dash_path.png b/skia/ext/data/vectorcanvastest/patheffects/01_vc_dash_path.png
index 7868b9a..7868b9a 100644
--- a/base/data/vectorcanvastest/patheffects/01_vc_dash_path.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/01_vc_dash_path.png
diff --git a/base/data/vectorcanvastest/patheffects/02_pc_dash_rect.png b/skia/ext/data/vectorcanvastest/patheffects/02_pc_dash_rect.png
index 04f2ceb..04f2ceb 100644
--- a/base/data/vectorcanvastest/patheffects/02_pc_dash_rect.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/02_pc_dash_rect.png
diff --git a/base/data/vectorcanvastest/patheffects/02_vc_dash_rect.png b/skia/ext/data/vectorcanvastest/patheffects/02_vc_dash_rect.png
index 5344eee..5344eee 100644
--- a/base/data/vectorcanvastest/patheffects/02_vc_dash_rect.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/02_vc_dash_rect.png
diff --git a/base/data/vectorcanvastest/patheffects/03_pc_circle.png b/skia/ext/data/vectorcanvastest/patheffects/03_pc_circle.png
index 4c267ef..4c267ef 100644
--- a/base/data/vectorcanvastest/patheffects/03_pc_circle.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/03_pc_circle.png
diff --git a/base/data/vectorcanvastest/patheffects/03_vc_circle.png b/skia/ext/data/vectorcanvastest/patheffects/03_vc_circle.png
index 46ac35d..46ac35d 100644
--- a/base/data/vectorcanvastest/patheffects/03_vc_circle.png
+++ b/skia/ext/data/vectorcanvastest/patheffects/03_vc_circle.png
diff --git a/base/data/vectorcanvastest/pathorientation/00_pc_drawpath_ltr.png b/skia/ext/data/vectorcanvastest/pathorientation/00_pc_drawpath_ltr.png
index cefbf87..cefbf87 100644
--- a/base/data/vectorcanvastest/pathorientation/00_pc_drawpath_ltr.png
+++ b/skia/ext/data/vectorcanvastest/pathorientation/00_pc_drawpath_ltr.png
diff --git a/base/data/vectorcanvastest/pathorientation/00_vc_drawpath_ltr.png b/skia/ext/data/vectorcanvastest/pathorientation/00_vc_drawpath_ltr.png
index cefbf87..cefbf87 100644
--- a/base/data/vectorcanvastest/pathorientation/00_vc_drawpath_ltr.png
+++ b/skia/ext/data/vectorcanvastest/pathorientation/00_vc_drawpath_ltr.png
diff --git a/base/data/vectorcanvastest/pathorientation/01_pc_drawpath_rtl.png b/skia/ext/data/vectorcanvastest/pathorientation/01_pc_drawpath_rtl.png
index 7bcd998..7bcd998 100644
--- a/base/data/vectorcanvastest/pathorientation/01_pc_drawpath_rtl.png
+++ b/skia/ext/data/vectorcanvastest/pathorientation/01_pc_drawpath_rtl.png
diff --git a/base/data/vectorcanvastest/pathorientation/01_vc_drawpath_rtl.png b/skia/ext/data/vectorcanvastest/pathorientation/01_vc_drawpath_rtl.png
index 46c9b0a..46c9b0a 100644
--- a/base/data/vectorcanvastest/pathorientation/01_vc_drawpath_rtl.png
+++ b/skia/ext/data/vectorcanvastest/pathorientation/01_vc_drawpath_rtl.png
diff --git a/base/data/vectorcanvastest/uninitialized/00_pc_empty.png b/skia/ext/data/vectorcanvastest/uninitialized/00_pc_empty.png
index dec6694..dec6694 100644
--- a/base/data/vectorcanvastest/uninitialized/00_pc_empty.png
+++ b/skia/ext/data/vectorcanvastest/uninitialized/00_pc_empty.png
diff --git a/base/data/vectorcanvastest/uninitialized/00_vc_empty.png b/skia/ext/data/vectorcanvastest/uninitialized/00_vc_empty.png
index 9cbff6e..9cbff6e 100644
--- a/base/data/vectorcanvastest/uninitialized/00_vc_empty.png
+++ b/skia/ext/data/vectorcanvastest/uninitialized/00_vc_empty.png
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 03e920f..9fbb2d7 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -25,59 +25,6 @@ namespace {
 
 const wchar_t* const kGenerateSwitch = L"vector-canvas-generate";
 
-// Base class for unit test that uses data. It initializes a directory path
-// based on the test's name.
-class DataUnitTest : public testing::Test {
- public:
-  DataUnitTest(const std::wstring& base_path) : base_path_(base_path) { }
-
- protected:
-  // Load the test's data path.
-  virtual void SetUp() {
-    const testing::TestInfo& test_info =
-        *testing::UnitTest::GetInstance()->current_test_info();
-    PathService::Get(base::DIR_SOURCE_ROOT, &test_dir_);
-    file_util::AppendToPath(&test_dir_, base_path_);
-    file_util::AppendToPath(&test_dir_, L"data");
-    file_util::AppendToPath(&test_dir_,
-        ASCIIToWide(test_info.test_case_name()));
-    file_util::AppendToPath(&test_dir_, ASCIIToWide(test_info.name()));
-
-    // Hack for a quick lowercase. We assume all the tests names are ASCII.
-    std::string tmp(WideToASCII(test_dir_));
-    for (size_t i = 0; i < tmp.size(); ++i)
-      tmp[i] = ToLowerASCII(tmp[i]);
-    test_dir_ = ASCIIToWide(tmp);
-  }
-
-  // Returns the fully qualified path of directory containing test data files.
-  const std::wstring& test_dir() const {
-    return test_dir_;
-  }
-
-  // Returns the fully qualified path of a data file.
-  std::wstring test_file(const std::wstring& filename) const {
-    // Hack for a quick lowercase. We assume all the test data file names are
-    // ASCII.
-    std::string tmp(WideToASCII(filename));
-    for (size_t i = 0; i < tmp.size(); ++i)
-      tmp[i] = ToLowerASCII(tmp[i]);
-
-    std::wstring path(test_dir());
-    file_util::AppendToPath(&path, ASCIIToWide(tmp));
-    return path;
-  }
-
- private:
-  // Path where the unit test is coming from: base, net, chrome, etc.
-  std::wstring base_path_;
-
-  // Path to directory used to contain the test data.
-  std::wstring test_dir_;
-
-  DISALLOW_EVIL_CONSTRUCTORS(DataUnitTest);
-};
-
 // Lightweight HDC management.
 class Context {
  public:
@@ -249,10 +196,8 @@ class Image {
 };
 
 // Base for tests. Capability to process an image.
-class ImageTest : public DataUnitTest {
+class ImageTest : public testing::Test {
  public:
-  typedef DataUnitTest parent;
-
   // In what state is the test running.
   enum ProcessAction {
     GENERATE,
@@ -260,21 +205,47 @@ class ImageTest : public DataUnitTest {
     NOOP,
   };
 
-  ImageTest(const std::wstring& base_path, ProcessAction default_action)
-      : parent(base_path),
-        action_(default_action) {
+  ImageTest(ProcessAction default_action)
+      : action_(default_action) {
   }
 
  protected:
   virtual void SetUp() {
-    parent::SetUp();
+    const testing::TestInfo& test_info =
+        *testing::UnitTest::GetInstance()->current_test_info();
+    PathService::Get(base::DIR_SOURCE_ROOT, &test_dir_);
+    file_util::AppendToPath(&test_dir_, L"skia");
+    file_util::AppendToPath(&test_dir_, L"ext");
+    file_util::AppendToPath(&test_dir_, L"data");
+    file_util::AppendToPath(&test_dir_,
+        ASCIIToWide(test_info.test_case_name()));
+    file_util::AppendToPath(&test_dir_, ASCIIToWide(test_info.name()));
+
+    // Hack for a quick lowercase. We assume all the tests names are ASCII.
+    std::string tmp(WideToASCII(test_dir_));
+    for (size_t i = 0; i < tmp.size(); ++i)
+      tmp[i] = ToLowerASCII(tmp[i]);
+    test_dir_ = ASCIIToWide(tmp);
 
     if (action_ == GENERATE) {
       // Make sure the directory exist.
-      file_util::CreateDirectory(test_dir());
+      file_util::CreateDirectory(test_dir_);
     }
   }
 
+  // Returns the fully qualified path of a data file.
+  std::wstring test_file(const std::wstring& filename) const {
+    // Hack for a quick lowercase. We assume all the test data file names are
+    // ASCII.
+    std::string tmp(WideToASCII(filename));
+    for (size_t i = 0; i < tmp.size(); ++i)
+      tmp[i] = ToLowerASCII(tmp[i]);
+
+    std::wstring path(test_dir_);
+    file_util::AppendToPath(&path, ASCIIToWide(tmp));
+    return path;
+  }
+
   // Compares or saves the bitmap currently loaded in the context, depending on
   // kGenerating value. Returns 0 on success or any positive value between ]0,
   // 100] on failure. The return value is the percentage of difference between
@@ -314,6 +285,9 @@ class ImageTest : public DataUnitTest {
 
   ProcessAction action_;
 
+  // Path to directory used to contain the test data.
+  std::wstring test_dir_;
+
   DISALLOW_EVIL_CONSTRUCTORS(ImageTest);
 };
 
@@ -367,7 +341,7 @@ class VectorCanvasTest : public ImageTest {
  public:
   typedef ImageTest parent;
 
-  VectorCanvasTest() : parent(L"base", CurrentMode()), compare_canvas_(true) {
+  VectorCanvasTest() : parent(CurrentMode()), compare_canvas_(true) {
   }
 
  protected: