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

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/common/value_state.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 50 matching lines @@
   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(), "", "", 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),
             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),
             group_->max_fragment_uniform_vectors());
@@ skipping 14 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);
 }
 
 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);
   EXPECT_TRUE(group_->renderbuffer_manager() != NULL);
   EXPECT_TRUE(group_->texture_manager() != NULL);
   EXPECT_TRUE(group_->program_manager() != NULL);
   EXPECT_TRUE(group_->shader_manager() != NULL);
 
   group_->Destroy(decoder_.get(), false);
 
@@ skipping 11 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