Index: gpu/command_buffer/service/texture_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc |
index 322e2dc3ae04132ad6f16be7c17d0a183327947f..75fbb5e723fff6991befd02bf3caff94c8dbd0ea 100644 |
--- a/gpu/command_buffer/service/texture_manager_unittest.cc |
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc |
@@ -7,11 +7,11 @@ |
#include <stddef.h> |
#include <stdint.h> |
+#include <memory> |
#include <utility> |
#include "base/command_line.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "gpu/command_buffer/service/error_state_mock.h" |
#include "gpu/command_buffer/service/feature_info.h" |
#include "gpu/command_buffer/service/framebuffer_manager.h" |
@@ -123,8 +123,8 @@ class TextureManagerTest : public GpuServiceTest { |
} |
scoped_refptr<FeatureInfo> feature_info_; |
- scoped_ptr<TextureManager> manager_; |
- scoped_ptr<MockErrorState> error_state_; |
+ std::unique_ptr<TextureManager> manager_; |
+ std::unique_ptr<MockErrorState> error_state_; |
}; |
// GCC requires these declarations, but MSVC requires they not be present |
@@ -760,10 +760,10 @@ class TextureTestBase : public GpuServiceTest { |
texture_ref, pname, value, error); |
} |
- scoped_ptr<MockGLES2Decoder> decoder_; |
- scoped_ptr<MockErrorState> error_state_; |
+ std::unique_ptr<MockGLES2Decoder> decoder_; |
+ std::unique_ptr<MockErrorState> error_state_; |
scoped_refptr<FeatureInfo> feature_info_; |
- scoped_ptr<TextureManager> manager_; |
+ std::unique_ptr<TextureManager> manager_; |
scoped_refptr<TextureRef> texture_ref_; |
}; |
@@ -2194,9 +2194,9 @@ class SharedTextureTest : public GpuServiceTest { |
protected: |
scoped_refptr<FeatureInfo> feature_info_; |
scoped_refptr<CountingMemoryTracker> memory_tracker1_; |
- scoped_ptr<TextureManager> texture_manager1_; |
+ std::unique_ptr<TextureManager> texture_manager1_; |
scoped_refptr<CountingMemoryTracker> memory_tracker2_; |
- scoped_ptr<TextureManager> texture_manager2_; |
+ std::unique_ptr<TextureManager> texture_manager2_; |
}; |
TEST_F(SharedTextureTest, DeleteTextures) { |