Initialize default texture for GL_TEXTURE_3D and GL_TEXTURE_2D_ARRAY

gpu/command_buffer/service/texture_manager_unittest.cc

Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 231fc04224477fa9f6998bea1e2927a21a404d6a..e0d01b06dcd279dd6b7f0db3e34af45aac76245b 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -78,7 +78,7 @@ class TextureManagerTest : public GpuServiceTest {
                                       kMax3DTextureSize,
                                       kUseDefaultTextures));
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), "", "", kUseDefaultTextures);
     manager_->Initialize();
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
   }
@@ -177,10 +177,11 @@ TEST_F(TextureManagerTest, SetParameter) {
 
 TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
   bool use_default_textures = true;
-  scoped_refptr<FeatureInfo> feature_info(new FeatureInfo());
-
-  TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", use_default_textures);
+  TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
+      gl_.get(), "", "", "OpenGL ES 3.0");
+  feature_info_->Initialize();
+  TestHelper::SetupTextureManagerInitExpectations(gl_.get(),
+      "OpenGL ES 3.0", "GL_ANGLE_texture_usage", use_default_textures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -191,6 +192,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
   manager.Initialize();
 
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D) != NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) != NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) != NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP) != NULL);
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
@@ -200,8 +203,11 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
 
 TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
   bool use_default_textures = false;
-  TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", use_default_textures);
+  TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
+      gl_.get(), "", "", "OpenGL ES 3.0");
+  feature_info_->Initialize();
+  TestHelper::SetupTextureManagerInitExpectations(gl_.get(),
+      "OpenGL ES 3.0", "GL_ANGLE_texture_usage", use_default_textures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -212,6 +218,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
   manager.Initialize();
 
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D) == NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) == NULL);
+  EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) == NULL);
   EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_CUBE_MAP) == NULL);
 
   // TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
@@ -221,7 +229,7 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
 
 TEST_F(TextureManagerTest, TextureUsageExt) {
   TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "GL_ANGLE_texture_usage", kUseDefaultTextures);
+      gl_.get(), "", "GL_ANGLE_texture_usage", kUseDefaultTextures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -249,7 +257,7 @@ TEST_F(TextureManagerTest, Destroy) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   TestHelper::SetupTextureManagerInitExpectations(
-      gl_.get(), "", kUseDefaultTextures);
+      gl_.get(), "", "", kUseDefaultTextures);
   TextureManager manager(NULL,
                          feature_info_.get(),
                          kMaxTextureSize,
@@ -267,7 +275,7 @@ TEST_F(TextureManagerTest, Destroy) {
       .Times(1)
       .RetiresOnSaturation();
   TestHelper::SetupTextureManagerDestructionExpectations(
-      gl_.get(), "", kUseDefaultTextures);
+      gl_.get(), "", "", kUseDefaultTextures);
   manager.Destroy(true);
   // Check that resources got freed.
   texture = manager.GetTexture(kClient1Id);
@@ -1824,10 +1832,10 @@ class SharedTextureTest : public GpuServiceTest {
                            TextureManagerTest::kMax3DTextureSize,
                            kUseDefaultTextures));
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), "", "", kUseDefaultTextures);
     texture_manager1_->Initialize();
     TestHelper::SetupTextureManagerInitExpectations(
-        gl_.get(), "", kUseDefaultTextures);
+        gl_.get(), "", "", kUseDefaultTextures);
     texture_manager2_->Initialize();
   }