| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| ===================================================================
|
| --- gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h (revision 49195)
|
| +++ gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h (working copy)
|
| @@ -5,14 +5,14 @@
|
| #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
|
| #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
|
|
|
| -#include "app/gfx/gl/gl_context.h"
|
| +#include "app/gfx/gl/gl_context_stub.h"
|
| +#include "app/gfx/gl/gl_mock.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_utils.h"
|
| #include "gpu/command_buffer/service/buffer_manager.h"
|
| #include "gpu/command_buffer/service/cmd_buffer_engine.h"
|
| #include "gpu/command_buffer/service/context_group.h"
|
| #include "gpu/command_buffer/service/framebuffer_manager.h"
|
| -#include "gpu/command_buffer/service/gl_mock.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| #include "gpu/command_buffer/service/program_manager.h"
|
| #include "gpu/command_buffer/service/renderbuffer_manager.h"
|
| @@ -215,8 +215,8 @@
|
| }
|
|
|
| // Use StrictMock to make 100% sure we know how GL will be called.
|
| - scoped_ptr< ::testing::StrictMock< ::gles2::MockGLInterface> > gl_;
|
| - scoped_ptr<gfx::GLContext> context_;
|
| + scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
|
| + scoped_ptr<gfx::StubGLContext> context_;
|
| scoped_ptr<GLES2Decoder> decoder_;
|
|
|
| GLuint client_buffer_id_;
|
|
|