Revert of Rename enums in GrContextFactory to remove "GL"

tools/skiaserve/Request.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 "Request.h"
 
 #include "SkPictureRecorder.h"
@@ skipping 47 matching lines @@
     // write to png
     SkDynamicMemoryWStream buffer;
     SkDrawCommand::WritePNG((const png_bytep) bmp->getPixels(), bmp->width(), bmp->height(),
                             buffer);
     return buffer.copyToData();
 }
 
 SkCanvas* Request::getCanvas() {
 #if SK_SUPPORT_GPU
     GrContextFactory* factory = fContextFactory;
-    GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNativeGL_ContextType,
-                                            GrContextFactory::kNone_ContextOptions).fGLContext;
+    GLTestContext* gl = factory->getContextInfo(GrContextFactory::kNative_GLContextType,
+                                            GrContextFactory::kNone_GLContextOptions).fGLContext;
     gl->makeCurrent();
 #endif
     SkASSERT(fDebugCanvas);
 
     // create the appropriate surface if necessary
     if (!fSurface) {
         this->enableGPU(fGPUEnabled);
     }
     SkCanvas* target = fSurface->getCanvas();
     return target;
@@ skipping 22 matching lines @@
     SkDynamicMemoryWStream outStream;
 
     SkAutoTUnref<SkPixelSerializer> serializer(SkImageEncoder::CreatePixelSerializer());
     picture->serialize(&outStream, serializer);
 
     return outStream.copyToData();
 }
 
 GrContext* Request::getContext() {
 #if SK_SUPPORT_GPU
-  return fContextFactory->get(GrContextFactory::kNativeGL_ContextType,
-                              GrContextFactory::kNone_ContextOptions);
+  return fContextFactory->get(GrContextFactory::kNative_GLContextType,
+                              GrContextFactory::kNone_GLContextOptions);
 #else
   return nullptr;
 #endif
 }
 
 SkIRect Request::getBounds() {
     SkIRect bounds;
     if (fPicture) {
         bounds = fPicture->cullRect().roundOut();
         if (fGPUEnabled) {
@@ skipping 125 matching lines @@
     SkCanvas* canvas = this->getCanvas();
     canvas->flush();
     SkAutoTDelete<SkBitmap> bitmap(this->getBitmapFromCanvas(canvas));
     SkASSERT(bitmap);
     bitmap->lockPixels();
     uint8_t* start = ((uint8_t*) bitmap->getPixels()) + (y * bitmap->width() + x) * 4;
     SkColor result = SkColorSetARGB(start[3], start[0], start[1], start[2]);
     bitmap->unlockPixels();
     return result;
 }