Cleaned up CanvasCompare tests.

Change-Id: I93b2f73283e3ab2b8679bf36f29c7bd6cb74c6bf
2 files changed