command_buffer: Add support for creating non-WebGL ES 3 contexts

gpu/command_buffer/service/context_group_unittest.cc

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 cbb36f56bf22a0482d9b86bae77d9d7b0a54b5f3..af1c9b728cc6a01d9ff330547cae7d4ccf752f9f 100644
--- a/gpu/command_buffer/service/context_group_unittest.cc
+++ b/gpu/command_buffer/service/context_group_unittest.cc
@@ -68,8 +68,8 @@ TEST_F(ContextGroupTest, Basic) {
 TEST_F(ContextGroupTest, InitializeNoExtensions) {
   TestHelper::SetupContextGroupInitExpectations(
       gl_.get(), DisallowedFeatures(), "", "", kBindGeneratesResource);
-  group_->Initialize(
-      decoder_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures());
+  group_->Initialize(decoder_.get(), CONTEXT_TYPE_OPENGLES2,
+                     DisallowedFeatures());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kNumVertexAttribs),
             group_->max_vertex_attribs());
   EXPECT_EQ(static_cast<uint32>(TestHelper::kNumTextureUnits),
@@ -104,19 +104,16 @@ TEST_F(ContextGroupTest, MultipleContexts) {
   scoped_ptr<MockGLES2Decoder> decoder2_(new MockGLES2Decoder());
   TestHelper::SetupContextGroupInitExpectations(
       gl_.get(), DisallowedFeatures(), "", "", kBindGeneratesResource);
-  EXPECT_TRUE(group_->Initialize(
-      decoder_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures()));
-  EXPECT_FALSE(group_->Initialize(
-      decoder2_.get(), ContextGroup::CONTEXT_TYPE_WEBGL1,
-      DisallowedFeatures()));
-  EXPECT_FALSE(group_->Initialize(
-      decoder2_.get(), ContextGroup::CONTEXT_TYPE_WEBGL2,
-      DisallowedFeatures()));
-  EXPECT_FALSE(group_->Initialize(
-      decoder2_.get(), ContextGroup::CONTEXT_TYPE_UNDEFINED,
-      DisallowedFeatures()));
-  EXPECT_TRUE(group_->Initialize(
-      decoder2_.get(), ContextGroup::CONTEXT_TYPE_OTHER, DisallowedFeatures()));
+  EXPECT_TRUE(group_->Initialize(decoder_.get(), CONTEXT_TYPE_OPENGLES2,
+                                 DisallowedFeatures()));
+  EXPECT_FALSE(group_->Initialize(decoder2_.get(), CONTEXT_TYPE_WEBGL1,
+                                  DisallowedFeatures()));
+  EXPECT_FALSE(group_->Initialize(decoder2_.get(), CONTEXT_TYPE_WEBGL2,
+                                  DisallowedFeatures()));
+  EXPECT_FALSE(group_->Initialize(decoder2_.get(), CONTEXT_TYPE_OPENGLES3,
+                                  DisallowedFeatures()));
+  EXPECT_TRUE(group_->Initialize(decoder2_.get(), CONTEXT_TYPE_OPENGLES2,
+                                 DisallowedFeatures()));
 
   EXPECT_TRUE(group_->buffer_manager() != NULL);
   EXPECT_TRUE(group_->framebuffer_manager() != NULL);