Revert of rename sk_gpu_test::GLContext to sk_gpu_test::GLTestContext

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 "gl/GLContext.h"
 #include "SkTArray.h"
 
 namespace sk_gpu_test {
 /**
  * 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).
  */
@@ skipping 79 matching lines @@
     GrContextFactory();
 
     ~GrContextFactory();
 
     void destroyContexts();
     void abandonContexts();
 
     struct ContextInfo {
         ContextInfo()
             : fGrContext(nullptr), fGLContext(nullptr) { }
-        ContextInfo(GrContext* grContext, GLTestContext* glContext)
+        ContextInfo(GrContext* grContext, GLContext* glContext)
             : fGrContext(grContext), fGLContext(glContext) { }
         GrContext* fGrContext;
-        GLTestContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
+        GLContext* fGLContext; //! Valid until the factory destroys it via abandonContexts() or
                                //! destroyContexts().
     };
 
     /**
      * Get a context initialized with a type of GL context. It also makes the GL context current.
      */
     ContextInfo getContextInfo(GLContextType type,
                                GLContextOptions options = kNone_GLContextOptions);
     /**
      * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
      */
     GrContext* get(GLContextType type,
                    GLContextOptions options = kNone_GLContextOptions) {
         return this->getContextInfo(type, options).fGrContext;
     }
     const GrContextOptions& getGlobalOptions() const { return fGlobalOptions; }
 
 private:
     struct Context {
         GLContextType       fType;
         GLContextOptions    fOptions;
-        GLTestContext*          fGLContext;
+        GLContext*          fGLContext;
         GrContext*          fGrContext;
     };
     SkTArray<Context, true> fContexts;
     const GrContextOptions  fGlobalOptions;
 };
 }  // namespace sk_gpu_test
 #endif