| Index: gpu/command_buffer/service/context_group_unittest.cc
|
| diff --git a/gpu/command_buffer/service/context_group_unittest.cc b/gpu/command_buffer/service/context_group_unittest.cc
|
| index bd0fbf932ba653ab33d875268d625e1094c31cb8..4bfedc96f8514492deacadbb258ae85d7cc4a99c 100644
|
| --- a/gpu/command_buffer/service/context_group_unittest.cc
|
| +++ b/gpu/command_buffer/service/context_group_unittest.cc
|
| @@ -6,7 +6,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "gpu/command_buffer/common/value_state.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
|
| #include "gpu/command_buffer/service/gpu_service_test.h"
|
| @@ -49,7 +50,7 @@ class ContextGroupTest : public GpuServiceTest {
|
| }
|
|
|
| GpuPreferences gpu_preferences_;
|
| - scoped_ptr<MockGLES2Decoder> decoder_;
|
| + std::unique_ptr<MockGLES2Decoder> decoder_;
|
| scoped_refptr<ContextGroup> group_;
|
| };
|
|
|
| @@ -106,7 +107,7 @@ TEST_F(ContextGroupTest, InitializeNoExtensions) {
|
| }
|
|
|
| TEST_F(ContextGroupTest, MultipleContexts) {
|
| - scoped_ptr<MockGLES2Decoder> decoder2_(new MockGLES2Decoder());
|
| + std::unique_ptr<MockGLES2Decoder> decoder2_(new MockGLES2Decoder());
|
| TestHelper::SetupContextGroupInitExpectations(
|
| gl_.get(), DisallowedFeatures(), "", "", kBindGeneratesResource);
|
| EXPECT_TRUE(group_->Initialize(decoder_.get(), CONTEXT_TYPE_OPENGLES2,
|
|
|