Turn ContextInfos returned by GrContextFactory into structs.

tests/GrContextFactoryTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 57 matching lines @@
             }
         }
     }
 }
 
 DEF_GPUTEST(GrContextFactory_abandon, reporter, /*factory*/) {
     GrContextFactory testFactory;
     for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) {
         GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i;
         ContextInfo info1 = testFactory.getContextInfo(ctxType);
-        if (!info1.fGrContext) {
+        if (!info1.grContext()) {
             continue;
         }
         if (GrContextFactory::ContextTypeBackend(ctxType) == kOpenGL_GrBackend) {
-            REPORTER_ASSERT(reporter, info1.fGLContext);
+            REPORTER_ASSERT(reporter, info1.glContext());
         }
          // Ref for comparison. The API does not explicitly say that this stays alive.
-        info1.fGrContext->ref();
+        info1.grContext()->ref();
         testFactory.abandonContexts();
 
         // Test that we get different context after abandon.
         ContextInfo info2 = testFactory.getContextInfo(ctxType);
-        REPORTER_ASSERT(reporter, info2.fGrContext);
+        REPORTER_ASSERT(reporter, info2.grContext());
         if (GrContextFactory::ContextTypeBackend(ctxType) == kOpenGL_GrBackend) {
-            REPORTER_ASSERT(reporter, info2.fGLContext);
+            REPORTER_ASSERT(reporter, info2.glContext());
         }
-        REPORTER_ASSERT(reporter, info1.fGrContext != info2.fGrContext);
-        // fGLContext should also change, but it also could get the same address.
+        REPORTER_ASSERT(reporter, info1.grContext() != info2.grContext());
+        // The GL context should also change, but it also could get the same address.
 
-        info1.fGrContext->unref();
+        info1.grContext()->unref();
     }
 }
 
 #endif