Revert of Rename enums in GrContextFactory to remove "GL"

tools/kilobench/kilobench.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 "GrCaps.h"
 #include "GrContextFactory.h"
 #include "Benchmark.h"
@@ skipping 157 matching lines @@
 
     bool needsFrameTiming(int* maxFrameLag) const {
         if (!fGL->getMaxGpuFrameLag(maxFrameLag)) {
             // Frame lag is unknown.
             *maxFrameLag = FLAGS_gpuFrameLag;
         }
         return true;
     }
 
     bool init(Benchmark* bench, GrContextFactory* factory, bool useDfText,
-              GrContextFactory::ContextType ctxType,
-              GrContextFactory::ContextOptions ctxOptions, int numSamples) {
+              GrContextFactory::GLContextType ctxType,
+              GrContextFactory::GLContextOptions ctxOptions, int numSamples) {
         GrContext* context = factory->get(ctxType, ctxOptions);
         int maxRTSize = context->caps()->maxRenderTargetSize();
         SkImageInfo info = SkImageInfo::Make(SkTMin(bench->getSize().fX, maxRTSize),
                                              SkTMin(bench->getSize().fY, maxRTSize),
                                               kN32_SkColorType, kPremul_SkAlphaType);
         uint32_t flags = useDfText ? SkSurfaceProps::kUseDeviceIndependentFonts_Flag :
                                                   0;
         SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
         fSurface.reset(SkSurface::MakeRenderTarget(context,
                                                    SkBudgeted::kNo, info,
@@ skipping 281 matching lines @@
 
     return loops;
 }
 
 struct AutoSetupContextBenchAndTarget {
     AutoSetupContextBenchAndTarget(Benchmark* bench) : fBenchmark(bench) {
         GrContextOptions grContextOpts;
         fCtxFactory.reset(new GrContextFactory(grContextOpts));
 
         SkAssertResult(fTarget.init(bench, fCtxFactory, false,
-                                    GrContextFactory::kNativeGL_ContextType,
-                                    GrContextFactory::kNone_ContextOptions, 0));
+                                    GrContextFactory::kNative_GLContextType,
+                                    GrContextFactory::kNone_GLContextOptions, 0));
 
         fCanvas = fTarget.getCanvas();
         fTarget.setup();
 
         bench->perCanvasPreDraw(fCanvas);
         fTarget.needsFrameTiming(&fMaxFrameLag);
     }
 
     int getLoops() { return setup_gpu_bench(&fTarget, fBenchmark, fMaxFrameLag); }
 
@@ skipping 155 matching lines @@
     }
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return kilobench_main();
 }
 #endif