Revert of Rename enums in GrContextFactory to remove "GL"

tests/GrContextAbandonTest.cpp

 /*
  * Copyright 2016 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
 
 #include "GrContextFactory.h"
 #include "Test.h"
 
 using sk_gpu_test::GrContextFactory;
 
 DEF_GPUTEST(GrContext_abandonContext, reporter, /*factory*/) {
     for (int testType = 0; testType < 6; ++testType) {
-        for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) {
-            GrContextFactory testFactory;
-            GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i;
-            GrContextFactory::ContextInfo info = testFactory.getContextInfo(ctxType);
+    for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) {
+        GrContextFactory testFactory;
+        GrContextFactory::GLContextType ctxType = (GrContextFactory::GLContextType) i;
+        GrContextFactory::ContextInfo info = testFactory.getContextInfo(ctxType);
             if (GrContext* context = info.fGrContext) {
                 switch (testType) {
                     case 0:
                         context->abandonContext();
                         break;
                     case 1:
                         context->releaseResourcesAndAbandonContext();
                         break;
                     case 2:
                         context->abandonContext();
@@ skipping 11 matching lines @@
                         context->releaseResourcesAndAbandonContext();
                         context->releaseResourcesAndAbandonContext();
                         break;
                 }
             }
         }
     }
 }
 
 #endif