remove 'unsafe' from ES3 apis in gpu process

gpu/command_buffer/service/texture_manager_unittest.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/texture_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 50 matching lines @@
   static const GLint kMaxExternalTextureSize = 32;
   static const GLint kMax3DTextureSize = 512;
   static const GLint kMaxArrayTextureLayers = 256;
   static const GLint kMax2dLevels = 6;
   static const GLint kMaxCubeMapLevels = 4;
   static const GLint kMaxExternalLevels = 1;
   static const GLint kMax3dLevels = 10;
   static const bool kUseDefaultTextures = false;
 
   TextureManagerTest() {
-    // Always run with this command line, but the ES3 features are not
-    // enabled without FeatureInfo::EnableES3Validators().
-    base::CommandLine command_line(0, nullptr);
-    command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
-    GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
-    feature_info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);
+    GpuDriverBugWorkarounds gpu_driver_bug_workaround;
+    feature_info_ = new FeatureInfo(gpu_driver_bug_workaround);
   }
 
   ~TextureManagerTest() override {}
 
  protected:
   void SetUp() override {
     GpuServiceTest::SetUp();
     manager_.reset(new TextureManager(
         NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize,
         kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
@@ skipping 14 matching lines @@
   void SetParameter(
       TextureRef* texture_ref, GLenum pname, GLint value, GLenum error) {
     TestHelper::SetTexParameteriWithExpectations(
         gl_.get(), error_state_.get(), manager_.get(),
         texture_ref, pname, value, error);
   }
 
   void SetupFeatureInfo(const char* gl_extensions,
                         const char* gl_version,
                         bool enable_es3) {
+    ContextType context_type =
+      enable_es3 ? CONTEXT_TYPE_OPENGLES3 : CONTEXT_TYPE_OPENGLES2;

[Zhenyao Mo, 2016/11/02 21:46:28]

nit: wrong indent

[Kai Ninomiya, 2016/11/02 22:43:21]

Done.

     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), gl_extensions, "", gl_version,
-        feature_info_->context_type(), enable_es3);
-    feature_info_->InitializeForTesting();
-    if (enable_es3) {
+        gl_.get(), gl_extensions, "", gl_version, context_type);
+    feature_info_->InitializeForTesting(context_type);
+    if (feature_info_->IsWebGL2OrES3Context()) {

[Zhenyao Mo, 2016/11/02 21:46:28]

Can we ASSERT here?

[Kai Ninomiya, 2016/11/02 22:43:21]

Done.

       EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
           .WillOnce(SetArgPointee<1>(8))
           .RetiresOnSaturation();
       EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _))
           .WillOnce(SetArgPointee<1>(8))
           .RetiresOnSaturation();
       feature_info_->EnableES3Validators();
     }
   }
 
@@ skipping 2067 matching lines @@
     texture_manager2_.reset();
     texture_manager1_->Destroy(false);
     texture_manager1_.reset();
     GpuServiceTest::TearDown();
   }
 
  protected:
   void SetupFeatureInfo(const char* gl_extensions,
                         const char* gl_version,
                         bool enable_es3) {
+    ContextType context_type =
+      enable_es3 ? CONTEXT_TYPE_OPENGLES3 : CONTEXT_TYPE_OPENGLES2;

[Zhenyao Mo, 2016/11/02 21:46:28]

nit: wrong indent

[Kai Ninomiya, 2016/11/02 22:43:21]

Done.

     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), gl_extensions, "", gl_version,
-        feature_info_->context_type(), enable_es3);
-    feature_info_->InitializeForTesting();
-    if (enable_es3) {
+        gl_.get(), gl_extensions, "", gl_version, context_type);
+    feature_info_->InitializeForTesting(context_type);
+    if (feature_info_->IsWebGL2OrES3Context()) {

[Zhenyao Mo, 2016/11/02 21:46:28]

Can we ASSERT here?

[Kai Ninomiya, 2016/11/02 22:43:21]

Done.

       EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
           .WillOnce(SetArgPointee<1>(8))
           .RetiresOnSaturation();
       EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _))
           .WillOnce(SetArgPointee<1>(8))
           .RetiresOnSaturation();
       feature_info_->EnableES3Validators();
     }
   }
 
@@ skipping 475 matching lines @@
   ExpectValid(
       true, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8);
   ExpectValid(true, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
               GL_DEPTH32F_STENCIL8);
 
   ExpectInvalid(true, GL_RGB_INTEGER, GL_INT, GL_RGBA8);
 }
 
 }  // namespace gles2
 }  // namespace gpu