Revert "Revert "clean up after big refactor of SkColorFilter --> ...Base""

This reverts commit a693a4704ed4dfb06ac56ce915247fa753b24ca7.

Change-Id: I7f3a443ad654b3f7413c99b51d9b20b32361108a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298981
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
6 files changed