Turn ContextInfos returned by GrContextFactory into structs.

tests/EGLImageTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
@@ skipping 64 matching lines @@
     copyDesc.fWidth = externalTexture->width();
     copyDesc.fHeight = externalTexture->height();
     copyDesc.fFlags = kRenderTarget_GrSurfaceFlag;
     SkAutoTUnref<GrTexture> copy(context->textureProvider()->createTexture(
             copyDesc, SkBudgeted::kYes));
     context->copySurface(copy, externalTexture);
     test_read_pixels(reporter, context, copy, expectedPixelValues);
 }
 
 DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) {
-    GrContext* context0 = ctxInfo.fGrContext;
-    sk_gpu_test::GLTestContext* glCtx0 = ctxInfo.fGLContext;
+    GrContext* context0 = ctxInfo.grContext();
+    sk_gpu_test::GLTestContext* glCtx0 = ctxInfo.glContext();
 
     // Try to create a second GL context and then check if the contexts have necessary
     // extensions to run this test.
 
     if (kGLES_GrGLStandard != glCtx0->gl()->fStandard) {
         return;
     }
     GrGLGpu* gpu0 = static_cast<GrGLGpu*>(context0->getGpu());
     if (!gpu0->glCaps().glslCaps()->externalTextureSupport()) {
         return;
@@ skipping 105 matching lines @@
     test_read_pixels(reporter, context0, externalTextureObj, pixels.get());
 
     test_write_pixels(reporter, context0, externalTextureObj);
 
     test_copy_surface(reporter, context0, externalTextureObj, pixels.get());
 
     cleanup(glCtx0, externalTexture.fID, glCtx1, context1, backendTexture1, image);
 }
 
 #endif