Added EGL based GLContext....

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

 // Copyright (c) 2009 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/gles2_cmd_decoder_unittest_base.h"
+#include "app/gfx/gl/gl_mock.h"
 #include "base/string_util.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "gpu/command_buffer/service/gl_mock.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/program_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ::gles2::MockGLInterface;
+using ::gfx::MockGLInterface;
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::MatcherCast;
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SetArrayArgument;
 using ::testing::SetArgumentPointee;
 using ::testing::StrEq;
 using ::testing::StrictMock;
 
 namespace gpu {
 namespace gles2 {
 
 void GLES2DecoderTestBase::SetUp() {
   gl_.reset(new StrictMock<MockGLInterface>());
-  ::gles2::GLInterface::SetGLInterface(gl_.get());
+  ::gfx::GLInterface::SetGLInterface(gl_.get());
 
   InSequence sequence;
 
   EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_VERTEX_ATTRIBS, _))
       .WillOnce(SetArgumentPointee<1>(kNumVertexAttribs))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, _))
       .WillOnce(SetArgumentPointee<1>(kNumTextureUnits))
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_TEXTURE_SIZE, _))
@@ skipping 98 matching lines @@
       .Times(1)
       .RetiresOnSaturation();
 
   engine_.reset(new StrictMock<MockCommandBufferEngine>());
   Buffer buffer = engine_->GetSharedMemoryBuffer(kSharedMemoryId);
   shared_memory_offset_ = kSharedMemoryOffset;
   shared_memory_address_ = reinterpret_cast<int8*>(buffer.ptr) +
       shared_memory_offset_;
   shared_memory_id_ = kSharedMemoryId;
 
-  context_.reset(gfx::GLContext::CreateOffscreenGLContext(NULL));
+  context_.reset(new gfx::StubGLContext);
 
   decoder_.reset(GLES2Decoder::Create(&group_));
   decoder_->Initialize(context_.get(), gfx::Size(), NULL, 0);
   decoder_->set_engine(engine_.get());
 
   EXPECT_CALL(*gl_, GenBuffersARB(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceBufferId))
       .RetiresOnSaturation();
   GenHelper<GenBuffersImmediate>(client_buffer_id_);
   EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _))
@@ skipping 33 matching lines @@
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
   EXPECT_CALL(*gl_, DeleteTextures(1, _))
       .Times(2)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, DeleteBuffersARB(1, _))
       .Times(1)
       .RetiresOnSaturation();
   decoder_->Destroy();
   decoder_.reset();
   engine_.reset();
-  ::gles2::GLInterface::SetGLInterface(NULL);
+  ::gfx::GLInterface::SetGLInterface(NULL);
   gl_.reset();
 }
 
 GLint GLES2DecoderTestBase::GetGLError() {
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
   GetError cmd;
   cmd.Init(shared_memory_id_, shared_memory_offset_);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
@@ skipping 439 matching lines @@
 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2";
 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3";
 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1";
 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]";
 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]";
 
 }  // namespace gles2
 }  // namespace gpu