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 f343e5e2e5853464ae9fc7d3cd3d6e3fb6e0a33b..a9dbb7be887202ecb32f202cfe35f8889f832cc4 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" |
@@ -48,7 +49,7 @@ class ContextGroupTest : public GpuServiceTest { |
} |
GpuPreferences gpu_preferences_; |
- scoped_ptr<MockGLES2Decoder> decoder_; |
+ std::unique_ptr<MockGLES2Decoder> decoder_; |
scoped_refptr<ContextGroup> group_; |
}; |
@@ -105,7 +106,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, |