command buffer: remove "unsafe" from autogenerated ES3 apis; cleanly separate ES3 tests

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 491 matching lines @@
   GenHelper<cmds::GenTexturesImmediate>(client_texture_id_);
   EXPECT_CALL(*gl_, GenBuffersARB(_, _))
       .WillOnce(SetArgPointee<1>(kServiceElementBufferId))
       .RetiresOnSaturation();
   GenHelper<cmds::GenBuffersImmediate>(client_element_buffer_id_);
   GenHelper<cmds::GenQueriesEXTImmediate>(client_query_id_);
 
   DoCreateProgram(client_program_id_, kServiceProgramId);
   DoCreateShader(GL_VERTEX_SHADER, client_shader_id_, kServiceShaderId);
 
-  // Unsafe commands.
-  bool reset_unsafe_es3_apis_enabled = false;
-  if (!decoder_->unsafe_es3_apis_enabled()) {
-    decoder_->set_unsafe_es3_apis_enabled(true);
-    reset_unsafe_es3_apis_enabled = true;
-  }
-
-  const gl::GLVersionInfo* version = context_->GetVersionInfo();
-  if (version->IsAtLeastGL(3, 3) || version->IsAtLeastGLES(3, 0)) {
+  if (init.context_type == CONTEXT_TYPE_WEBGL2 ||
+      init.context_type == CONTEXT_TYPE_OPENGLES3) {
     EXPECT_CALL(*gl_, GenSamplers(_, _))
         .WillOnce(SetArgPointee<1>(kServiceSamplerId))
         .RetiresOnSaturation();
     GenHelper<cmds::GenSamplersImmediate>(client_sampler_id_);
-  }
-  if (version->IsAtLeastGL(4, 0) || version->IsAtLeastGLES(3, 0)) {
+
     EXPECT_CALL(*gl_, GenTransformFeedbacks(_, _))
         .WillOnce(SetArgPointee<1>(kServiceTransformFeedbackId))
         .RetiresOnSaturation();
     GenHelper<cmds::GenTransformFeedbacksImmediate>(
         client_transformfeedback_id_);
-  }
 
-  if (init.extensions.find("GL_ARB_sync ") != std::string::npos ||
-      version->IsAtLeastGL(3, 2) || version->IsAtLeastGLES(3, 0)) {
     DoFenceSync(client_sync_id_, kServiceSyncId);
   }
 
-  if (reset_unsafe_es3_apis_enabled) {
-    decoder_->set_unsafe_es3_apis_enabled(false);
-  }
-
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 void GLES2DecoderTestBase::ResetDecoder() {
   if (!decoder_.get())
     return;
   // All Tests should have read all their GLErrors before getting here.
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   if (!decoder_->WasContextLost()) {
     EXPECT_CALL(*gl_, DeleteBuffersARB(1, _)).Times(2).RetiresOnSaturation();
     if (group_->feature_info()->feature_flags().native_vertex_array_object) {
       EXPECT_CALL(*gl_,
                   DeleteVertexArraysOES(1, Pointee(kServiceVertexArrayId)))
           .Times(1)
           .RetiresOnSaturation();
     }
     if (group_->feature_info()->IsES3Enabled()) {
       // fake default transform feedback.
       EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _))
           .Times(1)
           .RetiresOnSaturation();
     }
-    if (group_->feature_info()->gl_version_info().IsAtLeastGL(4, 0) ||
-        group_->feature_info()->gl_version_info().IsAtLeastGLES(3, 0)) {
+    if (group_->feature_info()->IsWebGL2OrES3Context()) {
       // |client_transformfeedback_id_|
       EXPECT_CALL(*gl_, DeleteTransformFeedbacks(1, _))
           .Times(1)
           .RetiresOnSaturation();
     }
   }
 
   decoder_->EndDecoding();
   decoder_->Destroy(!decoder_->WasContextLost());
   decoder_.reset();
@@ skipping 1552 matching lines @@
   SetupDefaultProgram();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu