Revert of Support using OpenGL ES context on desktop

include/gpu/GrContextFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrContextFactory_DEFINED
 #define GrContextFactory_DEFINED
 
@@ skipping 70 matching lines @@
 #endif
             case kNVPR_GLContextType:
                 return "nvpr";
             case kDebug_GLContextType:
                 return "debug";
             default:
                 SkFAIL("Unknown GL Context type.");
         }
     }
 
-    GrContextFactory() { }
+    GrContextFactory() {
+    }
 
     ~GrContextFactory() { this->destroyContexts(); }
 
     void destroyContexts() {
         for (int i = 0; i < fContexts.count(); ++i) {
             fContexts[i].fGLContext->makeCurrent();
             fContexts[i].fGrContext->unref();
             fContexts[i].fGLContext->unref();
         }
         fContexts.reset();
     }
 
     /**
      * Get a GrContext initialized with a type of GL context. It also makes the GL context current.
      */
-    GrContext* get(GLContextType type, GrGLStandard forcedGpuAPI = kNone_GrGLStandard) {
+    GrContext* get(GLContextType type) {
+
         for (int i = 0; i < fContexts.count(); ++i) {
-            if (forcedGpuAPI != kNone_GrGLStandard &&
-                forcedGpuAPI != fContexts[i].fGLContext->gl()->fStandard)
-                continue;
-
             if (fContexts[i].fType == type) {
                 fContexts[i].fGLContext->makeCurrent();
                 return fContexts[i].fGrContext;
             }
         }
         SkAutoTUnref<SkGLContextHelper> glCtx;
         SkAutoTUnref<GrContext> grCtx;
         switch (type) {
             case kNVPR_GLContextType: // fallthru
             case kNative_GLContextType:
@@ skipping 13 matching lines @@
                 glCtx.reset(SkNEW(SkNullGLContext));
                 break;
             case kDebug_GLContextType:
                 glCtx.reset(SkNEW(SkDebugGLContext));
                 break;
         }
         static const int kBogusSize = 1;
         if (!glCtx.get()) {
             return NULL;
         }
-        if (!glCtx.get()->init(forcedGpuAPI, kBogusSize, kBogusSize)) {
+        if (!glCtx.get()->init(kBogusSize, kBogusSize)) {
             return NULL;
         }
 
         // Ensure NVPR is available for the NVPR type and block it from other types.
         SkAutoTUnref<const GrGLInterface> glInterface(SkRef(glCtx.get()->gl()));
         if (kNVPR_GLContextType == type) {
             if (!glInterface->hasExtension("GL_NV_path_rendering")) {
                 return NULL;
             }
         } else {
@@ skipping 33 matching lines @@
 private:
     struct GPUContext {
         GLContextType             fType;
         SkGLContextHelper*        fGLContext;
         GrContext*                fGrContext;
     };
     SkTArray<GPUContext, true> fContexts;
 };
 
 #endif