Revert of Rename enums in GrContextFactory to remove "GL"

tests/SkpSkGrTest.cpp

Index: tests/SkpSkGrTest.cpp
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index e5553a9a75171f37d649e7f4b07bf75fa633bab6..4469d4fb57c9b3b7acebf1069a2cee1bde315f81 100644
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -253,11 +253,11 @@
     return pngName;
 }
 
-typedef GrContextFactory::ContextType ContextType;
+typedef GrContextFactory::GLContextType GLContextType;
 #ifdef SK_BUILD_FOR_WIN
-static const ContextType kAngle = GrContextFactory::kANGLE_ContextType;
+static const GLContextType kAngle = GrContextFactory::kANGLE_GLContextType;
 #else
-static const ContextType kNative = GrContextFactory::kNativeGL_ContextType;
+static const GLContextType kNative = GrContextFactory::kNative_GLContextType;
 #endif
 
 static int similarBits(const SkBitmap& gr, const SkBitmap& sk) {