| Index: gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| index 3e9acb192057d4251b493c63929b641fba15ab04..7888e3cb7de330a6e699892c2d364e58965629c7 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
|
| @@ -404,8 +404,6 @@ class GLES2ImplementationTest : public testing::Test {
|
| helper_->Initialize(kCommandBufferSizeBytes);
|
|
|
| gpu_control_.reset(new StrictMock<MockClientGpuControl>());
|
| - EXPECT_CALL(*gpu_control_, GetCapabilities())
|
| - .WillOnce(testing::Return(Capabilities()));
|
|
|
| GLES2Implementation::GLStaticState state;
|
| GLES2Implementation::GLStaticState::IntState& int_state = state.int_state;
|
| @@ -444,7 +442,8 @@ class GLES2ImplementationTest : public testing::Test {
|
| share_group,
|
| transfer_buffer_.get(),
|
| bind_generates_resource,
|
| - gpu_control_.get()));
|
| + gpu_control_.get(),
|
| + Capabilities()));
|
| ASSERT_TRUE(gl_->Initialize(kTransferBufferSize,
|
| kTransferBufferSize,
|
| kTransferBufferSize,
|
| @@ -2681,6 +2680,7 @@ TEST_F(GLES2ImplementationTest, GetString) {
|
| const char* expected_str =
|
| "foobar "
|
| "GL_CHROMIUM_flipy "
|
| + "GL_CHROMIUM_map_image "
|
| "GL_EXT_unpack_subimage";
|
| const char kBad = 0x12;
|
| struct Cmds {
|
|
|