Revert of Implement support for using GL ES 3.0 with command buffer

src/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 16 matching lines @@
         kNative_GLContextType,  //! OpenGL or OpenGL ES context.
         kGL_GLContextType,      //! OpenGL context.
         kGLES_GLContextType,    //! OpenGL ES context.
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
         kANGLE_GLContextType,    //! ANGLE on DirectX OpenGL ES context.
 #endif
         kANGLE_GL_GLContextType, //! ANGLE on OpenGL OpenGL ES context.
 #endif
 #if SK_COMMAND_BUFFER
-        kCommandBufferES2_GLContextType, //! Chromium command buffer OpenGL ES 2.0 context.
-        kCommandBufferES3_GLContextType, //! Chromium command buffer OpenGL ES 3.0 context.
-                                         //! Not ready for production.
+        kCommandBuffer_GLContextType, //! Chromium command buffer OpenGL ES context.
 #endif
 #if SK_MESA
         kMESA_GLContextType,  //! MESA OpenGL context
 #endif
         kNull_GLContextType,  //! Non-rendering OpenGL mock context.
         kDebug_GLContextType, //! Non-rendering, state verifying OpenGL context.
         kLastGLContextType = kDebug_GLContextType
     };
 
     static const int kGLContextTypeCnt = kLastGLContextType + 1;
@@ skipping 27 matching lines @@
                 return "gles";
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
             case kANGLE_GLContextType:
                 return "angle";
 #endif
             case kANGLE_GL_GLContextType:
                 return "angle-gl";
 #endif
 #if SK_COMMAND_BUFFER
-            case kCommandBufferES2_GLContextType:
+            case kCommandBuffer_GLContextType:
                 return "commandbuffer";
-            case kCommandBufferES3_GLContextType:
-                return "commandbuffer3";
 #endif
 #if SK_MESA
             case kMESA_GLContextType:
                 return "mesa";
 #endif
             case kNull_GLContextType:
                 return "null";
             case kDebug_GLContextType:
                 return "debug";
             default:
@@ skipping 38 matching lines @@
         GLContextType fType;
         GLContextOptions fOptions;
         SkGLContext*  fGLContext;
         GrContext*    fGrContext;
     };
     SkTArray<Context, true> fContexts;
     const GrContextOptions  fGlobalOptions;
 };
 
 #endif