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

samplecode/SampleApp.cpp

Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 5b133106774d83c84e4a5cae16bc7922d13ecb03..7ebac5f2151867e6d9604e9725cd08c80fe87785 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -206,9 +206,9 @@ public:
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-            case kCommandBufferES2_DeviceType:
+            case kCommandBuffer_DeviceType:
                 // Command buffer is really the only other odd man out :D
-                fBackend = kCommandBufferES2_BackEndType;
+                fBackend = kCommandBuffer_BackEndType;
                 break;
 #endif // SK_COMMAND_BUFFER
             default:
@@ -237,7 +237,7 @@ public:
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-            case kCommandBufferES2_DeviceType:
+            case kCommandBuffer_DeviceType:
                 glInterface.reset(GrGLCreateCommandBufferInterface());
                 break;
 #endif // SK_COMMAND_BUFFER
@@ -692,7 +692,7 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType
         , SampleWindow::kANGLE_DeviceType
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-        , SampleWindow::kCommandBufferES2_DeviceType
+        , SampleWindow::kCommandBuffer_DeviceType
 #endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     };
@@ -859,7 +859,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
     fDeviceType = kANGLE_DeviceType;
 #endif
 #if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER
-    fDeviceType = kCommandBufferES2_DeviceType;
+    fDeviceType = kCommandBuffer_DeviceType;
 #endif
 
     fUseClip = false;