remove 'unsafe' from ES3 apis in gpu process

gpu/command_buffer/service/gles2_cmd_decoder_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/gles2_cmd_decoder_unittest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
@@ skipping 71 matching lines @@
     Disable cmd;
     cmd.Init(cap);
     EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
     EXPECT_EQ(GL_NO_ERROR, GetGLError());
   }
 }
 
 
 TEST_P(GLES3DecoderTest, Basic) {
   // Make sure the setup is correct for ES3.
-  EXPECT_TRUE(decoder_->unsafe_es3_apis_enabled());
+  EXPECT_TRUE(feature_info()->IsWebGL2OrES3Context());
   EXPECT_TRUE(feature_info()->validators()->texture_bind_target.IsValid(
       GL_TEXTURE_3D));
 }
 
 TEST_P(GLES2DecoderTest, InvalidCommand) {
   cmd::Noop cmd;
   cmd.header.Init(gles2::kNumCommands, 1);
   EXPECT_EQ(error::kUnknownCommand, ExecuteImmediateCmd(cmd, 0));
 }
 
@@ skipping 1578 matching lines @@
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(0, deschedule_until_finished_callback_count_);
   EXPECT_EQ(0, reschedule_after_finished_callback_count_);
 
   EXPECT_EQ(error::kDeferLaterCommands, ExecuteCmd(cmd));
   EXPECT_EQ(1, deschedule_until_finished_callback_count_);
   EXPECT_EQ(0, reschedule_after_finished_callback_count_);
 }
 
 void GLES3DecoderTest::SetUp() {
-  base::CommandLine command_line(0, nullptr);
-  command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
   InitState init;
   init.gl_version = "OpenGL ES 3.0";
   init.bind_generates_resource = true;
   init.context_type = CONTEXT_TYPE_OPENGLES3;
-  InitDecoderWithCommandLine(init, &command_line);
+  InitDecoder(init);
 }
 
 void GLES3DecoderWithShaderTest::SetUp() {
-  base::CommandLine command_line(0, nullptr);
-  command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
   InitState init;
   init.gl_version = "OpenGL ES 3.0";
   init.bind_generates_resource = true;
   init.context_type = CONTEXT_TYPE_OPENGLES3;
-  InitDecoderWithCommandLine(init, &command_line);
+  InitDecoder(init);
   SetupDefaultProgram();
 }
 
 void GLES3DecoderRGBBackbufferTest::SetUp() {
   base::CommandLine command_line(0, nullptr);
-  command_line.AppendSwitch(switches::kEnableUnsafeES3APIs);
   command_line.AppendSwitchASCII(
       switches::kGpuDriverBugWorkarounds,
       base::IntToString(gpu::CLEAR_ALPHA_IN_READPIXELS));
   InitState init;
   init.gl_version = "OpenGL ES 3.0";
   init.bind_generates_resource = true;
   init.context_type = CONTEXT_TYPE_OPENGLES3;
   InitDecoderWithCommandLine(init, &command_line);
   SetupDefaultProgram();
 }
@@ skipping 19 matching lines @@
 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderWithShaderTest, ::testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderManualInitTest, ::testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(Service,
                         GLES3DecoderRGBBackbufferTest,
                         ::testing::Bool());
 
 }  // namespace gles2
 }  // namespace gpu