| Index: gpu/command_buffer/service/context_group_unittest.cc
|
| diff --git a/gpu/command_buffer/service/context_group_unittest.cc b/gpu/command_buffer/service/context_group_unittest.cc
|
| index e527bd37038705fc07f409858d9d32717876a051..7c6d5c1c8bd73065051ba8ec1c9ac3f47c58a97d 100644
|
| --- a/gpu/command_buffer/service/context_group_unittest.cc
|
| +++ b/gpu/command_buffer/service/context_group_unittest.cc
|
| @@ -69,7 +69,7 @@ TEST_F(ContextGroupTest, InitializeNoExtensions) {
|
| TestHelper::SetupContextGroupInitExpectations(
|
| gl_.get(), DisallowedFeatures(), "", "", kBindGeneratesResource);
|
| group_->Initialize(
|
| - decoder_.get(), ContextGroup::kContextTypeOther, DisallowedFeatures());
|
| + decoder_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures());
|
| EXPECT_EQ(static_cast<uint32>(TestHelper::kNumVertexAttribs),
|
| group_->max_vertex_attribs());
|
| EXPECT_EQ(static_cast<uint32>(TestHelper::kNumTextureUnits),
|
| @@ -105,16 +105,18 @@ TEST_F(ContextGroupTest, MultipleContexts) {
|
| TestHelper::SetupContextGroupInitExpectations(
|
| gl_.get(), DisallowedFeatures(), "", "", kBindGeneratesResource);
|
| EXPECT_TRUE(group_->Initialize(
|
| - decoder_.get(), ContextGroup::kContextTypeOther, DisallowedFeatures()));
|
| + decoder_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures()));
|
| EXPECT_FALSE(group_->Initialize(
|
| - decoder2_.get(), ContextGroup::kContextTypeWebGL1, DisallowedFeatures()));
|
| + decoder2_.get(), ContextGroup::CONTEXT_TYPE_WEBGL1,
|
| + DisallowedFeatures()));
|
| EXPECT_FALSE(group_->Initialize(
|
| - decoder2_.get(), ContextGroup::kContextTypeWebGL2, DisallowedFeatures()));
|
| + decoder2_.get(), ContextGroup::CONTEXT_TYPE_WEBGL2,
|
| + DisallowedFeatures()));
|
| EXPECT_FALSE(group_->Initialize(
|
| - decoder2_.get(), ContextGroup::kContextTypeUndefined,
|
| + decoder2_.get(), ContextGroup::CONTEXT_TYPE_UNDEFINED,
|
| DisallowedFeatures()));
|
| EXPECT_TRUE(group_->Initialize(
|
| - decoder2_.get(), ContextGroup::kContextTypeOther, DisallowedFeatures()));
|
| + decoder2_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures()));
|
|
|
| EXPECT_TRUE(group_->buffer_manager() != NULL);
|
| EXPECT_TRUE(group_->framebuffer_manager() != NULL);
|
|
|