Update more tests to use the GrDirectContext/GrRecordingContext pair

This should be the last batch of tests. All the remaining uses of
GrContext should be resolved when SkImage no longer requires a context.

Change-Id: I47eeb3b74c28f483c20d9bec4daecbdb6d2cb982
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305541
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp
index c706e8e..16ba73c 100644
--- a/tests/GrCCPRTest.cpp
+++ b/tests/GrCCPRTest.cpp
@@ -65,7 +65,7 @@
                       {kCanvasSize, kCanvasSize}))
             , fDoStroke(DoStroke::kYes == doStroke) {
         if (!fCCPR) {
-            ERRORF(reporter, "ccpr not enabled in GrContext for ccpr tests");
+            ERRORF(reporter, "ccpr not enabled in GrDirectContext for ccpr tests");
         }
         if (!fRTC) {
             ERRORF(reporter, "failed to create GrRenderTargetContext for ccpr tests");
@@ -550,7 +550,7 @@
 };
 DEF_CCPR_TEST(CCPR_cache_mostlyVisible)
 
-// Ensures GrContext::performDeferredCleanup works.
+// Ensures GrDirectContext::performDeferredCleanup works.
 class CCPR_cache_deferredCleanup : public CCPRCacheTest {
     void onRun(skiatest::Reporter* reporter, CCPRPathDrawer& ccpr,
                const RecordLastMockAtlasIDs& atlasIDRecorder) override {