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

dm/DM.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 "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 1326 matching lines @@
     // http://skbug.com/2809
     GrContextFactory::GLContextType contextTypes[] = {
         GrContextFactory::kNative_GLContextType,
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
         GrContextFactory::kANGLE_GLContextType,
 #endif
         GrContextFactory::kANGLE_GL_GLContextType,
 #endif
 #if SK_COMMAND_BUFFER
-        GrContextFactory::kCommandBufferES2_GLContextType,
-        GrContextFactory::kCommandBufferES3_GLContextType,
+        GrContextFactory::kCommandBuffer_GLContextType,
 #endif
 #if SK_MESA
         GrContextFactory::kMESA_GLContextType,
 #endif
         GrContextFactory::kNull_GLContextType,
         GrContextFactory::kDebug_GLContextType,
     };
     static_assert(SK_ARRAY_COUNT(contextTypes) == GrContextFactory::kGLContextTypeCnt - 2,
                   "Skipping unexpected GLContextType for GPU tests");
 
@@ skipping 35 matching lines @@
                                                            Reporter* reporter,
                                                            GrContextFactory* factory);
 } // namespace skiatest
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif