| Index: gpu/command_buffer/service/gles2_cmd_decoder_mock.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
|
| index a0d91c97a0e343a3be344b0ffe2ed7d0ec1dc1e4..02827091f7c3a6826812fefd5c5fd56879a13bdd 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -22,13 +22,8 @@ namespace gles2 {
|
| class ContextGroup;
|
| class MockGLES2Decoder : public GLES2Decoder {
|
| public:
|
| - MockGLES2Decoder()
|
| - : GLES2Decoder() {
|
| - ON_CALL(*this, GetCommandName(testing::_))
|
| - .WillByDefault(testing::Return(""));
|
| - ON_CALL(*this, MakeCurrent())
|
| - .WillByDefault(testing::Return(true));
|
| - }
|
| + MockGLES2Decoder();
|
| + virtual ~MockGLES2Decoder();
|
|
|
| MOCK_METHOD6(Initialize, bool(gfx::GLContext* context,
|
| const gfx::Size& size,
|
|
|