| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| index 68bfdcd29b923b138f9d908be32d6888a68b9a13..2bbf75d11796d4372be2d6434a2ab5e9deb8d862 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| @@ -627,11 +627,11 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
|
| static const char* kOutputVariable1NameESSL3;
|
|
|
| // Use StrictMock to make 100% sure we know how GL will be called.
|
| - scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
|
| + std::unique_ptr<::testing::StrictMock<::gfx::MockGLInterface>> gl_;
|
| scoped_refptr<gfx::GLSurfaceStub> surface_;
|
| scoped_refptr<GLContextMock> context_;
|
| - scoped_ptr<MockGLES2Decoder> mock_decoder_;
|
| - scoped_ptr<GLES2Decoder> decoder_;
|
| + std::unique_ptr<MockGLES2Decoder> mock_decoder_;
|
| + std::unique_ptr<GLES2Decoder> decoder_;
|
| MemoryTracker* memory_tracker_;
|
|
|
| GLuint client_buffer_id_;
|
| @@ -754,7 +754,7 @@ class GLES2DecoderTestBase : public ::testing::TestWithParam<bool> {
|
|
|
| void SetupInitStateManualExpectations(bool es3_capable);
|
|
|
| - scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
|
| + std::unique_ptr<::testing::StrictMock<MockCommandBufferEngine>> engine_;
|
| GpuPreferences gpu_preferences_;
|
| scoped_refptr<ContextGroup> group_;
|
| MockGLStates gl_states_;
|
|
|