Revert of Rename enums in GrContextFactory to remove "GL"

tests/SkpSkGrTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
@@ skipping 235 matching lines @@
     return true;
 }
 
 static SkString make_png_name(const char* filename) {
     SkString pngName = SkString(filename);
     pngName.remove(pngName.size() - 3, 3);
     pngName.append("png");
     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) {
     const int kRowCount = 3;
     const int kThreshold = 3;
     int width = SkTMin(gr.width(), sk.width());
     if (width < kRowCount) {
         return true;
     }
     int height = SkTMin(gr.height(), sk.height());
@@ skipping 474 matching lines @@
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }