Revert of Rename enums in GrContextFactory to remove "GL"

tests/VkUploadPixelsTests.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.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
 #include "SkTypes.h"
@@ skipping 119 matching lines @@
         tex1->unref();
     } else {
         REPORTER_ASSERT(reporter, !canCreate);
     }
 }
 
 DEF_GPUTEST(VkUploadPixelsTests, reporter, factory) {
     GrContextOptions opts;
     opts.fSuppressPrints = true;
     GrContextFactory debugFactory(opts);
-    for (int type = 0; type < GrContextFactory::kContextTypeCnt; ++type) {
-        if (static_cast<GrContextFactory::ContextType>(type) !=
-            GrContextFactory::kNativeGL_ContextType) {
+    for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
+        if (static_cast<GrContextFactory::GLContextType>(type) !=
+            GrContextFactory::kNative_GLContextType) {
             continue;
         }
-        GrContext* context = debugFactory.get(static_cast<GrContextFactory::ContextType>(type));
+        GrContext* context = debugFactory.get(static_cast<GrContextFactory::GLContextType>(type));
         if (context) {
             basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, false, false);
             basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, true, false);
             basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, false, true);
             basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, true, true);
             basic_texture_test(reporter, context, kBGRA_8888_GrPixelConfig, false, false);
             basic_texture_test(reporter, context, kBGRA_8888_GrPixelConfig, true, false);
             basic_texture_test(reporter, context, kBGRA_8888_GrPixelConfig, false, true);
             basic_texture_test(reporter, context, kBGRA_8888_GrPixelConfig, true, true);
         }
 
     }
 }
 
 #endif