Cruft leftover from GrSurfaceContext hierarchy v1/v2 split

Non-substantive changes that didn't fit any earlier CL in the chain.

Bug: skia:11837
Change-Id: Ic9b7c05c014b03ab5b30532098fb8cd2da846d9a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/428958
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index 5664a2c..59b0418 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -60,11 +60,11 @@
             continue;
         }
 
-        auto sContext = dContext->priv().makeSC(std::move(fpView), info.colorInfo());
-        REPORTER_ASSERT(reporter, sContext);
+        auto sc = dContext->priv().makeSC(std::move(fpView), info.colorInfo());
+        REPORTER_ASSERT(reporter, sc);
 
         GrPixmap readPixmap(info, readBuffer.begin(), info.minRowBytes());
-        bool result = sContext->readPixels(dContext, readPixmap, {0, 0});
+        bool result = sc->readPixels(dContext, readPixmap, {0, 0});
         REPORTER_ASSERT(reporter, result);
         REPORTER_ASSERT(reporter,
                         !memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));