Remove default textures in (!bind_generates_resource) context groups.

gpu/command_buffer/service/context_group_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/context_group.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/test_helper.h"
 #include "gpu/command_buffer/service/texture_manager.h"
@@ skipping 12 matching lines @@
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
 class ContextGroupTest : public testing::Test {
  public:
-  ContextGroupTest() {
-  }
+  ContextGroupTest() : bind_generates_resource_(false) {}
 
  protected:
   virtual void SetUp() {
     gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
     ::gfx::MockGLInterface::SetGLInterface(gl_.get());
     decoder_.reset(new MockGLES2Decoder());
-    group_ = scoped_refptr<ContextGroup>(
-        new ContextGroup(NULL, NULL, NULL, NULL, NULL, true));
+    group_ = scoped_refptr<ContextGroup>(new ContextGroup(
+        NULL, NULL, NULL, NULL, NULL, bind_generates_resource_));
   }
 
   virtual void TearDown() {
     ::gfx::MockGLInterface::SetGLInterface(NULL);
     gl_.reset();
   }
 
   scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
   scoped_ptr<MockGLES2Decoder> decoder_;
   scoped_refptr<ContextGroup> group_;
+  bool bind_generates_resource_;

[piman, 2014/04/04 02:50:28]

is anything setting this to a non-default value?

[vmiura, 2014/04/04 18:32:57]

Changed to kUseDefaultTextures.

[piman, 2014/04/04 22:47:44]

I think you missed this file.

[vmiura, 2014/04/05 01:54:29]

Done.  Changed to kBindGeneratesResource.

 };
 
 TEST_F(ContextGroupTest, Basic) {
   // Test it starts off uninitialized.
   EXPECT_EQ(0u, group_->max_vertex_attribs());
   EXPECT_EQ(0u, group_->max_texture_units());
   EXPECT_EQ(0u, group_->max_texture_image_units());
   EXPECT_EQ(0u, group_->max_vertex_texture_image_units());
   EXPECT_EQ(0u, group_->max_fragment_uniform_vectors());
   EXPECT_EQ(0u, group_->max_varying_vectors());
   EXPECT_EQ(0u, group_->max_vertex_uniform_vectors());
   EXPECT_TRUE(group_->buffer_manager() == NULL);
   EXPECT_TRUE(group_->framebuffer_manager() == NULL);
   EXPECT_TRUE(group_->renderbuffer_manager() == NULL);
   EXPECT_TRUE(group_->texture_manager() == NULL);
   EXPECT_TRUE(group_->program_manager() == NULL);
   EXPECT_TRUE(group_->shader_manager() == NULL);
 }
 
 TEST_F(ContextGroupTest, InitializeNoExtensions) {
-  TestHelper::SetupContextGroupInitExpectations(gl_.get(),
-      DisallowedFeatures(), "", "");
+  TestHelper::SetupContextGroupInitExpectations(
+      gl_.get(), DisallowedFeatures(), "", "", bind_generates_resource_);
   group_->Initialize(decoder_.get(), DisallowedFeatures());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kNumVertexAttribs),
             group_->max_vertex_attribs());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kNumTextureUnits),
             group_->max_texture_units());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kMaxTextureImageUnits),
             group_->max_texture_image_units());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kMaxVertexTextureImageUnits),
              group_->max_vertex_texture_image_units());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kMaxFragmentUniformVectors),
@@ skipping 13 matching lines @@
   EXPECT_TRUE(group_->buffer_manager() == NULL);
   EXPECT_TRUE(group_->framebuffer_manager() == NULL);
   EXPECT_TRUE(group_->renderbuffer_manager() == NULL);
   EXPECT_TRUE(group_->texture_manager() == NULL);
   EXPECT_TRUE(group_->program_manager() == NULL);
   EXPECT_TRUE(group_->shader_manager() == NULL);
 }
 
 TEST_F(ContextGroupTest, MultipleContexts) {
   scoped_ptr<MockGLES2Decoder> decoder2_(new MockGLES2Decoder());
-  TestHelper::SetupContextGroupInitExpectations(gl_.get(),
-      DisallowedFeatures(), "", "");
+  TestHelper::SetupContextGroupInitExpectations(
+      gl_.get(), DisallowedFeatures(), "", "", bind_generates_resource_);
   group_->Initialize(decoder_.get(), DisallowedFeatures());
   group_->Initialize(decoder2_.get(), DisallowedFeatures());
 
   EXPECT_TRUE(group_->buffer_manager() != NULL);
   EXPECT_TRUE(group_->framebuffer_manager() != NULL);
   EXPECT_TRUE(group_->renderbuffer_manager() != NULL);
   EXPECT_TRUE(group_->texture_manager() != NULL);
   EXPECT_TRUE(group_->program_manager() != NULL);
   EXPECT_TRUE(group_->shader_manager() != NULL);
 
@@ skipping 13 matching lines @@
   EXPECT_TRUE(group_->renderbuffer_manager() == NULL);
   EXPECT_TRUE(group_->texture_manager() == NULL);
   EXPECT_TRUE(group_->program_manager() == NULL);
   EXPECT_TRUE(group_->shader_manager() == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu