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

tools/flags/SkCommonFlagsConfig.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 
 #include <stdlib.h>
@@ skipping 46 matching lines @@
     "\t\tdebug \t\t\tUse debug OpenGL.\n"
     "\t\tnull  \t\t\tUse null OpenGL.\n"
 #if SK_ANGLE
 #ifdef SK_BUILD_FOR_WIN
     "\t\tangle\t\t\tUse ANGLE DirectX.\n"
 #endif
     "\t\tangle-gl\t\t\tUse ANGLE OpenGL.\n"
 #endif
 #if SK_COMMAND_BUFFER
     "\t\tcommandbuffer\t\tUse command buffer.\n"
-    "\t\tcommandbuffer3\t\tUse command buffer ES 3.0 (experimental).\n"
 #endif
 #if SK_MESA
     "\t\tmesa\t\t\tUse MESA.\n"
 #endif
     "\tdit\ttype: bool\tdefault: false.\n"
     "\t    Use device independent text.\n"
     "\tnvpr\ttype: bool\tdefault: false.\n"
     "\t    Use NV_path_rendering OpenGL and OpenGL ES extension.\n"
     "\tsamples\ttype: int\tdefault: 0.\n"
     "\t    Use multisampling with N samples.\n"
@@ skipping 130 matching lines @@
         return true;
     }
 #endif
     if (value.equals("angle-gl")) {
         *outContextType = GrContextFactory::kANGLE_GL_GLContextType;
         return true;
     }
 #endif
 #if SK_COMMAND_BUFFER
     if (value.equals("commandbuffer")) {
-        *outContextType = GrContextFactory::kCommandBufferES2_GLContextType;
-        return true;
-    }
-    if (value.equals("commandbuffer3")) {
-        *outContextType = GrContextFactory::kCommandBufferES3_GLContextType;
+        *outContextType = GrContextFactory::kCommandBuffer_GLContextType;
         return true;
     }
 #endif
 #if SK_MESA
     if (value.equals("mesa")) {
         *outContextType = GrContextFactory::kMESA_GLContextType;
         return true;
     }
 #endif
     return false;
@@ skipping 99 matching lines @@
         if (extendedBackend.equals("gpu")) {
             parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOptions);
         }
 #endif
         if (!parsedConfig) {
             parsedConfig = new SkCommandLineConfig(tag, simpleBackend, vias);
         }
         outResult->emplace_back(parsedConfig);
     }
 }