GitLab

This change gets rid of a no-longer-helpful scale operation on the Skia
canvas, in preparation for some rework of how vector icons are drawn.
Some other cleanup is included.

BUG=
R=bshe@chromium.org

Change-Id: I4d709aa9a743e86639ef86627d39d4e2254b5695
Reviewed-on: https://chromium-review.googlesource.com/661019Reviewed-by: Biao She <bshe@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501267}