Turn ContextInfos returned by GrContextFactory into structs.

tests/ImageNewShaderTest.cpp

Index: tests/ImageNewShaderTest.cpp
diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp
index 164f11898ea804be4d476cc0e16f06740f34f6d7..a92a4be4d56aee4e78da36b440f0e86fa90db01a 100644
--- a/tests/ImageNewShaderTest.cpp
+++ b/tests/ImageNewShaderTest.cpp
@@ -141,13 +141,13 @@ void rasterToGpu(skiatest::Reporter* reporter, GrContext* context) {
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageNewShader_GPU, reporter, ctxInfo) {
     //  GPU -> GPU
-    gpuToGpu(reporter, ctxInfo.fGrContext);
+    gpuToGpu(reporter, ctxInfo.grContext());
 
     //  GPU -> RASTER
-    gpuToRaster(reporter, ctxInfo.fGrContext);
+    gpuToRaster(reporter, ctxInfo.grContext());
 
     //  RASTER -> GPU
-    rasterToGpu(reporter, ctxInfo.fGrContext);
+    rasterToGpu(reporter, ctxInfo.grContext());
 }
 
 #endif