Revert of Support using OpenGL ES context on desktop

dm/DMGpuSupport.h

Index: dm/DMGpuSupport.h
diff --git a/dm/DMGpuSupport.h b/dm/DMGpuSupport.h
index bcc00c27e46454c123821b7962fff3d196a5c078..46896b43217f91b623a494b55f437dfa510d03bf 100644
--- a/dm/DMGpuSupport.h
+++ b/dm/DMGpuSupport.h
@@ -19,10 +19,9 @@
 
 static inline SkSurface* NewGpuSurface(GrContextFactory* grFactory,
                                        GrContextFactory::GLContextType type,
-                                       GrGLStandard gpuAPI,
                                        SkImageInfo info,
                                        int samples) {
-    return SkSurface::NewRenderTarget(grFactory->get(type, gpuAPI), info, samples);
+    return SkSurface::NewRenderTarget(grFactory->get(type), info, samples);
 }
 
 }  // namespace DM
@@ -30,12 +29,6 @@
 #else// !SK_SUPPORT_GPU
 
 // Ganesh is not available.  Fake it.
-
-enum GrGLStandard {
-    kNone_GrGLStandard,
-    kGL_GrGLStandard,
-    kGLES_GrGLStandard
-};
 
 class GrContextFactory {
 public:
@@ -55,7 +48,6 @@
 
 static inline SkSurface* NewGpuSurface(GrContextFactory*,
                                        GrContextFactory::GLContextType,
-                                       GrGLStandard,
                                        SkImageInfo,
                                        int) {
     return NULL;