Create correct GLES3 context for GLES3 unittest

gpu/command_buffer/service/feature_info_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/feature_info.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 77 matching lines @@
       default:
         NOTREACHED();
         return CONTEXT_TYPE_OPENGLES2;
     }
   }
 
   void SetupInitExpectationsWithGLVersion(
       const char* extensions, const char* renderer, const char* version) {
     GpuServiceTest::SetUpWithGLVersion(version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), extensions, renderer, version, GetContextType());
+        gl_.get(), extensions, renderer, version);
     info_ = new FeatureInfo();
     info_->Initialize(GetContextType(), DisallowedFeatures());
   }
 
   void SetupInitExpectationsWithGLVersionAndDisallowedFeatures(
       const char* extensions,
       const char* renderer,
       const char* version,
       const DisallowedFeatures& disallowed_features) {
     GpuServiceTest::SetUpWithGLVersion(version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), extensions, renderer, version, GetContextType());
+        gl_.get(), extensions, renderer, version);
     info_ = new FeatureInfo();
     info_->Initialize(GetContextType(), disallowed_features);
   }
 
   void SetupInitExpectationsWithGLVersionAndCommandLine(
       const char* extensions,
       const char* renderer,
       const char* version,
       const base::CommandLine& command_line) {
     GpuServiceTest::SetUpWithGLVersion(version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), extensions, renderer, version, GetContextType());
+        gl_.get(), extensions, renderer, version);
     GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
     info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);
     info_->Initialize(GetContextType(), DisallowedFeatures());
   }
 
   void SetupWithCommandLine(const base::CommandLine& command_line) {
     GpuServiceTest::SetUp();
     GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
     info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);
   }
 
   void SetupInitExpectationsWithCommandLine(
       const char* extensions,
       const base::CommandLine& command_line) {
     GpuServiceTest::SetUpWithGLVersion("2.0", extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), extensions, "", "", GetContextType());
+        gl_.get(), extensions, "", "");
     GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
     info_ = new FeatureInfo(command_line, gpu_driver_bug_workaround);
     info_->Initialize(GetContextType(), DisallowedFeatures());
   }
 
   void SetupWithoutInit() {
     GpuServiceTest::SetUp();
     info_ = new FeatureInfo();
   }
 
@@ skipping 1509 matching lines @@
   EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_RG8_EXT));
 }
 
 TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
   SetupInitExpectations("GL_APPLE_ycbcr_422");
   EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422);
 }
 
 }  // namespace gles2
 }  // namespace gpu