Turn ContextInfos returned by GrContextFactory into structs.

tools/gpu/GrContextFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContextFactory_DEFINED
 #define GrContextFactory_DEFINED
 
 #include "GrContext.h"
 #include "GrContextOptions.h"
 
 #include "gl/GLTestContext.h"
 #include "SkTArray.h"
 
 struct GrVkBackendContext;
 
 namespace sk_gpu_test {
 
-struct ContextInfo {
+class ContextInfo {
+public:
+    GrContext* grContext() const { return fGrContext; }
+    GLTestContext* glContext() const { return fGLContext; }
+
+private:
     ContextInfo()
-        : fGrContext(nullptr), fGLContext(nullptr) { }
+            : fGrContext(nullptr), fGLContext(nullptr) { }
     ContextInfo(GrContext* grContext, GLTestContext* glContext)
-        : fGrContext(grContext), fGLContext(glContext) { }
+            : fGrContext(grContext), fGLContext(glContext) { }
     GrContext* fGrContext;
     GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
                                //! destroyContexts(). Null if context is not based on OpenGL.
+
+    friend class GrContextFactory;
 };
 
 /**
  * This is a simple class that is useful in test apps that use different
  * GrContexts backed by different types of GL contexts. It manages creating the
  * GL context and a GrContext that uses it. The GL/Gr contexts persist until the
  * factory is destroyed (though the caller can always grab a ref on the returned
  * Gr and GL contexts to make them outlive the factory).
  */
 class GrContextFactory : SkNoncopyable {
@@ skipping 99 matching lines @@
         GLTestContext*  fGLContext; //  null if non-GL
         GrContext*      fGrContext;
         bool            fAbandoned;
     };
     SkTArray<Context, true>         fContexts;
     SkAutoTDelete<GLTestContext>    fSentinelGLContext;
     const GrContextOptions          fGlobalOptions;
 };
 }  // namespace sk_gpu_test
 #endif